wip: Match chart to k8s state

values/cert-manager/manifests/cert-manager.yaml

@@ -4,8 +4,6 @@ kind: Application
 metadata:
   name: cert-manager
   namespace: argocd
-  annotations:
-    argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
   finalizers:
   - resources-finalizer.argocd.argoproj.io
 spec:
@@ -14,13 +12,18 @@ spec:
     server: 'https://kubernetes.default.svc'
   sources:
   - repoURL: {{ .Values.clusterConfig.manifests }}
-    targetRevision: HEAD
-    path: helmfiles/cert-manager
+    # targetRevision: HEAD
+    targetRevision: mrtz/helmify
+    path: helmfile.d
     plugin:
-      name: helmfile
+      name: helmfile-cmp
       env:
       - name: CLUSTER_NAME
         value: {{ .Values.clusterConfig.cluster }}
+      - name: HELMFILE_ENVIRONMENT
+        value: default
+      - name: HELMFILE_FILE_PATH
+        value: cert-manager.yaml.gotmpl
   project: sys
   syncPolicy:
     managedNamespaceMetadata:
@@ -29,7 +32,7 @@ spec:
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
-      # - ServerSideApply=true
+      - ServerSideApply=true
     {{- if .Values.cert_manager.autosync }}
     automated:
       prune: true

values/cert-manager/manifests/pre-cert-manager.yaml

@@ -10,7 +10,7 @@ spec:
     # The ACME server URL
     server: https://acme-v02.api.letsencrypt.org/directory
     # Email address used for ACME registration
-    email: {{ .Values.cluster_config.acme_email }}
+    email: {{ .Values.clusterConfig.acme_email }}
     # Name of a secret used to store the ACME account private key
     privateKeySecretRef:
       name: letsencrypt-production
@@ -30,7 +30,7 @@ spec:
     # The ACME server URL
     server: https://acme-staging-v02.api.letsencrypt.org/directory
     # Email address used for ACME registration
-    email: {{ .Values.cluster_config.acme_email }}
+    email: {{ .Values.clusterConfig.acme_email }}
     # Name of a secret used to store the ACME account private key
     privateKeySecretRef:
       name: letsencrypt-staging
@@ -93,7 +93,7 @@ rules:
   - watch
 ---
 
-{{ if .Values.cluster_config.initca }}
+{{ if .Values.clusterConfig.initca }}
 
 # Pod to update certificates from master nodes
 # only runs on control plane nodes (etcd)
@@ -153,11 +153,11 @@ spec:
       volumes:
         - name: ca-pem
           hostPath:
-            path: {{.Values.cluster_config.initca}}/ca.pem
+            path: {{.Values.clusterConfig.initca}}/ca.pem
             type: File
         - name: ca-key-pem
           hostPath:
-            path: {{.Values.cluster_config.initca}}/ca-key.pem
+            path: {{.Values.clusterConfig.initca}}/ca-key.pem
             type: File
         - name: certs-script
           configMap: