fix ArgoCD resourceHealthChecks

cilcenk · Jan 4, 2024 · 7ca54ed · 7ca54ed
1 parent ed7e8b9
commit 7ca54ed
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 20 deletions.
diff --git a/gitops/cluster-config/templates/openshift-gitops-argocd.yaml b/gitops/cluster-config/templates/openshift-gitops-argocd.yaml
@@ -60,23 +60,23 @@ spec:
         hs.status = "Progressing"
         hs.message = "Waiting for InstallPlan to complete"
         return hs
-    - kind: PersistentVolumeClaim
-      check: |
-        hs = {}
-        if obj.status ~= nil then
-          if obj.status.phase ~= nil then
-            if obj.status.phase == "Pending" then
-              hs.status = "Healthy"
-              hs.message = obj.status.phase
-              return hs
-            end
-            if obj.status.phase == "Bound" then
-              hs.status = "Healthy"
-              hs.message = obj.status.phase
-              return hs
-            end
-          end
-        end
-        hs.status = "Progressing"
-        hs.message = "Waiting for certificate"
-        return hs
+    # - kind: PersistentVolumeClaim
+    #   check: |
+    #     hs = {}
+    #     if obj.status ~= nil then
+    #       if obj.status.phase ~= nil then
+    #         if obj.status.phase == "Pending" then
+    #           hs.status = "Healthy"
+    #           hs.message = obj.status.phase
+    #           return hs
+    #         end
+    #         if obj.status.phase == "Bound" then
+    #           hs.status = "Healthy"
+    #           hs.message = obj.status.phase
+    #           return hs
+    #         end
+    #       end
+    #     end
+    #     hs.status = "Progressing"
+    #     hs.message = "Waiting for certificate"
+    #     return hs
diff --git a/gitops/cluster-config/templates/pipelines/pipeline-blue-green.yaml b/gitops/cluster-config/templates/pipelines/pipeline-blue-green.yaml
@@ -629,6 +629,8 @@ kind: PersistentVolumeClaim
 metadata:
   namespace: {{ .Values.namespace }}
   name: workspace-pvc-shop-cd-new-version
+  annotations:
+    argocd.argoproj.io/sync-wave: "1000"
 spec:
   accessModes:
   - ReadWriteOnce

diff --git a/gitops/cluster-config/templates/pipelines/pipeline-e2e-tests.yaml b/gitops/cluster-config/templates/pipelines/pipeline-e2e-tests.yaml
@@ -79,6 +79,8 @@ kind: PersistentVolumeClaim
 metadata:
   namespace: {{ .Values.namespace }}
   name: workspace-pvc-shop-cd-e2e-tests
+  annotations:
+    argocd.argoproj.io/sync-wave: "1000"
 spec:
   accessModes:
   - ReadWriteOnce

diff --git a/gitops/cluster-config/templates/users/pipelines/pipeline-blue-green-environments.yaml b/gitops/cluster-config/templates/users/pipelines/pipeline-blue-green-environments.yaml
@@ -624,6 +624,8 @@ kind: PersistentVolumeClaim
 metadata:
   namespace: {{ $user }}-continuous-deployment
   name: workspace-pvc-shop-cd-new-version
+  annotations:
+    argocd.argoproj.io/sync-wave: "1000"
 spec:
   accessModes:
   - ReadWriteOnce

diff --git a/gitops/cluster-config/templates/users/pipelines/pipeline-e2e-tests.yaml b/gitops/cluster-config/templates/users/pipelines/pipeline-e2e-tests.yaml
@@ -77,6 +77,8 @@ kind: PersistentVolumeClaim
 metadata:
   namespace: {{ $user }}-continuous-deployment
   name: workspace-pvc-shop-cd-e2e-tests
+  annotations:
+    argocd.argoproj.io/sync-wave: "1000"
 spec:
   accessModes:
   - ReadWriteOnce