From e7f40804c670f5146daf87e1888be7103ef2a6d9 Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Fri, 9 Aug 2024 10:41:24 +0000 Subject: [PATCH] feat: some prep work for gcp support --- admin/kubezero.sh | 1 + charts/kubezero-argo/values.yaml | 2 +- charts/kubezero/values.yaml | 8 +++++++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/admin/kubezero.sh b/admin/kubezero.sh index a84975b0..ff59db1e 100755 --- a/admin/kubezero.sh +++ b/admin/kubezero.sh @@ -66,6 +66,7 @@ render_kubeadm() { parse_kubezero() { export CLUSTERNAME=$(yq eval '.global.clusterName // .clusterName' ${HOSTFS}/etc/kubernetes/kubeadm-values.yaml) + export PLATFORM=$(yq eval '.global.platform // "nocloud"' ${HOSTFS}/etc/kubernetes/kubeadm-values.yaml) export HIGHAVAILABLE=$(yq eval '.global.highAvailable // .highAvailable // "false"' ${HOSTFS}/etc/kubernetes/kubeadm-values.yaml) export ETCD_NODENAME=$(yq eval '.etcd.nodeName' ${HOSTFS}/etc/kubernetes/kubeadm-values.yaml) export NODENAME=$(yq eval '.nodeName' ${HOSTFS}/etc/kubernetes/kubeadm-values.yaml) diff --git a/charts/kubezero-argo/values.yaml b/charts/kubezero-argo/values.yaml index 53d3069d..936e5380 100644 --- a/charts/kubezero-argo/values.yaml +++ b/charts/kubezero-argo/values.yaml @@ -91,7 +91,7 @@ argo-cd: secret: createSecret: false - # `htpasswd -nbBC 10 "" $ARGO_PWD | tr -d ':\n' | sed 's/$2y/$2a/'` + # `htpasswd -nbBC 10 "" $ARGO_PWD | tr -d ':\n' | sed 's/$2y/$2a/' | base64 -w0` # argocdServerAdminPassword: "$2a$10$ivKzaXVxMqdeDSfS3nqi1Od3iDbnL7oXrixzDfZFRHlXHnAG6LydG" # argocdServerAdminPassword: "ref+file://secrets.yaml#/test" # argocdServerAdminPasswordMtime: "2020-04-24T15:33:09BST" diff --git a/charts/kubezero/values.yaml b/charts/kubezero/values.yaml index 2a20af5f..47d66262 100644 --- a/charts/kubezero/values.yaml +++ b/charts/kubezero/values.yaml @@ -5,9 +5,15 @@ kubezero: gitSync: {} global: - highAvailable: false clusterName: zdt-trial-cluster + + # platform: aws (kubeadm), gke, or nocloud ( default ) + platform: "nocloud" + + highAvailable: false + aws: {} + gcp: {} addons: enabled: true