diff --git a/admin/dev_apply.sh b/admin/dev_apply.sh index 830a6d1e..1c1a12f7 100755 --- a/admin/dev_apply.sh +++ b/admin/dev_apply.sh @@ -5,7 +5,7 @@ set -x ARTIFACTS=($(echo $1 | tr "," "\n")) ACTION="${2:-apply}" -ARGOCD="${3:-False}" +ARGOCD="${3:-false}" LOCAL_DEV=1 diff --git a/admin/kubezero.sh b/admin/kubezero.sh index 5a69b3ef..1d4bf433 100755 --- a/admin/kubezero.sh +++ b/admin/kubezero.sh @@ -131,7 +131,7 @@ control_plane_upgrade() { update_kubezero_cm - if [ "$ARGOCD" == "True" ]; then + if [ "$ARGOCD" == "true" ]; then # update argo app export kubezero_chart_version=$(yq .version $CHARTS/kubezero/Chart.yaml) kubectl get application kubezero -n argocd -o yaml | \ diff --git a/admin/libhelm.sh b/admin/libhelm.sh index 9e51ad83..0cc927b0 100644 --- a/admin/libhelm.sh +++ b/admin/libhelm.sh @@ -29,14 +29,14 @@ function chart_location() { function argo_used() { kubectl get application kubezero -n argocd >/dev/null \ - && echo "True" || echo "False" + && echo "true" || echo "false" } function field_manager() { - local argo=${1:-"False"} + local argo=${1:-"false"} - if [ "$argo" == "True" ]; then + if [ "$argo" == "true" ]; then echo "--field-manager argo-controller" else echo "" @@ -61,9 +61,9 @@ function set_kubezero_secret() { # get kubezero-values from ArgoCD if available or use in-cluster CM function get_kubezero_values() { - local argo=${1:-"False"} + local argo=${1:-"false"} - if [ "$argo" == "True" ]; then + if [ "$argo" == "true" ]; then kubectl get application kubezero -n argocd -o yaml | yq .spec.source.helm.valuesObject > ${WORKDIR}/kubezero-values.yaml else kubectl get configmap kubezero-values -n kubezero -o yaml | yq '.data."values.yaml"' > ${WORKDIR}/kubezero-values.yaml @@ -80,7 +80,7 @@ function update_kubezero_cm() { # sync kubezero-values CM from ArgoCD app function sync_kubezero_cm_from_argo() { - get_kubezero_values True + get_kubezero_values true update_kubezero_cm } @@ -216,9 +216,11 @@ function _helm() { declare -F ${module}-pre && ${module}-pre render - [ $action == "apply" ] && kubectl apply -f $WORKDIR/helm.yaml --server-side --force-conflicts $(field_manager $ARGOCD) && rc=$? || rc=$? [ $action == "replace" ] && kubectl replace -f $WORKDIR/helm.yaml $(field_manager $ARGOCD) && rc=$? || rc=$? + # If replace failed try apply at least + [ $action == "apply" -o $rc -ne 0 ] && kubectl apply -f $WORKDIR/helm.yaml --server-side --force-conflicts $(field_manager $ARGOCD) && rc=$? || rc=$? + # Optional post hook declare -F ${module}-post && ${module}-post diff --git a/admin/upgrade_cluster.sh b/admin/upgrade_cluster.sh index 67b3feee..428bdf36 100755 --- a/admin/upgrade_cluster.sh +++ b/admin/upgrade_cluster.sh @@ -17,7 +17,7 @@ ARGOCD=$(argo_used) echo "Checking that all pods in kube-system are running ..." #waitSystemPodsRunning -[ "$ARGOCD" == "True" ] && disable_argo +[ "$ARGOCD" == "true" ] && disable_argo # Check if we already have all controllers on the current version OLD_CONTROLLERS=$(kubectl get nodes -l "node-role.kubernetes.io/control-plane=" --no-headers=true | grep -cv $KUBE_VERSION || true) @@ -35,7 +35,7 @@ read -r #echo "Adjust kubezero values as needed:" # shellcheck disable=SC2015 -#[ "$ARGOCD" == "True" ] && kubectl edit app kubezero -n argocd || kubectl edit cm kubezero-values -n kubezero +#[ "$ARGOCD" == "true" ] && kubectl edit app kubezero -n argocd || kubectl edit cm kubezero-values -n kubezero # upgrade modules control_plane_upgrade "apply_network, apply_addons, apply_storage, apply_operators" @@ -63,4 +63,4 @@ echo "Then head over to ArgoCD for this cluster and sync all KubeZero modules to echo " to continue and re-enable ArgoCD:" read -r -[ "$ARGOCD" == "True" ] && enable_argo +[ "$ARGOCD" == "true" ] && enable_argo diff --git a/charts/kubezero-argo/Chart.yaml b/charts/kubezero-argo/Chart.yaml index 93d81540..ea84f1fc 100644 --- a/charts/kubezero-argo/Chart.yaml +++ b/charts/kubezero-argo/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 description: KubeZero Argo - Events, Workflow, CD name: kubezero-argo -version: 0.2.9 +version: 0.3.0 home: https://kubezero.com icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png keywords: @@ -25,12 +25,8 @@ dependencies: version: 7.8.9 repository: https://argoproj.github.io/argo-helm condition: argo-cd.enabled - - name: argocd-apps - version: 2.0.2 - repository: https://argoproj.github.io/argo-helm - condition: argo-cd.enabled - name: argocd-image-updater version: 0.12.0 repository: https://argoproj.github.io/argo-helm condition: argocd-image-updater.enabled -kubeVersion: ">= 1.26.0-0" +kubeVersion: ">= 1.30.0-0" diff --git a/charts/kubezero-argo/README.md b/charts/kubezero-argo/README.md index fbb76f45..eb09ec74 100644 --- a/charts/kubezero-argo/README.md +++ b/charts/kubezero-argo/README.md @@ -1,6 +1,6 @@ # kubezero-argo -![Version: 0.2.8](https://img.shields.io/badge/Version-0.2.8-informational?style=flat-square) +![Version: 0.3.0](https://img.shields.io/badge/Version-0.3.0-informational?style=flat-square) KubeZero Argo - Events, Workflow, CD @@ -14,15 +14,14 @@ KubeZero Argo - Events, Workflow, CD ## Requirements -Kubernetes: `>= 1.26.0-0` +Kubernetes: `>= 1.30.0-0` | Repository | Name | Version | |------------|------|---------| -| https://argoproj.github.io/argo-helm | argo-cd | 7.8.2 | +| https://argoproj.github.io/argo-helm | argo-cd | 7.8.9 | | https://argoproj.github.io/argo-helm | argo-events | 2.4.13 | -| https://argoproj.github.io/argo-helm | argocd-apps | 2.0.2 | | https://argoproj.github.io/argo-helm | argocd-image-updater | 0.12.0 | -| https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.6 | +| https://cdn.zero-downtime.net/charts/ | kubezero-lib | 0.2.1 | ## Values @@ -30,7 +29,7 @@ Kubernetes: `>= 1.26.0-0` |-----|------|---------|-------------| | argo-cd.configs.cm."application.instanceLabelKey" | string | `nil` | | | argo-cd.configs.cm."application.resourceTrackingMethod" | string | `"annotation"` | | -| argo-cd.configs.cm."resource.customizations" | string | `"cert-manager.io/Certificate:\n # Lua script for customizing the health status assessment\n health.lua: |\n hs = {}\n if obj.status ~= nil then\n if obj.status.conditions ~= nil then\n for i, condition in ipairs(obj.status.conditions) do\n if condition.type == \"Ready\" and condition.status == \"False\" then\n hs.status = \"Degraded\"\n hs.message = condition.message\n return hs\n end\n if condition.type == \"Ready\" and condition.status == \"True\" then\n hs.status = \"Healthy\"\n hs.message = condition.message\n return hs\n end\n end\n end\n end\n hs.status = \"Progressing\"\n hs.message = \"Waiting for certificate\"\n return hs\n"` | | +| argo-cd.configs.cm."resource.customizations" | string | `"argoproj.io/Application:\n health.lua: |\n hs = {}\n hs.status = \"Progressing\"\n hs.message = \"\"\n if obj.status ~= nil then\n if obj.status.health ~= nil then\n hs.status = obj.status.health.status\n if obj.status.health.message ~= nil then\n hs.message = obj.status.health.message\n end\n end\n end\n return hs\n"` | | | argo-cd.configs.cm."timeout.reconciliation" | string | `"300s"` | | | argo-cd.configs.cm."ui.bannercontent" | string | `"KubeZero v1.31 - Release notes"` | | | argo-cd.configs.cm."ui.bannerpermanent" | string | `"true"` | | @@ -39,8 +38,8 @@ Kubernetes: `>= 1.26.0-0` | argo-cd.configs.cm.installationID | string | `"KubeZero-ArgoCD"` | | | argo-cd.configs.cm.url | string | `"https://argocd.example.com"` | | | argo-cd.configs.params."controller.diff.server.side" | string | `"true"` | | -| argo-cd.configs.params."controller.operation.processors" | string | `"5"` | | -| argo-cd.configs.params."controller.status.processors" | string | `"10"` | | +| argo-cd.configs.params."controller.resource.health.persist" | string | `"false"` | | +| argo-cd.configs.params."controller.sync.timeout.seconds" | int | `1800` | | | argo-cd.configs.params."server.enable.gzip" | bool | `true` | | | argo-cd.configs.params."server.insecure" | bool | `true` | | | argo-cd.configs.secret.createSecret | bool | `false` | | @@ -54,31 +53,24 @@ Kubernetes: `>= 1.26.0-0` | argo-cd.dex.enabled | bool | `false` | | | argo-cd.enabled | bool | `false` | | | argo-cd.global.image.repository | string | `"public.ecr.aws/zero-downtime/zdt-argocd"` | | -| argo-cd.global.image.tag | string | `"v2.13.1"` | | +| argo-cd.global.image.tag | string | `"v2.14.5"` | | | argo-cd.global.logging.format | string | `"json"` | | | argo-cd.global.networkPolicy.create | bool | `true` | | | argo-cd.istio.enabled | bool | `false` | | | argo-cd.istio.gateway | string | `"istio-ingress/ingressgateway"` | | | argo-cd.istio.ipBlocks | list | `[]` | | +| argo-cd.kubezero.bootstrap | bool | `false` | | +| argo-cd.kubezero.path | string | `"/"` | | +| argo-cd.kubezero.repoUrl | string | `"https://git.my.org/thiscluster"` | | +| argo-cd.kubezero.targetRevision | string | `"HEAD"` | | | argo-cd.notifications.enabled | bool | `false` | | +| argo-cd.redisSecretInit.enabled | bool | `false` | | | argo-cd.repoServer.clusterRoleRules.enabled | bool | `true` | | | argo-cd.repoServer.clusterRoleRules.rules[0].apiGroups[0] | string | `""` | | | argo-cd.repoServer.clusterRoleRules.rules[0].resources[0] | string | `"secrets"` | | | argo-cd.repoServer.clusterRoleRules.rules[0].verbs[0] | string | `"get"` | | | argo-cd.repoServer.clusterRoleRules.rules[0].verbs[1] | string | `"watch"` | | | argo-cd.repoServer.clusterRoleRules.rules[0].verbs[2] | string | `"list"` | | -| argo-cd.repoServer.initContainers[0].command[0] | string | `"/usr/local/bin/sa2kubeconfig.sh"` | | -| argo-cd.repoServer.initContainers[0].command[1] | string | `"/home/argocd/.kube/config"` | | -| argo-cd.repoServer.initContainers[0].image | string | `"{{ default .Values.global.image.repository .Values.repoServer.image.repository }}:{{ default (include \"argo-cd.defaultTag\" .) .Values.repoServer.image.tag }}"` | | -| argo-cd.repoServer.initContainers[0].imagePullPolicy | string | `"{{ default .Values.global.image.imagePullPolicy .Values.repoServer.image.imagePullPolicy }}"` | | -| argo-cd.repoServer.initContainers[0].name | string | `"create-kubeconfig"` | | -| argo-cd.repoServer.initContainers[0].securityContext.allowPrivilegeEscalation | bool | `false` | | -| argo-cd.repoServer.initContainers[0].securityContext.capabilities.drop[0] | string | `"ALL"` | | -| argo-cd.repoServer.initContainers[0].securityContext.readOnlyRootFilesystem | bool | `true` | | -| argo-cd.repoServer.initContainers[0].securityContext.runAsNonRoot | bool | `true` | | -| argo-cd.repoServer.initContainers[0].securityContext.seccompProfile.type | string | `"RuntimeDefault"` | | -| argo-cd.repoServer.initContainers[0].volumeMounts[0].mountPath | string | `"/home/argocd/.kube"` | | -| argo-cd.repoServer.initContainers[0].volumeMounts[0].name | string | `"kubeconfigs"` | | | argo-cd.repoServer.metrics.enabled | bool | `false` | | | argo-cd.repoServer.metrics.serviceMonitor.enabled | bool | `true` | | | argo-cd.repoServer.volumeMounts[0].mountPath | string | `"/home/argocd/.kube"` | | @@ -101,9 +93,6 @@ Kubernetes: `>= 1.26.0-0` | argo-events.configs.jetstream.versions[0].startCommand | string | `"/nats-server"` | | | argo-events.configs.jetstream.versions[0].version | string | `"2.10.11"` | | | argo-events.enabled | bool | `false` | | -| argocd-apps.applications | object | `{}` | | -| argocd-apps.enabled | bool | `false` | | -| argocd-apps.projects | object | `{}` | | | argocd-image-updater.authScripts.enabled | bool | `true` | | | argocd-image-updater.authScripts.scripts."ecr-login.sh" | string | `"#!/bin/sh\naws ecr --region $AWS_REGION get-authorization-token --output text --query 'authorizationData[].authorizationToken' | base64 -d\n"` | | | argocd-image-updater.authScripts.scripts."ecr-public-login.sh" | string | `"#!/bin/sh\naws ecr-public --region us-east-1 get-authorization-token --output text --query 'authorizationData.authorizationToken' | base64 -d\n"` | | diff --git a/charts/kubezero-argo/templates/argo-cd/kubezero-git-sync-app.yaml b/charts/kubezero-argo/templates/argo-cd/kubezero-git-sync-app.yaml new file mode 100644 index 00000000..67d1f552 --- /dev/null +++ b/charts/kubezero-argo/templates/argo-cd/kubezero-git-sync-app.yaml @@ -0,0 +1,28 @@ +{{- if index .Values "argo-cd" "kubezero" "bootstrap" }} +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: kubezero-git-sync + namespace: argocd + annotations: + argocd.argoproj.io/sync-wave: "-20" +spec: + destination: + namespace: argocd + server: https://kubernetes.default.svc + project: kubezero + source: + {{- with index .Values "argo-cd" "kubezero" }} + repoURL: {{ .repoUrl }} + targetRevision: {{ .targetRevision }} + path: {{ .path }} + {{- end }} + directory: + recurse: true + syncPolicy: + automated: + prune: true + syncOptions: + - ServerSideApply=true + - ApplyOutOfSyncOnly=true +{{- end }} diff --git a/charts/kubezero-argo/templates/argo-cd/kubezero-project.yaml b/charts/kubezero-argo/templates/argo-cd/kubezero-project.yaml new file mode 100644 index 00000000..3af1a3fc --- /dev/null +++ b/charts/kubezero-argo/templates/argo-cd/kubezero-project.yaml @@ -0,0 +1,18 @@ +{{- if index .Values "argo-cd" "kubezero" "bootstrap" }} +apiVersion: argoproj.io/v1alpha1 +kind: AppProject +metadata: + name: kubezero + namespace: argocd +spec: + clusterResourceWhitelist: + - group: '*' + kind: '*' + description: KubeZero - ZeroDownTime Kubernetes Platform + destinations: + - namespace: '*' + server: https://kubernetes.default.svc + sourceRepos: + - https://cdn.zero-downtime.net/charts + - {{ index .Values "argo-cd" "kubezero" "repoUrl" }} +{{- end }} diff --git a/charts/kubezero-argo/values.yaml b/charts/kubezero-argo/values.yaml index 9096f907..a126e461 100644 --- a/charts/kubezero-argo/values.yaml +++ b/charts/kubezero-argo/values.yaml @@ -30,13 +30,6 @@ argo-events: configReloaderImage: natsio/nats-server-config-reloader:0.14.1 startCommand: /nats-server - -argocd-apps: - enabled: false - projects: {} - applications: {} - - argo-cd: enabled: false @@ -45,7 +38,7 @@ argo-cd: format: json image: repository: public.ecr.aws/zero-downtime/zdt-argocd - tag: v2.14.2 + tag: v2.14.5 networkPolicy: create: true @@ -71,28 +64,19 @@ argo-cd: application.instanceLabelKey: Null resource.customizations: | - cert-manager.io/Certificate: - # Lua script for customizing the health status assessment + argoproj.io/Application: health.lua: | hs = {} + hs.status = "Progressing" + hs.message = "" if obj.status ~= nil then - if obj.status.conditions ~= nil then - for i, condition in ipairs(obj.status.conditions) do - if condition.type == "Ready" and condition.status == "False" then - hs.status = "Degraded" - hs.message = condition.message - return hs - end - if condition.type == "Ready" and condition.status == "True" then - hs.status = "Healthy" - hs.message = condition.message - return hs - end + if obj.status.health ~= nil then + hs.status = obj.status.health.status + if obj.status.health.message ~= nil then + hs.message = obj.status.health.message end end end - hs.status = "Progressing" - hs.message = "Waiting for certificate" return hs secret: @@ -148,26 +132,6 @@ argo-cd: resources: ["secrets"] verbs: ["get", "watch", "list"] - initContainers: - - name: create-kubeconfig - image: '{{ default .Values.global.image.repository .Values.repoServer.image.repository }}:{{ default (include "argo-cd.defaultTag" .) .Values.repoServer.image.tag }}' - imagePullPolicy: '{{ default .Values.global.image.imagePullPolicy .Values.repoServer.image.imagePullPolicy }}' - command: - - /usr/local/bin/sa2kubeconfig.sh - - /home/argocd/.kube/config - volumeMounts: - - mountPath: /home/argocd/.kube - name: kubeconfigs - securityContext: - runAsNonRoot: true - readOnlyRootFilesystem: true - allowPrivilegeEscalation: false - seccompProfile: - type: RuntimeDefault - capabilities: - drop: - - ALL - server: # Rename former https port to grpc, works with istio + insecure service: @@ -198,6 +162,14 @@ argo-cd: gateway: istio-ingress/ingressgateway ipBlocks: [] + kubezero: + # only set this once initially to prevent the circular dependency + bootstrap: false + + repoUrl: "https://git.my.org/thiscluster" + path: "/" + targetRevision: HEAD + argocd-image-updater: enabled: false diff --git a/charts/kubezero-telemetry/values.yaml b/charts/kubezero-telemetry/values.yaml index 6f3d0cc6..173f2c11 100644 --- a/charts/kubezero-telemetry/values.yaml +++ b/charts/kubezero-telemetry/values.yaml @@ -274,7 +274,7 @@ fluentd: #- fluent-plugin-s3 source: - sharedKey: secretref+k8s://v1/Secret/kubezero/kubezero-secrets/telemetry.fluentd.source.sharedKey # "cloudbender" + sharedKey: secretref+k8s://v1/Secret/kubezero/kubezero-secrets/telemetry.fluentd.source.sharedKey?inCluster # "cloudbender" output: # Defaults to OpenSearch in same namespace diff --git a/charts/kubezero/README.md b/charts/kubezero/README.md index 4ec51680..e35acb4f 100644 --- a/charts/kubezero/README.md +++ b/charts/kubezero/README.md @@ -1,6 +1,6 @@ # kubezero -![Version: 1.31.3](https://img.shields.io/badge/Version-1.31.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) +![Version: 1.31.6](https://img.shields.io/badge/Version-1.31.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) KubeZero - Root App of Apps chart @@ -14,11 +14,11 @@ KubeZero - Root App of Apps chart ## Requirements -Kubernetes: `>= 1.26.0-0` +Kubernetes: `>= 1.31.0-0` | Repository | Name | Version | |------------|------|---------| -| https://cdn.zero-downtime.net/charts | kubezero-lib | >= 0.2.1 | +| https://cdn.zero-downtime.net/charts | kubezero-lib | 0.2.1 | ## Values @@ -32,16 +32,17 @@ Kubernetes: `>= 1.26.0-0` | addons.external-dns.enabled | bool | `false` | | | addons.forseti.enabled | bool | `false` | | | addons.sealed-secrets.enabled | bool | `false` | | -| addons.targetRevision | string | `"0.8.11"` | | +| addons.targetRevision | string | `"0.8.13"` | | | argo.argo-cd.enabled | bool | `false` | | | argo.argo-cd.istio.enabled | bool | `false` | | +| argo.argocd-apps.enabled | bool | `false` | | | argo.argocd-image-updater.enabled | bool | `false` | | | argo.enabled | bool | `false` | | | argo.namespace | string | `"argocd"` | | -| argo.targetRevision | string | `"0.2.6"` | | +| argo.targetRevision | string | `"0.2.9"` | | | cert-manager.enabled | bool | `false` | | | cert-manager.namespace | string | `"cert-manager"` | | -| cert-manager.targetRevision | string | `"0.9.10"` | | +| cert-manager.targetRevision | string | `"0.9.12"` | | | falco.enabled | bool | `false` | | | falco.k8saudit.enabled | bool | `false` | | | falco.targetRevision | string | `"0.1.2"` | | @@ -54,35 +55,32 @@ Kubernetes: `>= 1.26.0-0` | istio-ingress.enabled | bool | `false` | | | istio-ingress.gateway.service | object | `{}` | | | istio-ingress.namespace | string | `"istio-ingress"` | | -| istio-ingress.targetRevision | string | `"0.23.2"` | | +| istio-ingress.targetRevision | string | `"0.24.3"` | | | istio-private-ingress.chart | string | `"kubezero-istio-gateway"` | | | istio-private-ingress.enabled | bool | `false` | | | istio-private-ingress.gateway.service | object | `{}` | | | istio-private-ingress.namespace | string | `"istio-ingress"` | | -| istio-private-ingress.targetRevision | string | `"0.23.2"` | | +| istio-private-ingress.targetRevision | string | `"0.24.3"` | | | istio.enabled | bool | `false` | | | istio.namespace | string | `"istio-system"` | | -| istio.targetRevision | string | `"0.23.2"` | | -| kubezero.defaultTargetRevision | string | `"*"` | | -| kubezero.gitSync | object | `{}` | | -| kubezero.repoURL | string | `"https://cdn.zero-downtime.net/charts"` | | -| kubezero.server | string | `"https://kubernetes.default.svc"` | | +| istio.targetRevision | string | `"0.24.3"` | | +| logging.annotations."argocd.argoproj.io/compare-options" | string | `"ServerSideDiff=false"` | | | logging.enabled | bool | `false` | | | logging.namespace | string | `"logging"` | | -| logging.targetRevision | string | `"0.8.13"` | | +| logging.targetRevision | string | `"0.8.14"` | | | metrics.enabled | bool | `false` | | | metrics.istio.grafana | object | `{}` | | | metrics.istio.prometheus | object | `{}` | | | metrics.kubezero.prometheus.prometheusSpec.additionalScrapeConfigs | list | `[]` | | | metrics.namespace | string | `"monitoring"` | | -| metrics.targetRevision | string | `"0.10.2"` | | +| metrics.targetRevision | string | `"0.11.0"` | | | network.cilium.cluster | object | `{}` | | | network.enabled | bool | `true` | | | network.retain | bool | `true` | | -| network.targetRevision | string | `"0.5.5"` | | +| network.targetRevision | string | `"0.5.7"` | | | operators.enabled | bool | `false` | | | operators.namespace | string | `"operators"` | | -| operators.targetRevision | string | `"0.1.6"` | | +| operators.targetRevision | string | `"0.2.0"` | | | storage.aws-ebs-csi-driver.enabled | bool | `false` | | | storage.aws-efs-csi-driver.enabled | bool | `false` | | | storage.enabled | bool | `false` | | @@ -90,7 +88,7 @@ Kubernetes: `>= 1.26.0-0` | storage.k8up.enabled | bool | `false` | | | storage.lvm-localpv.enabled | bool | `false` | | | storage.snapshotController.enabled | bool | `false` | | -| storage.targetRevision | string | `"0.8.9"` | | +| storage.targetRevision | string | `"0.8.10"` | | | telemetry.enabled | bool | `false` | | | telemetry.namespace | string | `"telemetry"` | | | telemetry.targetRevision | string | `"0.4.1"` | | diff --git a/charts/kubezero/templates/_app.tpl b/charts/kubezero/templates/_app.tpl index 1630b061..6554f40f 100644 --- a/charts/kubezero/templates/_app.tpl +++ b/charts/kubezero/templates/_app.tpl @@ -21,20 +21,16 @@ spec: project: kubezero source: - {{- if index .Values $name "chart" }} - chart: {{ index .Values $name "chart" }} - {{- else }} - chart: kubezero-{{ $name }} - {{- end }} - repoURL: {{ .Values.kubezero.repoURL }} - targetRevision: {{ default .Values.kubezero.targetRevision ( index .Values $name "targetRevision" ) | quote }} + chart: {{ default (print "kubezero-" $name) (index .Values $name "chart") }} + repoURL: {{ default "https://cdn.zero-downtime.net/charts" (index .Values $name "repository") }} + targetRevision: {{ default "HEAD" ( index .Values $name "targetRevision" ) | quote }} helm: skipTests: true valuesObject: {{- include (print $name "-values") $ | nindent 8 }} destination: - server: {{ .Values.kubezero.server }} + server: "https://kubernetes.default.svc" namespace: {{ default "kube-system" ( index .Values $name "namespace" ) }} revisionHistoryLimit: 2 diff --git a/charts/kubezero/templates/argo.yaml b/charts/kubezero/templates/argo.yaml index 5b6e6543..82e0739b 100644 --- a/charts/kubezero/templates/argo.yaml +++ b/charts/kubezero/templates/argo.yaml @@ -39,42 +39,10 @@ argo-cd: {{- end }} {{- end }} -argocd-apps: - enabled: {{ default "false" (index .Values "argo" "argo-cd" "enabled") }} - projects: - kubezero: - namespace: argocd - description: KubeZero - ZeroDownTime Kubernetes Platform - sourceRepos: - - {{ .Values.kubezero.repoURL }} - {{- with .Values.kubezero.gitSync.repoURL }} - - {{ . }} - {{- end }} - destinations: - - namespace: '*' - server: https://kubernetes.default.svc - clusterResourceWhitelist: - - group: '*' - kind: '*' - applications: - kubezero-git-sync: - namespace: argocd - project: kubezero - source: - repoURL: {{ .Values.kubezero.gitSync.repoURL }} - targetRevision: {{ .Values.kubezero.gitSync.targetRevision }} - path: {{ .Values.kubezero.gitSync.path }} - - directory: - recurse: true - - destination: - server: https://kubernetes.default.svc - namespace: argocd - - syncPolicy: - automated: - prune: true + {{- with index .Values "argo" "argo-cd" "kubezero" }} + kubezero: + {{- toYaml . | nindent 4 }} + {{- end }} argocd-image-updater: enabled: {{ default "false" (index .Values "argo" "argocd-image-updater" "enabled") }} diff --git a/charts/kubezero/values.yaml b/charts/kubezero/values.yaml index 391aea15..13506715 100644 --- a/charts/kubezero/values.yaml +++ b/charts/kubezero/values.yaml @@ -1,9 +1,3 @@ -kubezero: - server: https://kubernetes.default.svc - repoURL: https://cdn.zero-downtime.net/charts - defaultTargetRevision: '*' - gitSync: {} - global: clusterName: zdt-trial-cluster @@ -121,7 +115,7 @@ logging: argo: enabled: false namespace: argocd - targetRevision: 0.2.8 + targetRevision: 0.3.0 argo-cd: enabled: false istio: