wip: Match chart to k8s state

values/nfs-provisioner/manifests/nfs-provisioner.yaml

@@ -4,23 +4,24 @@ kind: Application
 metadata:
   name: nfs-provisioner
   namespace: argocd
-  annotations:
-    argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
-  finalizers:
-  - resources-finalizer.argocd.argoproj.io
 spec:
   destination:
     namespace: kube-system 
     server: 'https://kubernetes.default.svc'
   sources:
   - repoURL: {{ .Values.clusterConfig.manifests }}
-    targetRevision: HEAD
-    path: helmfiles/nfs-provisioner
+    # 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: nfs-provisioner.yaml.gotmpl
   project: sys
   syncPolicy:
     managedNamespaceMetadata:
@@ -29,7 +30,7 @@ spec:
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
-      # - ServerSideApply=true
+      - ServerSideApply=true
     {{- if .Values.nfs_provisioner.autosync }}
     automated:
       prune: true

values/nfs-provisioner/values-oceanbox.yaml.gotmpl

@@ -0,0 +1,8 @@
+nfs_provisioner:
+  enabled: true
+  autosync: true
+  archiveOnDelete: true
+  defaultClass: true
+  path: "oceanbox"
+  extraMountOpts:
+    - soft

values/nfs-provisioner/values.yaml.gotmpl

@@ -3,4 +3,5 @@ nfs_provisioner:
   autosync: true
   archiveOnDelete: true
   defaultClass: true
+  path: ""
   extraMountOpts: []

values/nfs-provisioner/values/nfs-provisioner.yaml.gotmpl

@@ -1,5 +1,5 @@
 nfs:
-  server: {{ .Values.cluster_config.fileserver }}
+  server: {{ .Values.clusterConfig.fileserver }}
   path: /{{ default (.Values.clusterConfig.cluster) .Values.nfs_provisioner.path }}
   mountOptions:
     - nfsvers=4.2
@@ -13,4 +13,4 @@ storageClass:
 tolerations:
     - key: unschedulable
       operator: Exists
-      effect: NoSchedule
+      effect: NoSchedule