Merge pull request #15 from openinfradev/argocd_ignore_autoscaling_nodes

argocd ignore autoscaling nodes
openinfradev · May 23, 2023 · a7ce626 · a7ce626
2 parents 6161642 + a82304b
commit a7ce626
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 8 deletions.
diff --git 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
@@ -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: {}

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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]"