From a321a27629d2a56af3f2ae8ed58a9c4ea09977da Mon Sep 17 00:00:00 2001 From: Jugwan Eom Date: Tue, 23 May 2023 02:28:22 +0000 Subject: [PATCH 1/2] argocd: ignore worker nodes replicas differences the number of replicas in machinedeployment and machinepool are managed by cluster-autoscaler. so, argocd will ignore the difference. --- argocd-install/template-values-override.yaml | 8 ++++++++ argocd-install/values-override.yaml | 12 ++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/argocd-install/template-values-override.yaml b/argocd-install/template-values-override.yaml index 99d2c4c..dcf16c8 100644 --- a/argocd-install/template-values-override.yaml +++ b/argocd-install/template-values-override.yaml @@ -21,6 +21,14 @@ server: health_status.status = "Healthy" health_status.message = "Jaeger Controlplane is Running" return health_status + cluster.x-k8s.io/MachinePool: + ignoreDifferences: | + jsonPointers: + - /spec/replicas + cluster.x-k8s.io/MachineDeployment: + ignoreDifferences: | + jsonPointers: + - /spec/replicas resource.customizations.ignoreDifferences.admissionregistration.k8s.io_MutatingWebhookConfiguration: | jqPathExpressions: - '.webhooks[]?.clientConfig.caBundle' diff --git a/argocd-install/values-override.yaml b/argocd-install/values-override.yaml index 86df032..e5ee8c5 100644 --- a/argocd-install/values-override.yaml +++ b/argocd-install/values-override.yaml @@ -21,6 +21,14 @@ server: health_status.status = "Healthy" health_status.message = "Jaeger Controlplane is Running" return health_status + cluster.x-k8s.io/MachinePool: + ignoreDifferences: | + jsonPointers: + - /spec/replicas + cluster.x-k8s.io/MachineDeployment: + ignoreDifferences: | + jsonPointers: + - /spec/replicas resource.customizations.ignoreDifferences.admissionregistration.k8s.io_MutatingWebhookConfiguration: | jqPathExpressions: - '.webhooks[]?.clientConfig.caBundle' @@ -39,7 +47,7 @@ server: source: path: decapod-apps repoURL: https://github.com/openinfradev/decapod-bootstrap.git - targetRevision: release-v2 + targetRevision: main directory: recurse: true jsonnet: {} @@ -56,7 +64,7 @@ server: source: path: decapod-projects repoURL: https://github.com/openinfradev/decapod-bootstrap.git - targetRevision: release-v2 + targetRevision: main directory: recurse: true jsonnet: {} From a82304b20c021d40c4d4dfbf368b825b4cfdb930 Mon Sep 17 00:00:00 2001 From: Jugwan Eom Date: Tue, 23 May 2023 02:32:28 +0000 Subject: [PATCH 2/2] use main revision --- decapod-apps/argo-workflows-crds.yaml | 2 +- decapod-apps/argo-workflows.yaml | 2 +- decapod-apps/db-secret-argo.yaml | 2 +- decapod-apps/db-secret-decapod-db.yaml | 2 +- decapod-apps/postgresql.yaml | 2 +- genereate_yamls.sh | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/decapod-apps/argo-workflows-crds.yaml b/decapod-apps/argo-workflows-crds.yaml index 36e63cd..a7d48e2 100644 --- a/decapod-apps/argo-workflows-crds.yaml +++ b/decapod-apps/argo-workflows-crds.yaml @@ -11,7 +11,7 @@ spec: source: path: decapod-reference/decapod-controller/argo-workflows-operator-crds repoURL: https://github.com/openinfradev/decapod-manifests.git - targetRevision: release-v2 + targetRevision: main syncPolicy: syncOptions: - CreateNamespace=false diff --git a/decapod-apps/argo-workflows.yaml b/decapod-apps/argo-workflows.yaml index d37a1e8..778ef80 100644 --- a/decapod-apps/argo-workflows.yaml +++ b/decapod-apps/argo-workflows.yaml @@ -11,7 +11,7 @@ spec: source: path: decapod-reference/decapod-controller/argo-workflows-operator repoURL: https://github.com/openinfradev/decapod-manifests.git - targetRevision: release-v2 + targetRevision: main syncPolicy: syncOptions: - CreateNamespace=false diff --git a/decapod-apps/db-secret-argo.yaml b/decapod-apps/db-secret-argo.yaml index e9a9bc5..fb4b79b 100644 --- a/decapod-apps/db-secret-argo.yaml +++ b/decapod-apps/db-secret-argo.yaml @@ -11,7 +11,7 @@ spec: source: path: decapod-reference/decapod-controller/db-secret-argo repoURL: https://github.com/openinfradev/decapod-manifests.git - targetRevision: release-v2 + targetRevision: main syncPolicy: syncOptions: - CreateNamespace=false diff --git a/decapod-apps/db-secret-decapod-db.yaml b/decapod-apps/db-secret-decapod-db.yaml index f08e7ff..db8157a 100644 --- a/decapod-apps/db-secret-decapod-db.yaml +++ b/decapod-apps/db-secret-decapod-db.yaml @@ -11,7 +11,7 @@ spec: source: path: decapod-reference/decapod-controller/db-secret-decapod-db repoURL: https://github.com/openinfradev/decapod-manifests.git - targetRevision: release-v2 + targetRevision: main syncPolicy: syncOptions: - CreateNamespace=false diff --git a/decapod-apps/postgresql.yaml b/decapod-apps/postgresql.yaml index e414dd4..a5535a7 100644 --- a/decapod-apps/postgresql.yaml +++ b/decapod-apps/postgresql.yaml @@ -11,7 +11,7 @@ spec: source: path: decapod-reference/decapod-controller/postgresql repoURL: https://github.com/openinfradev/decapod-manifests.git - targetRevision: release-v2 + targetRevision: main syncPolicy: syncOptions: - CreateNamespace=false diff --git a/genereate_yamls.sh b/genereate_yamls.sh index abcbd60..48d8485 100755 --- a/genereate_yamls.sh +++ b/genereate_yamls.sh @@ -10,7 +10,7 @@ DOCKER_IMAGE_REPO="docker.io" QUAY_IMAGE_REPO="quay.io" GITHUB_IMAGE_REPO="ghcr.io" -GIT_REVISION="HEAD" +GIT_REVISION="main" function usage { echo -e "\nUsage: $0 [--site SITE_NAME] [--bootstrap-git BOOTSTRAP_GIT_URL ] [--manifests-git MANIFESTS_GIT_URL] [--git-rev GIT_REVISION] [--registry REGISTRY_URL]"