ZeroDownTime/KubeZero
3
0
Fork 0
Code Issues 1 Pull Requests 26 Packages Projects Releases Wiki Activity

ArgoCd naming fixes

Browse Source
This commit is contained in:
Stefan Reimer 2020-11-30 09:30:06 -08:00
parent 0e7a2e70d6
commit 2be387b87b
19 changed files with 72 additions and 1830 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charts/kubezero-argo-cd/Chart.yaml → charts/kubezero-argocd/Chart.yaml
View File

@ -1,6 +1,6 @@
apiVersion: v2
description: KubeZero ArgoCD Helm chart to install ArgoCD itself and the KubeZero ArgoCD Application
name: kubezero-argo-cd
name: kubezero-argocd
version: 0.6.1
home: https://kubezero.com
icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png

2
charts/kubezero-argo-cd/README.md → charts/kubezero-argocd/README.md
View File

@ -1,4 +1,4 @@
# kubezero-argo-cd
# kubezero-argocd
![Version: 0.6.1](https://img.shields.io/badge/Version-0.6.1-informational?style=flat-square)

0
charts/kubezero-argo-cd/README.md.gotmpl → charts/kubezero-argocd/README.md.gotmpl
View File

0
charts/kubezero-argo-cd/templates/istio-authorization-policy.yaml → charts/kubezero-argocd/templates/istio-authorization-policy.yaml
View File

0
charts/kubezero-argo-cd/templates/istio-service.yaml → charts/kubezero-argocd/templates/istio-service.yaml
View File

0
charts/kubezero-argo-cd/templates/kubezero.yaml → charts/kubezero-argocd/templates/kubezero.yaml
View File

0
charts/kubezero-argo-cd/values.yaml → charts/kubezero-argocd/values.yaml
View File

2
charts/kubezero-cert-manager/README.md
View File

@ -18,7 +18,7 @@ Kubernetes: `>= 1.16.0`
| Repository | Name | Version |
|------------|------|---------|
| https://charts.jetstack.io | cert-manager | 1.0.4 |
| https://charts.jetstack.io | cert-manager | 1.1.0 |
| https://zero-down-time.github.io/kubezero/ | kubezero-lib | >= 0.1.3 |
## AWS - IAM Role

1
charts/kubezero-istio-ingress/README.md
View File

@ -28,6 +28,7 @@ Kubernetes: `>= 1.16.0`
| Key | Type | Default | Description |
|-----|------|---------|-------------|
| global.arch.amd64 | int | `2` | |
| global.defaultPodDisruptionBudget.enabled | bool | `false` | |
| global.hub | string | `"docker.io/istio"` | |
| global.jwtPolicy | string | `"first-party-jwt"` | |

1794
charts/kubezero-istio/remove-control-plane.yaml
View File

File diff suppressed because it is too large Load Diff

14
charts/kubezero-istio/upgrade_istio_18.sh Executable file
View File

@ -0,0 +1,14 @@
#!/bin/bash
# Remove operator first
kubectl delete deployment istio-operator -n istio-operator
kubectl delete ns istio-operator
# Remove policy
kubectl delete deployment istio-policy -n istio-system
# Install new istio and istio-ingress chart
# Remobe old ingress
kubectl delete deployment istio-ingressgateway -n istio-system
kubectl delete deployment istio-private-ingressgateway -n istio-system

18
charts/kubezero-local-path-provisioner/README.md
View File

@ -1,8 +1,8 @@
# kubezero-local-volume-provisioner
# kubezero-local-path-provisioner
![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.4](https://img.shields.io/badge/AppVersion-2.3.4-informational?style=flat-square)
![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.0.18](https://img.shields.io/badge/AppVersion-0.0.18-informational?style=flat-square)
KubeZero Umbrella Chart for local-static-provisioner
KubeZero Umbrella Chart for local-path-provisioner
Provides persistent volumes backed by local volumes, eg. additional SSDs or spindles.
@ -26,11 +26,13 @@ Kubernetes: `>= 1.16.0`
| Key | Type | Default | Description |
|-----|------|---------|-------------|
| local-static-provisioner.classes[0].hostDir | string | `"/mnt/disks"` | |
| local-static-provisioner.classes[0].name | string | `"local-sc-xfs"` | |
| local-static-provisioner.common.namespace | string | `"kube-system"` | |
| local-static-provisioner.daemonset.nodeSelector."node.kubernetes.io/localVolume" | string | `"present"` | |
| local-static-provisioner.prometheus.operator.enabled | bool | `false` | |
| local-path-provisioner.nodePathMap[0].node | string | `"DEFAULT_PATH_FOR_NON_LISTED_NODES"` | |
| local-path-provisioner.nodePathMap[0].paths[0] | string | `"/opt/local-path-provisioner"` | |
| local-path-provisioner.nodeSelector."node-role.kubernetes.io/master" | string | `""` | |
| local-path-provisioner.storageClass.create | bool | `true` | |
| local-path-provisioner.storageClass.defaultClass | bool | `false` | |
| local-path-provisioner.tolerations[0].effect | string | `"NoSchedule"` | |
| local-path-provisioner.tolerations[0].key | string | `"node-role.kubernetes.io/master"` | |
## KubeZero default configuration

2
charts/kubezero-logging/README.md
View File

@ -20,7 +20,7 @@ Kubernetes: `>= 1.16.0`
|------------|------|---------|
| https://helm.elastic.co | eck-operator | 1.3.0 |
| https://kubernetes-charts.storage.googleapis.com/ | fluentd | 2.5.1 |
| https://zero-down-time.github.io/kubezero/ | fluent-bit | 0.7.2 |
| https://zero-down-time.github.io/kubezero/ | fluent-bit | 0.7.10 |
| https://zero-down-time.github.io/kubezero/ | kubezero-lib | >= 0.1.3 |
## Changes from upstream

6
charts/kubezero-metrics/README.md
View File

@ -18,7 +18,7 @@ Kubernetes: `>= 1.16.0`
| Repository | Name | Version |
|------------|------|---------|
| https://prometheus-community.github.io/helm-charts | kube-prometheus-stack | 11.1.1 |
| https://prometheus-community.github.io/helm-charts | kube-prometheus-stack | 12.2.4 |
| https://prometheus-community.github.io/helm-charts | prometheus-adapter | 2.7.1 |
| https://zero-down-time.github.io/kubezero/ | kubezero-lib | >= 0.1.3 |
@ -27,7 +27,7 @@ Kubernetes: `>= 1.16.0`
| Key | Type | Default | Description |
|-----|------|---------|-------------|
| grafana.istio.enabled | bool | `false` | |
| grafana.istio.gateway | string | `"istio-system/ingressgateway"` | |
| grafana.istio.gateway | string | `"istio-ingress/ingressgateway"` | |
| grafana.istio.ipBlocks | list | `[]` | |
| grafana.istio.url | string | `""` | |
| kube-prometheus-stack.alertmanager.enabled | bool | `false` | |
@ -109,7 +109,7 @@ Kubernetes: `>= 1.16.0`
| prometheus-adapter.tolerations[0].effect | string | `"NoSchedule"` | |
| prometheus-adapter.tolerations[0].key | string | `"node-role.kubernetes.io/master"` | |
| prometheus.istio.enabled | bool | `false` | |
| prometheus.istio.gateway | string | `"istio-system/ingressgateway"` | |
| prometheus.istio.gateway | string | `"istio-ingress/ingressgateway"` | |
| prometheus.istio.url | string | `""` | |
# Dashboards

25
charts/kubezero/README.md
View File

@ -2,7 +2,7 @@
![Version: 0.5.0](https://img.shields.io/badge/Version-0.5.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
KubeZero ArgoCD Application - Root App of Apps chart of KubeZero
KubeZero - Bootstrap and ArgoCD Root App of Apps chart
**Homepage:** <https://kubezero.com>
@ -24,27 +24,38 @@ Kubernetes: `>= 1.16.0`
| Key | Type | Default | Description |
|-----|------|---------|-------------|
| argo-cd.enabled | bool | `false` | |
| argo-cd.namespace | string | `"argocd"` | |
| HighAvailableControlplane | bool | `false` | |
| argo | object | `{}` | |
| argocd.crds | bool | `true` | |
| argocd.enabled | bool | `false` | |
| argocd.istio.enabled | bool | `false` | |
| argocd.namespace | string | `"argocd"` | |
| aws-ebs-csi-driver.enabled | bool | `false` | |
| aws-efs-csi-driver.enabled | bool | `false` | |
| calico.crds | bool | `true` | |
| calico.enabled | bool | `false` | |
| calico.retain | bool | `true` | |
| cert-manager.crds | bool | `true` | |
| cert-manager.enabled | bool | `false` | |
| cert-manager.namespace | string | `"cert-manager"` | |
| global.defaultDestination.server | string | `"https://kubernetes.default.svc"` | |
| global.defaultSource.pathPrefix | string | `""` | |
| global.defaultSource.repoURL | string | `"https://github.com/zero-down-time/kubezero"` | |
| global.defaultSource.targetRevision | string | `"HEAD"` | |
| global.kubezero.pathPrefix | string | `""` | |
| global.kubezero.repoURL | string | `"https://github.com/zero-down-time/kubezero"` | |
| global.kubezero.server | string | `"https://kubernetes.default.svc"` | |
| global.kubezero.targetRevision | string | `"HEAD"` | |
| istio-ingress.enabled | bool | `false` | |
| istio-ingress.namespace | string | `"istio-ingress"` | |
| istio.crds | bool | `true` | |
| istio.enabled | bool | `false` | |
| istio.namespace | string | `"istio-system"` | |
| kiam.enabled | bool | `false` | |
| local-path-provisioner.enabled | bool | `false` | |
| local-volume-provisioner.enabled | bool | `false` | |
| logging.enabled | bool | `false` | |
| logging.namespace | string | `"logging"` | |
| metrics.crds | bool | `true` | |
| metrics.enabled | bool | `false` | |
| metrics.istio.grafana | object | `{}` | |
| metrics.istio.prometheus | object | `{}` | |
| metrics.namespace | string | `"monitoring"` | |
----------------------------------------------

12
charts/kubezero/templates/argo-cd.yaml → charts/kubezero/templates/argocd.yaml
View File

@ -1,4 +1,4 @@
{{- define "argo-cd-values" }}
{{- define "argocd-values" }}
argo-cd:
controller:
metrics:
@ -9,21 +9,21 @@ argo-cd:
server:
metrics:
enabled: {{ .Values.metrics.enabled }}
{{- with index .Values "argo-cd" "server" }}
{{- with index .Values "argocd" "server" }}
{{- toYaml . | nindent 4 }}
{{- end }}
{{- with index .Values "argo-cd" "configs" }}
{{- with index .Values "argocd" "configs" }}
configs:
{{- toYaml . | nindent 4 }}
{{- end }}
{{- if and ( index .Values "argo-cd" "istio" "enabled" ) .Values.istio.enabled }}
{{- if and ( index .Values "argocd" "istio" "enabled" ) .Values.istio.enabled }}
istio:
{{- with index .Values "argo-cd" "istio" }}
{{- with index .Values "argocd" "istio" }}
{{- toYaml . | nindent 2 }}
{{- end }}
{{- end }}
{{- with index .Values "argo-cd" "kubezero" }}
{{- with index .Values "argocd" "kubezero" }}
kubezero:
{{- toYaml . | nindent 2 }}
{{- end }}

2
charts/kubezero/templates/argoless.yaml
View File

@ -1,6 +1,6 @@
{{- if not .Values.argo }}
{{- $artifacts := list "calico" "cert-manager" "kiam" "aws-ebs-csi-driver" "aws-efs-csi-driver" "local-volume-provisioner" "local-path-provisioner" "istio" "istio-ingress" "metrics" "logging" "argo-cd" }}
{{- $artifacts := list "calico" "cert-manager" "kiam" "aws-ebs-csi-driver" "aws-efs-csi-driver" "local-volume-provisioner" "local-path-provisioner" "istio" "istio-ingress" "metrics" "logging" "argocd" }}
{{- if .Values.global }}
global:

4
charts/kubezero/values.yaml
View File

@ -53,10 +53,10 @@ metrics:
logging:
enabled: false
crds: true
# crds: true
namespace: logging
argo-cd:
argocd:
enabled: false
crds: true
namespace: argocd

12
docs/Upgrade.md
View File

@ -1,11 +1,19 @@
# Upgrade to KubeZero V2(Argoless)
- disable all auto-sync in argo !!
- disable all auto-sync in argo !! ( remove auto-sync from old values.yaml and run deploy one last time ) or disable manual via Argo UI starting with Kubezero app itself
- migrate values.yaml to new structure,adapt as needed
- uninstall argo helm chart
`helm uninstall kubezero -n argocd`
- migrate values.yaml to new structure, adapt as needed
- update new central kubezero location in git and merge cluster configs
- Upgrade control plane nodes / worker nodes
- upgrade all crds
- upgrade calico,cert-manager,kiam,csi drivers
- Istio:
## High level / Admin changes
- ArgoCD is now optional
- ArgoCD is NOT required nor used during initial cluster bootstrap