CSI driver GitOps Blog Edits

eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/README.md

@@ -4,7 +4,7 @@ In order to sucessfully install the VMware CSI Driver, the following items must
 1. Creation of the `ClusterSecretStore` Kubernetes resource detailed in the eks-anywhere-addons/README.md file 
 
 2. Creation of config secrets in AWS Secrets Manager that External secrets will reference in the 
-vsphere-csi-externalsecrets.yaml file.
+vsphere-external-secrets.yaml file.
 
 # Creation of the Config Secrets 
 

eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vmware-csi-kustomization.yaml

@@ -0,0 +1,62 @@
+---
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: vmware-csi-namespace-kustomization
+  namespace: flux-system
+  labels:
+    app: vmware-csi-driver
+spec:
+  interval: 1m0s
+  path: ./eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vmware-csi-namespace
+  prune: true
+  sourceRef:
+    kind: GitRepository
+    name: addons
+  healthChecks:
+    - apiVersion: v1
+      kind: Namespace
+      name: vmware-system-csi
+---
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: vmware-csi-secrets-kustomization
+  namespace: flux-system
+  labels:
+    app: vmware-csi-driver
+spec:
+  dependsOn:
+    - name: vmware-csi-namespace-kustomization
+  interval: 1m0s
+  path: ./eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vmware-csi-secrets
+  prune: true
+  sourceRef:
+    kind: GitRepository
+    name: addons
+  healthChecks:
+    - apiVersion: v1
+      kind: Secret
+      name: vsphere.conf
+      namespace: kube-system   
+    - apiVersion: v1
+      kind: Secret
+      name: vsphere-config-secret
+      namespace: vmware-system-csi
+---
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: vmware-csi-driver-kustomization
+  namespace: flux-system
+  labels:
+    app: vmware-csi-driver
+spec:
+  dependsOn:
+    - name: vmware-csi-secrets-kustomization
+  interval: 1m0s
+  path: ./eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vmware-csi-manifests
+  prune: true
+  sourceRef:
+    kind: GitRepository
+    name: addons

eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vsphere-cloud-controller-manager.yaml → eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vmware-csi-manifests/vsphere-cloud-controller-manager.yaml

@@ -145,6 +145,7 @@ metadata:
   labels:
     component: cloud-controller-manager
     tier: control-plane
+    kustomize.toolkit.fluxcd.io/force: enabled
   namespace: kube-system
 spec:
   selector:
@@ -204,4 +205,4 @@ spec:
                     operator: Exists
               - matchExpressions:
                   - key: node-role.kubernetes.io/master
-                    operator: Exists
+                    operator: Exists

eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vsphere-csi-driver.yaml → eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vmware-csi-manifests/vsphere-csi-driver.yaml

@@ -411,7 +411,7 @@ spec:
           volumeMounts:
             - mountPath: /csi
               name: socket-dir
-      volumes:
+      volumes:  
         - name: vsphere-config-volume
           secret:
             secretName: vsphere-config-secret

eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot-tester.yaml → eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot-tester-kustomization.yaml

@@ -1,4 +1,4 @@
-apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
+apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
   name: test-app
@@ -9,10 +9,10 @@ spec:
     kind: GitRepository
     name: addons
     namespace: flux-system
-  interval: 5m0s
+  interval: 1m0s
   prune: true
 ---
-apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
+apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
   name: snapshot
@@ -25,22 +25,5 @@ spec:
     kind: GitRepository
     name: addons
     namespace: flux-system
-  interval: 5m0s
+  interval: 1m0s
   prune: true
----
-apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
-kind: Kustomization
-metadata:
-  name: snapshot-restore
-  namespace: flux-system
-spec:
-  dependsOn:
-    - name: snapshot
-  path: "./eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot-restore"
-  sourceRef:
-    kind: GitRepository
-    name: addons
-    namespace: flux-system
-  interval: 5m0s
-  prune: true
----

eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot/snapshot-class.yaml

@@ -0,0 +1,6 @@
+apiVersion: snapshot.storage.k8s.io/v1
+kind: VolumeSnapshotClass
+metadata:
+  name: vmware-csi-snapshotclass
+driver: csi.vsphere.vmware.com
+deletionPolicy: Delete

eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot/snapshot.yaml

@@ -1,9 +1,9 @@
 apiVersion: snapshot.storage.k8s.io/v1
 kind: VolumeSnapshot
 metadata:
-  name: openebs-volume-snapshot
+  name: vmware-csi-volume-snapshot
   namespace: default
 spec:
-  volumeSnapshotClassName: csi-cstor-snapshotclass
+  volumeSnapshotClassName: vmware-csi-snapshotclass
   source:
-    persistentVolumeClaimName: openebs-claim
+    persistentVolumeClaimName: vmware-csi-claim

eks-anywhere-vsphere/Testers/Core/snapshot-tester/test-app/claim.yaml

@@ -1,12 +1,12 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: openebs-claim
+  name: vmware-csi-claim
   namespace: default
 spec:
   accessModes:
     - ReadWriteOnce
-  storageClassName: openebs-csi-cstor-sparse
+  storageClassName: vmware-sc
   resources:
     requests:
       storage: 4Gi

eks-anywhere-vsphere/Testers/Core/snapshot-tester/test-app/test-app-job.yaml

@@ -21,4 +21,4 @@ spec:
       volumes:
       - name: persistent-storage
         persistentVolumeClaim:
-          claimName: openebs-claim
+          claimName: vmware-csi-claim