adjust external secrets for argocd (#727)

* server side apply argocd * adjust external secret for reconcile and remove sleep job * removing extra ServerSideApply true * add argocd application to all stacks --------- Co-authored-by: John Dietz <[email protected]>
konstructio · Mar 20, 2024 · 3b8bbcf · 3b8bbcf
1 parent 1afc01d
commit 3b8bbcf
Show file tree

Hide file tree

Showing 36 changed files with 282 additions and 208 deletions.
diff --git a/akamai-github/templates/mgmt/components/argocd/application.yaml b/akamai-github/templates/mgmt/components/argocd/application.yaml
@@ -0,0 +1,23 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: argocd-kustomized-app
+  namespace: argocd
+  finalizers:
+    - resources-finalizer.argocd.argoproj.io
+spec:
+  destination:
+    namespace: argocd
+    name: in-cluster
+  project: default
+  source:
+    path: registry/clusters/<CLUSTER_NAME>/components/argocd
+    repoURL: '<GITOPS_REPO_URL>'
+    targetRevision: HEAD
+    kustomize:
+      forceCommonLabels: true
+      forceCommonAnnotations: true
+  syncPolicy:
+    syncOptions:
+      - CreateNamespace=true
+      - ServerSideApply=true
diff --git a/akamai-github/templates/mgmt/components/argocd/argocd-oidc-restart-job.yaml b/akamai-github/templates/mgmt/components/argocd/argocd-oidc-restart-job.yaml
@@ -58,23 +58,3 @@ spec:
             - kubectl -n argocd rollout restart deployment/argocd-server
       restartPolicy: OnFailure
       serviceAccountName: argocd-oidc-restart-job
----
-apiVersion: batch/v1
-kind: Job
-metadata:
-  annotations:
-    argocd.argoproj.io/sync-wave: '120'
-    argocd.argoproj.io/hook: PostSync
-  name: argocd-sleep-after-restart
-  namespace: argocd
-spec:
-  template:
-    spec:
-      containers:
-        - name: argocd-sleep-after-restart-job
-          image: public.ecr.aws/bitnami/kubectl:1.24
-          command:
-            - /bin/sh
-            - -c
-            - "sleep 120"
-      restartPolicy: OnFailure
diff --git a/akamai-github/templates/mgmt/components/argocd/externalsecrets.yaml b/akamai-github/templates/mgmt/components/argocd/externalsecrets.yaml
@@ -13,10 +13,12 @@ spec:
   refreshInterval: 10s
   data:
     - remoteRef:
+        conversionStrategy: Default
         key: oidc/argocd
         property: client_secret
       secretKey: clientSecret
     - remoteRef:
+        conversionStrategy: Default
         key: oidc/argocd
         property: client_id
       secretKey: clientId
diff --git a/aws-github/templates/mgmt/components/argocd/application.yaml b/aws-github/templates/mgmt/components/argocd/application.yaml
@@ -0,0 +1,23 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: argocd-kustomized-app
+  namespace: argocd
+  finalizers:
+    - resources-finalizer.argocd.argoproj.io
+spec:
+  destination:
+    namespace: argocd
+    name: in-cluster
+  project: default
+  source:
+    path: registry/clusters/<CLUSTER_NAME>/components/argocd
+    repoURL: '<GITOPS_REPO_URL>'
+    targetRevision: HEAD
+    kustomize:
+      forceCommonLabels: true
+      forceCommonAnnotations: true
+  syncPolicy:
+    syncOptions:
+      - CreateNamespace=true
+      - ServerSideApply=true
diff --git a/aws-github/templates/mgmt/components/argocd/argocd-oidc-restart-job.yaml b/aws-github/templates/mgmt/components/argocd/argocd-oidc-restart-job.yaml
@@ -58,23 +58,3 @@ spec:
             - kubectl -n argocd rollout restart deployment/argocd-server
       restartPolicy: OnFailure
       serviceAccountName: argocd-oidc-restart-job
----
-apiVersion: batch/v1
-kind: Job
-metadata:
-  annotations:
-    argocd.argoproj.io/sync-wave: '120'
-    argocd.argoproj.io/hook: PostSync
-  name: argocd-sleep-after-restart
-  namespace: argocd
-spec:
-  template:
-    spec:
-      containers:
-        - name: argocd-sleep-after-restart-job
-          image: public.ecr.aws/bitnami/kubectl:1.24
-          command:
-            - /bin/sh
-            - -c
-            - "sleep 120"
-      restartPolicy: OnFailure
diff --git a/aws-github/templates/mgmt/components/argocd/externalsecrets.yaml b/aws-github/templates/mgmt/components/argocd/externalsecrets.yaml
@@ -13,10 +13,12 @@ spec:
   refreshInterval: 10s
   data:
     - remoteRef:
+        conversionStrategy: Default
         key: oidc/argocd
         property: client_secret
       secretKey: clientSecret
     - remoteRef:
+        conversionStrategy: Default
         key: oidc/argocd
         property: client_id
       secretKey: clientId
diff --git a/aws-gitlab/templates/mgmt/components/argocd/application.yaml b/aws-gitlab/templates/mgmt/components/argocd/application.yaml
@@ -0,0 +1,23 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: argocd-kustomized-app
+  namespace: argocd
+  finalizers:
+    - resources-finalizer.argocd.argoproj.io
+spec:
+  destination:
+    namespace: argocd
+    name: in-cluster
+  project: default
+  source:
+    path: registry/clusters/<CLUSTER_NAME>/components/argocd
+    repoURL: '<GITOPS_REPO_URL>'
+    targetRevision: HEAD
+    kustomize:
+      forceCommonLabels: true
+      forceCommonAnnotations: true
+  syncPolicy:
+    syncOptions:
+      - CreateNamespace=true
+      - ServerSideApply=true
diff --git a/aws-gitlab/templates/mgmt/components/argocd/argocd-oidc-restart-job.yaml b/aws-gitlab/templates/mgmt/components/argocd/argocd-oidc-restart-job.yaml
@@ -58,23 +58,3 @@ spec:
             - kubectl -n argocd rollout restart deployment/argocd-server
       restartPolicy: OnFailure
       serviceAccountName: argocd-oidc-restart-job
----
-apiVersion: batch/v1
-kind: Job
-metadata:
-  annotations:
-    argocd.argoproj.io/sync-wave: '120'
-    argocd.argoproj.io/hook: PostSync
-  name: argocd-sleep-after-restart
-  namespace: argocd
-spec:
-  template:
-    spec:
-      containers:
-        - name: argocd-sleep-after-restart-job
-          image: public.ecr.aws/bitnami/kubectl:1.24
-          command:
-            - /bin/sh
-            - -c
-            - "sleep 120"
-      restartPolicy: OnFailure
diff --git a/aws-gitlab/templates/mgmt/components/argocd/externalsecrets.yaml b/aws-gitlab/templates/mgmt/components/argocd/externalsecrets.yaml
@@ -13,10 +13,12 @@ spec:
   refreshInterval: 10s
   data:
     - remoteRef:
+        conversionStrategy: Default
         key: oidc/argocd
         property: client_secret
       secretKey: clientSecret
     - remoteRef:
+        conversionStrategy: Default
         key: oidc/argocd
         property: client_id
       secretKey: clientId
diff --git a/civo-github/templates/mgmt/components/argocd/argocd-oidc-restart-job.yaml b/civo-github/templates/mgmt/components/argocd/argocd-oidc-restart-job.yaml
@@ -58,4 +58,3 @@ spec:
             - kubectl -n argocd rollout restart deployment/argocd-server
       restartPolicy: OnFailure
       serviceAccountName: argocd-oidc-restart-job
-
diff --git a/civo-github/templates/mgmt/components/argocd/externalsecrets.yaml b/civo-github/templates/mgmt/components/argocd/externalsecrets.yaml
@@ -13,10 +13,12 @@ spec:
   refreshInterval: 10s
   data:
     - remoteRef:
+        conversionStrategy: Default
         key: oidc/argocd
         property: client_secret
       secretKey: clientSecret
     - remoteRef:
+        conversionStrategy: Default
         key: oidc/argocd
         property: client_id
       secretKey: clientId
diff --git a/civo-gitlab/templates/mgmt/components/argocd/application.yaml b/civo-gitlab/templates/mgmt/components/argocd/application.yaml
@@ -0,0 +1,23 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: argocd-kustomized-app
+  namespace: argocd
+  finalizers:
+    - resources-finalizer.argocd.argoproj.io
+spec:
+  destination:
+    namespace: argocd
+    name: in-cluster
+  project: default
+  source:
+    path: registry/clusters/<CLUSTER_NAME>/components/argocd
+    repoURL: '<GITOPS_REPO_URL>'
+    targetRevision: HEAD
+    kustomize:
+      forceCommonLabels: true
+      forceCommonAnnotations: true
+  syncPolicy:
+    syncOptions:
+      - CreateNamespace=true
+      - ServerSideApply=true
diff --git a/civo-gitlab/templates/mgmt/components/argocd/argocd-oidc-restart-job.yaml b/civo-gitlab/templates/mgmt/components/argocd/argocd-oidc-restart-job.yaml
@@ -58,23 +58,3 @@ spec:
             - kubectl -n argocd rollout restart deployment/argocd-server
       restartPolicy: OnFailure
       serviceAccountName: argocd-oidc-restart-job
----
-apiVersion: batch/v1
-kind: Job
-metadata:
-  annotations:
-    argocd.argoproj.io/sync-wave: '120'
-    argocd.argoproj.io/hook: PostSync
-  name: argocd-sleep-after-restart
-  namespace: argocd
-spec:
-  template:
-    spec:
-      containers:
-        - name: argocd-sleep-after-restart-job
-          image: public.ecr.aws/bitnami/kubectl:1.24
-          command:
-            - /bin/sh
-            - -c
-            - "sleep 120"
-      restartPolicy: OnFailure
diff --git a/civo-gitlab/templates/mgmt/components/argocd/externalsecrets.yaml b/civo-gitlab/templates/mgmt/components/argocd/externalsecrets.yaml
@@ -13,10 +13,12 @@ spec:
   refreshInterval: 10s
   data:
     - remoteRef:
+        conversionStrategy: Default
         key: oidc/argocd
         property: client_secret
       secretKey: clientSecret
     - remoteRef:
+        conversionStrategy: Default
         key: oidc/argocd
         property: client_id
       secretKey: clientId
diff --git a/digitalocean-github/templates/mgmt/argocd.yaml b/digitalocean-github/templates/mgmt/argocd.yaml
@@ -15,8 +15,6 @@ spec:
     server: 'https://kubernetes.default.svc'
     namespace: argocd
   syncPolicy:
-    syncOptions:
-    - ServerSideApply=true
     automated:
       prune: true
       selfHeal: true

diff --git a/digitalocean-github/templates/mgmt/components/argocd/application.yaml b/digitalocean-github/templates/mgmt/components/argocd/application.yaml
@@ -0,0 +1,23 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: argocd-kustomized-app
+  namespace: argocd
+  finalizers:
+    - resources-finalizer.argocd.argoproj.io
+spec:
+  destination:
+    namespace: argocd
+    name: in-cluster
+  project: default
+  source:
+    path: registry/clusters/<CLUSTER_NAME>/components/argocd
+    repoURL: '<GITOPS_REPO_URL>'
+    targetRevision: HEAD
+    kustomize:
+      forceCommonLabels: true
+      forceCommonAnnotations: true
+  syncPolicy:
+    syncOptions:
+      - CreateNamespace=true
+      - ServerSideApply=true
diff --git a/digitalocean-github/templates/mgmt/components/argocd/argocd-oidc-restart-job.yaml b/digitalocean-github/templates/mgmt/components/argocd/argocd-oidc-restart-job.yaml
@@ -58,23 +58,3 @@ spec:
             - kubectl -n argocd rollout restart deployment/argocd-server
       restartPolicy: OnFailure
       serviceAccountName: argocd-oidc-restart-job
----
-apiVersion: batch/v1
-kind: Job
-metadata:
-  annotations:
-    argocd.argoproj.io/sync-wave: '120'
-    argocd.argoproj.io/hook: PostSync
-  name: argocd-sleep-after-restart
-  namespace: argocd
-spec:
-  template:
-    spec:
-      containers:
-        - name: argocd-sleep-after-restart-job
-          image: public.ecr.aws/bitnami/kubectl:1.24
-          command:
-            - /bin/sh
-            - -c
-            - "sleep 120"
-      restartPolicy: OnFailure
diff --git a/digitalocean-github/templates/mgmt/components/argocd/externalsecrets.yaml b/digitalocean-github/templates/mgmt/components/argocd/externalsecrets.yaml
@@ -13,10 +13,12 @@ spec:
   refreshInterval: 10s
   data:
     - remoteRef:
+        conversionStrategy: Default
         key: oidc/argocd
         property: client_secret
       secretKey: clientSecret
     - remoteRef:
+        conversionStrategy: Default
         key: oidc/argocd
         property: client_id
       secretKey: clientId
diff --git a/digitalocean-gitlab/templates/mgmt/components/argocd/application.yaml b/digitalocean-gitlab/templates/mgmt/components/argocd/application.yaml
@@ -0,0 +1,23 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: argocd-kustomized-app
+  namespace: argocd
+  finalizers:
+    - resources-finalizer.argocd.argoproj.io
+spec:
+  destination:
+    namespace: argocd
+    name: in-cluster
+  project: default
+  source:
+    path: registry/clusters/<CLUSTER_NAME>/components/argocd
+    repoURL: '<GITOPS_REPO_URL>'
+    targetRevision: HEAD
+    kustomize:
+      forceCommonLabels: true
+      forceCommonAnnotations: true
+  syncPolicy:
+    syncOptions:
+      - CreateNamespace=true
+      - ServerSideApply=true
diff --git a/digitalocean-gitlab/templates/mgmt/components/argocd/argocd-oidc-restart-job.yaml b/digitalocean-gitlab/templates/mgmt/components/argocd/argocd-oidc-restart-job.yaml
@@ -58,23 +58,3 @@ spec:
             - kubectl -n argocd rollout restart deployment/argocd-server
       restartPolicy: OnFailure
       serviceAccountName: argocd-oidc-restart-job
----
-apiVersion: batch/v1
-kind: Job
-metadata:
-  annotations:
-    argocd.argoproj.io/sync-wave: '120'
-    argocd.argoproj.io/hook: PostSync
-  name: argocd-sleep-after-restart
-  namespace: argocd
-spec:
-  template:
-    spec:
-      containers:
-        - name: argocd-sleep-after-restart-job
-          image: public.ecr.aws/bitnami/kubectl:1.24
-          command:
-            - /bin/sh
-            - -c
-            - "sleep 120"
-      restartPolicy: OnFailure
diff --git a/digitalocean-gitlab/templates/mgmt/components/argocd/externalsecrets.yaml b/digitalocean-gitlab/templates/mgmt/components/argocd/externalsecrets.yaml
@@ -13,10 +13,12 @@ spec:
   refreshInterval: 10s
   data:
     - remoteRef:
+        conversionStrategy: Default
         key: oidc/argocd
         property: client_secret
       secretKey: clientSecret
     - remoteRef:
+        conversionStrategy: Default
         key: oidc/argocd
         property: client_id
       secretKey: clientId