refactor appset chart deployment logic

Signed-off-by: Pankaj Walke <[email protected]>

packages/addons-appset.yaml

@@ -0,0 +1,38 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: addons-appset
+  namespace: argocd
+  labels:
+    env: dev
+  finalizers:
+    - resources-finalizer.argocd.argoproj.io
+spec:
+  project: default
+  destination:
+    name: hub
+    namespace: argocd
+  sources:
+    - repoURL: cnoe://appset-chart
+      targetRevision: HEAD
+      path: chart
+      helm:
+        valueFiles:
+          - $values/values.yaml
+    - repoURL: cnoe://addons-appset
+      targetRevision: HEAD
+      ref: values
+  syncPolicy:
+    automated:
+      selfHeal: true
+      allowEmpty: true
+      prune: true
+    retry:
+      limit: -1 # number of failed sync attempt retries; unlimited number of attempts if less than 0
+      backoff:
+        duration: 5s # the amount to back off. Default unit is seconds, but could also be a duration (e.g. "2m", "1h")
+        factor: 2 # a factor to multiply the base duration after each failed retry
+        maxDuration: 10m # the maximum amount of time allowed for the backoff strategy
+    syncOptions:
+      - CreateNamespace=true
+      - ServerSideApply=true 

packages/addons-appset/values.yaml

@@ -0,0 +1,11 @@
+# Used for deploying the hub-addons AppSet chart ArgoCD Application on hub cluster
+valueFiles:
+  - "."
+
+hub-addons-appset:
+  enabled: true
+  chartName: addons-appset
+  namespace: argocd
+  releaseName: addons-appset
+  type: chart
+  path: packages/addons-appset/chart

packages/hub-addons-appset/chart/values.yaml → packages/appset-chart/values.yaml

@@ -13,7 +13,7 @@ syncPolicy:
     - CreateNamespace=true
     - ServerSideApply=true  # Big CRDs.
 syncPolicyAppSet:
-  preserveResourcesOnDeletion: true
+  preserveResourcesOnDeletion: false
 useSelectors: true
 repoURLGit: '{{.metadata.annotations.addons_repo_url}}'
 repoURLGitRevision: '{{.metadata.annotations.addons_repo_revision}}'

packages/argocd-hub.yaml

@@ -27,8 +27,16 @@ spec:
       targetRevision: HEAD
       path: manifests
   syncPolicy:
-    syncOptions:
-      - CreateNamespace=true
     automated:
       selfHeal: true
-      prune: true
+      allowEmpty: true
+      prune: true
+    retry:
+      limit: -1 # number of failed sync attempt retries; unlimited number of attempts if less than 0
+      backoff:
+        duration: 5s # the amount to back off. Default unit is seconds, but could also be a duration (e.g. "2m", "1h")
+        factor: 2 # a factor to multiply the base duration after each failed retry
+        maxDuration: 10m # the maximum amount of time allowed for the backoff strategy
+    syncOptions:
+      - CreateNamespace=true
+      - ServerSideApply=true 

packages/external-secrets-hub.yaml

@@ -29,9 +29,17 @@ spec:
     name: hub
     namespace: external-secrets
   syncPolicy:
-    syncOptions:
-      - CreateNamespace=true
     automated:
       selfHeal: true
+      allowEmpty: true
       prune: true
+    retry:
+      limit: -1 # number of failed sync attempt retries; unlimited number of attempts if less than 0
+      backoff:
+        duration: 5s # the amount to back off. Default unit is seconds, but could also be a duration (e.g. "2m", "1h")
+        factor: 2 # a factor to multiply the base duration after each failed retry
+        maxDuration: 10m # the maximum amount of time allowed for the backoff strategy
+    syncOptions:
+      - CreateNamespace=true
+      - ServerSideApply=true 
 

scripts/install.sh

@@ -79,15 +79,15 @@ EOF
 
 echo -e "${BOLD}${GREEN}🔄 Running idpbuilder to apply packages...${NC}"
 idpbuilder create --use-path-routing --protocol http --package "$REPO_ROOT/packages/" -c "argocd:${CLUSTER_SECRET_FILE}"
+sleep 60
 
 echo -e "${YELLOW}⏳ Waiting for hub-addons to be healthy...${NC}"
 kubectl wait --for=jsonpath=.status.health.status=Healthy  -n argocd application/hub-addons --timeout=15m
 echo -e "${GREEN}✅ hub-addons is now healthy!${NC}"
-sleep 60
 
-echo -e "${YELLOW}⏳ Waiting for Backstage on the hub Cluster to be Healthy...${NC}"
-kubectl wait --for=jsonpath=.status.health.status=Healthy -n argocd application/backstage-hub --kubeconfig $KUBECONFIG_FILE --timeout=-30m
-echo -e "${BOLD}${GREEN}✅ Backstage is now healthy!${NC}"
+echo -e "${YELLOW}⏳ Waiting for all Argo CD apps on the hub Cluster to be Healthy...${NC}"
+kubectl wait --for=jsonpath=.status.health.status=Healthy -n argocd --all applications --kubeconfig $KUBECONFIG_FILE --timeout=-30m
+echo -e "${BOLD}${GREEN}✅ All Argo CD apps is now healthy!${NC}"
 
 echo -e "\n${BOLD}${BLUE}🎉 Installation completed successfully! 🎉${NC}"
 echo -e "${CYAN}📊 You can now access your resources and start deploying applications.${NC}"