From 72ce932b3602962cc2f2c5db9f1948f7e90967de Mon Sep 17 00:00:00 2001 From: mikemcd3912 Date: Tue, 13 Feb 2024 17:05:18 +0000 Subject: [PATCH 01/13] Cleanup of Kustomization files and addition of Flux tag to CCM --- .../Addons/Core/storage-driver/kustomization.yaml | 4 ---- .../Addons/Core/storage-driver/storage-driver.yaml | 14 -------------- .../storage-driver/vmware-csi/kustomization.yaml | 8 -------- .../vsphere-cloud-controller-manager.yaml | 3 ++- 4 files changed, 2 insertions(+), 27 deletions(-) delete mode 100644 eks-anywhere-vsphere/Addons/Core/storage-driver/kustomization.yaml delete mode 100644 eks-anywhere-vsphere/Addons/Core/storage-driver/storage-driver.yaml delete mode 100644 eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/kustomization.yaml diff --git a/eks-anywhere-vsphere/Addons/Core/storage-driver/kustomization.yaml b/eks-anywhere-vsphere/Addons/Core/storage-driver/kustomization.yaml deleted file mode 100644 index 62f97ebf..00000000 --- a/eks-anywhere-vsphere/Addons/Core/storage-driver/kustomization.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: - - storage-driver.yaml \ No newline at end of file diff --git a/eks-anywhere-vsphere/Addons/Core/storage-driver/storage-driver.yaml b/eks-anywhere-vsphere/Addons/Core/storage-driver/storage-driver.yaml deleted file mode 100644 index df0cd243..00000000 --- a/eks-anywhere-vsphere/Addons/Core/storage-driver/storage-driver.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: kustomize.toolkit.fluxcd.io/v1beta2 -kind: Kustomization -metadata: - name: vmware-csi - namespace: flux-system -spec: - path: "./eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi" - sourceRef: - kind: GitRepository - name: addons - namespace: flux-system - interval: 5m0s - prune: true ---- \ No newline at end of file diff --git a/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/kustomization.yaml b/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/kustomization.yaml deleted file mode 100644 index c9bbb152..00000000 --- a/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/kustomization.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: - - namespace.yaml - - vsphere-cloud-controller-manager.yaml - - vsphere-csi-externalsecrets.yaml - - vsphere-csi-driver.yaml - - vmware-sc.yaml \ No newline at end of file diff --git a/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vsphere-cloud-controller-manager.yaml b/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vsphere-cloud-controller-manager.yaml index 22880a6e..d15fd705 100644 --- a/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vsphere-cloud-controller-manager.yaml +++ b/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/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 \ No newline at end of file From b7b1d365e22783bdc853f355aa9d3cbb64f18209 Mon Sep 17 00:00:00 2001 From: mikemcd3912 Date: Tue, 13 Feb 2024 17:22:52 +0000 Subject: [PATCH 02/13] Adding Kustomization --- .../Addons/Core/storage-driver/kustomization.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 eks-anywhere-vsphere/Addons/Core/storage-driver/kustomization.yaml diff --git a/eks-anywhere-vsphere/Addons/Core/storage-driver/kustomization.yaml b/eks-anywhere-vsphere/Addons/Core/storage-driver/kustomization.yaml new file mode 100644 index 00000000..df0cd243 --- /dev/null +++ b/eks-anywhere-vsphere/Addons/Core/storage-driver/kustomization.yaml @@ -0,0 +1,14 @@ +apiVersion: kustomize.toolkit.fluxcd.io/v1beta2 +kind: Kustomization +metadata: + name: vmware-csi + namespace: flux-system +spec: + path: "./eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi" + sourceRef: + kind: GitRepository + name: addons + namespace: flux-system + interval: 5m0s + prune: true +--- \ No newline at end of file From 0fc93891864a5adbf45b860ba26d04af42ba122e Mon Sep 17 00:00:00 2001 From: mikemcd3912 Date: Tue, 13 Feb 2024 20:36:31 +0000 Subject: [PATCH 03/13] Kustomization API version --- .../Addons/Core/storage-driver/kustomization.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eks-anywhere-vsphere/Addons/Core/storage-driver/kustomization.yaml b/eks-anywhere-vsphere/Addons/Core/storage-driver/kustomization.yaml index df0cd243..be62719d 100644 --- a/eks-anywhere-vsphere/Addons/Core/storage-driver/kustomization.yaml +++ b/eks-anywhere-vsphere/Addons/Core/storage-driver/kustomization.yaml @@ -1,4 +1,4 @@ -apiVersion: kustomize.toolkit.fluxcd.io/v1beta2 +apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization metadata: name: vmware-csi From 4a21445eeb60cadfdf59afb0ff26ba6fdfcfd465 Mon Sep 17 00:00:00 2001 From: mikemcd3912 Date: Tue, 13 Feb 2024 20:41:30 +0000 Subject: [PATCH 04/13] Blog kustomizations --- .../Core/storage-driver/kustomization.yaml | 14 ----- .../vmware-csi-kustomization.yaml | 62 +++++++++++++++++++ .../vmware-sc.yaml | 0 .../vsphere-cloud-controller-manager.yaml | 0 .../vsphere-csi-driver.yaml | 2 +- .../namespace.yaml | 0 .../vsphere-external-secrets.yaml} | 0 .../Core/storage-driver/vmware-csi/README.md | 46 -------------- 8 files changed, 63 insertions(+), 61 deletions(-) delete mode 100644 eks-anywhere-vsphere/Addons/Core/storage-driver/kustomization.yaml create mode 100644 eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi-kustomization.yaml rename eks-anywhere-vsphere/Addons/Core/storage-driver/{vmware-csi => vmware-csi-manifests}/vmware-sc.yaml (100%) rename eks-anywhere-vsphere/Addons/Core/storage-driver/{vmware-csi => vmware-csi-manifests}/vsphere-cloud-controller-manager.yaml (100%) rename eks-anywhere-vsphere/Addons/Core/storage-driver/{vmware-csi => vmware-csi-manifests}/vsphere-csi-driver.yaml (99%) rename eks-anywhere-vsphere/Addons/Core/storage-driver/{vmware-csi => vmware-csi-namespace}/namespace.yaml (100%) rename eks-anywhere-vsphere/Addons/Core/storage-driver/{vmware-csi/vsphere-csi-externalsecrets.yaml => vmware-csi-secrets/vsphere-external-secrets.yaml} (100%) delete mode 100644 eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/README.md diff --git a/eks-anywhere-vsphere/Addons/Core/storage-driver/kustomization.yaml b/eks-anywhere-vsphere/Addons/Core/storage-driver/kustomization.yaml deleted file mode 100644 index be62719d..00000000 --- a/eks-anywhere-vsphere/Addons/Core/storage-driver/kustomization.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: kustomize.toolkit.fluxcd.io/v1 -kind: Kustomization -metadata: - name: vmware-csi - namespace: flux-system -spec: - path: "./eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi" - sourceRef: - kind: GitRepository - name: addons - namespace: flux-system - interval: 5m0s - prune: true ---- \ No newline at end of file diff --git a/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi-kustomization.yaml b/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi-kustomization.yaml new file mode 100644 index 00000000..b2119f8d --- /dev/null +++ b/eks-anywhere-vsphere/Addons/Core/storage-driver/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-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-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-manifests + prune: true + sourceRef: + kind: GitRepository + name: addons \ No newline at end of file diff --git a/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vmware-sc.yaml b/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi-manifests/vmware-sc.yaml similarity index 100% rename from eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vmware-sc.yaml rename to eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi-manifests/vmware-sc.yaml diff --git a/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vsphere-cloud-controller-manager.yaml b/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi-manifests/vsphere-cloud-controller-manager.yaml similarity index 100% rename from eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vsphere-cloud-controller-manager.yaml rename to eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi-manifests/vsphere-cloud-controller-manager.yaml diff --git a/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vsphere-csi-driver.yaml b/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi-manifests/vsphere-csi-driver.yaml similarity index 99% rename from eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vsphere-csi-driver.yaml rename to eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi-manifests/vsphere-csi-driver.yaml index 44df9661..8459c7e5 100644 --- a/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vsphere-csi-driver.yaml +++ b/eks-anywhere-vsphere/Addons/Core/storage-driver/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 diff --git a/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/namespace.yaml b/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi-namespace/namespace.yaml similarity index 100% rename from eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/namespace.yaml rename to eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi-namespace/namespace.yaml diff --git a/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vsphere-csi-externalsecrets.yaml b/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi-secrets/vsphere-external-secrets.yaml similarity index 100% rename from eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vsphere-csi-externalsecrets.yaml rename to eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi-secrets/vsphere-external-secrets.yaml diff --git a/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/README.md b/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/README.md deleted file mode 100644 index 33388666..00000000 --- a/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/README.md +++ /dev/null @@ -1,46 +0,0 @@ -## VMware CSI Driver Pre-Requisites - -In order to sucessfully install the VMware CSI Driver, the following items must be completed first: -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. - -# Creation of the Config Secrets - -Two Secrets must be created, csi-vsphere.conf referenced by the -vsphere-csi-controller in the vsphere-csi-driver.yaml file, and -vsphere.conf that is referenced in the vsphere-cloud-controller.yaml file - -Both secrets are multi-line configs, so the "Plaintext" secret type must be used. - -In csi-vsphere.conf, the secret will contain Global configuration data and Virtual Center specific information in the following format: - -``` -[Global] -insecure-flag = "true" -port = "443" - -[VirtualCenter ""] -cluster-id = ": - server: - user: - password: - datacenters: - - -``` - From 27d67100247b9edba446e2953f486d322b97b9a9 Mon Sep 17 00:00:00 2001 From: mikemcd3912 Date: Wed, 20 Mar 2024 20:26:06 +0000 Subject: [PATCH 05/13] Updates to CSI files for Kustomization API version and deployment order enforcement --- .../Core/storage-driver/vmware-csi/README.md | 46 +++++++++++++++++++ .../vmware-csi-kustomization.yaml | 6 +-- .../vmware-csi-manifests/vmware-sc.yaml | 0 .../vsphere-cloud-controller-manager.yaml | 0 .../vsphere-csi-driver.yaml | 0 .../vmware-csi-namespace/namespace.yaml | 0 .../vsphere-external-secrets.yaml | 0 7 files changed, 49 insertions(+), 3 deletions(-) create mode 100644 eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/README.md rename eks-anywhere-vsphere/Addons/Core/storage-driver/{ => vmware-csi}/vmware-csi-kustomization.yaml (94%) rename eks-anywhere-vsphere/Addons/Core/storage-driver/{ => vmware-csi}/vmware-csi-manifests/vmware-sc.yaml (100%) rename eks-anywhere-vsphere/Addons/Core/storage-driver/{ => vmware-csi}/vmware-csi-manifests/vsphere-cloud-controller-manager.yaml (100%) rename eks-anywhere-vsphere/Addons/Core/storage-driver/{ => vmware-csi}/vmware-csi-manifests/vsphere-csi-driver.yaml (100%) rename eks-anywhere-vsphere/Addons/Core/storage-driver/{ => vmware-csi}/vmware-csi-namespace/namespace.yaml (100%) rename eks-anywhere-vsphere/Addons/Core/storage-driver/{ => vmware-csi}/vmware-csi-secrets/vsphere-external-secrets.yaml (100%) diff --git a/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/README.md b/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/README.md new file mode 100644 index 00000000..9f447eaa --- /dev/null +++ b/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/README.md @@ -0,0 +1,46 @@ +## VMware CSI Driver Pre-Requisites + +In order to sucessfully install the VMware CSI Driver, the following items must be completed first: +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-external-secrets.yaml file. + +# Creation of the Config Secrets + +Two Secrets must be created, csi-vsphere.conf referenced by the +vsphere-csi-controller in the vsphere-csi-driver.yaml file, and +vsphere.conf that is referenced in the vsphere-cloud-controller.yaml file + +Both secrets are multi-line configs, so the "Plaintext" secret type must be used. + +In csi-vsphere.conf, the secret will contain Global configuration data and Virtual Center specific information in the following format: + +``` +[Global] +insecure-flag = "true" +port = "443" + +[VirtualCenter ""] +cluster-id = ": + server: + user: + password: + datacenters: + - +``` + diff --git a/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi-kustomization.yaml b/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vmware-csi-kustomization.yaml similarity index 94% rename from eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi-kustomization.yaml rename to eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vmware-csi-kustomization.yaml index b2119f8d..f56d8040 100644 --- a/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi-kustomization.yaml +++ b/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vmware-csi-kustomization.yaml @@ -8,7 +8,7 @@ metadata: app: vmware-csi-driver spec: interval: 1m0s - path: ./eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi-namespace + path: ./eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vmware-csi-namespace prune: true sourceRef: kind: GitRepository @@ -29,7 +29,7 @@ spec: dependsOn: - name: vmware-csi-namespace-kustomization interval: 1m0s - path: ./eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi-secrets + path: ./eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vmware-csi-secrets prune: true sourceRef: kind: GitRepository @@ -55,7 +55,7 @@ spec: dependsOn: - name: vmware-csi-secrets-kustomization interval: 1m0s - path: ./eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi-manifests + path: ./eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vmware-csi-manifests prune: true sourceRef: kind: GitRepository diff --git a/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi-manifests/vmware-sc.yaml b/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vmware-csi-manifests/vmware-sc.yaml similarity index 100% rename from eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi-manifests/vmware-sc.yaml rename to eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vmware-csi-manifests/vmware-sc.yaml diff --git a/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi-manifests/vsphere-cloud-controller-manager.yaml b/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vmware-csi-manifests/vsphere-cloud-controller-manager.yaml similarity index 100% rename from eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi-manifests/vsphere-cloud-controller-manager.yaml rename to eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vmware-csi-manifests/vsphere-cloud-controller-manager.yaml diff --git a/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi-manifests/vsphere-csi-driver.yaml b/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vmware-csi-manifests/vsphere-csi-driver.yaml similarity index 100% rename from eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi-manifests/vsphere-csi-driver.yaml rename to eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vmware-csi-manifests/vsphere-csi-driver.yaml diff --git a/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi-namespace/namespace.yaml b/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vmware-csi-namespace/namespace.yaml similarity index 100% rename from eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi-namespace/namespace.yaml rename to eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vmware-csi-namespace/namespace.yaml diff --git a/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi-secrets/vsphere-external-secrets.yaml b/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vmware-csi-secrets/vsphere-external-secrets.yaml similarity index 100% rename from eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi-secrets/vsphere-external-secrets.yaml rename to eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vmware-csi-secrets/vsphere-external-secrets.yaml From bcfb0d72acf5487ba78ed5e2b4b956b6a589a28b Mon Sep 17 00:00:00 2001 From: mikemcd3912 Date: Wed, 20 Mar 2024 22:04:09 +0000 Subject: [PATCH 06/13] Updating snapshot tester files for new storage class and driver --- .../Core/snapshot-tester/snapshot-restore/claim.yaml | 6 +++--- .../snapshot-restore/snapshot-restore-job.yaml | 2 +- .../Testers/Core/snapshot-tester/snapshot/snapshot.yaml | 6 +++--- .../Testers/Core/snapshot-tester/test-app/claim.yaml | 4 ++-- .../Testers/Core/snapshot-tester/test-app/test-app-job.yaml | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot-restore/claim.yaml b/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot-restore/claim.yaml index 41514329..dcbf889d 100644 --- a/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot-restore/claim.yaml +++ b/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot-restore/claim.yaml @@ -1,16 +1,16 @@ apiVersion: v1 kind: PersistentVolumeClaim metadata: - name: openebs-snapshot-restored-claim + name: vmware-csi-snapshot-restored-claim namespace: default spec: accessModes: - ReadWriteOnce - storageClassName: openebs-csi-cstor-sparse + storageClassName: vmware-sc resources: requests: storage: 4Gi dataSource: - name: openebs-volume-snapshot + name: vmware-csi-volume-snapshot kind: VolumeSnapshot apiGroup: snapshot.storage.k8s.io \ No newline at end of file diff --git a/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot-restore/snapshot-restore-job.yaml b/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot-restore/snapshot-restore-job.yaml index bb7d3458..6d680c66 100644 --- a/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot-restore/snapshot-restore-job.yaml +++ b/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot-restore/snapshot-restore-job.yaml @@ -21,4 +21,4 @@ spec: volumes: - name: persistent-storage persistentVolumeClaim: - claimName: openebs-snapshot-restored-claim \ No newline at end of file + claimName: vmware-csi-snapshot-restored-claim \ No newline at end of file diff --git a/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot/snapshot.yaml b/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot/snapshot.yaml index f5e2803e..d047efd7 100644 --- a/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot/snapshot.yaml +++ b/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 \ No newline at end of file + persistentVolumeClaimName: vmware-csi-claim \ No newline at end of file diff --git a/eks-anywhere-vsphere/Testers/Core/snapshot-tester/test-app/claim.yaml b/eks-anywhere-vsphere/Testers/Core/snapshot-tester/test-app/claim.yaml index 35519d72..ce6ee679 100644 --- a/eks-anywhere-vsphere/Testers/Core/snapshot-tester/test-app/claim.yaml +++ b/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 \ No newline at end of file diff --git a/eks-anywhere-vsphere/Testers/Core/snapshot-tester/test-app/test-app-job.yaml b/eks-anywhere-vsphere/Testers/Core/snapshot-tester/test-app/test-app-job.yaml index 12276cab..dff2c324 100644 --- a/eks-anywhere-vsphere/Testers/Core/snapshot-tester/test-app/test-app-job.yaml +++ b/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 \ No newline at end of file + claimName: vmware-csi-claim \ No newline at end of file From 97029cd3623beddf3b3d82790221936da45d8cf2 Mon Sep 17 00:00:00 2001 From: mikemcd3912 Date: Wed, 20 Mar 2024 22:18:56 +0000 Subject: [PATCH 07/13] Updating SnapshotClass --- .../Testers/Core/snapshot-tester/snapshot/snapshot.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot/snapshot.yaml b/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot/snapshot.yaml index d047efd7..b344f616 100644 --- a/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot/snapshot.yaml +++ b/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot/snapshot.yaml @@ -4,6 +4,5 @@ metadata: name: vmware-csi-volume-snapshot namespace: default spec: - volumeSnapshotClassName: vmware-csi-snapshotclass source: persistentVolumeClaimName: vmware-csi-claim \ No newline at end of file From 04560f49aac4ff1ec2d3aeaa9251c78ee556fdd5 Mon Sep 17 00:00:00 2001 From: mikemcd3912 Date: Wed, 20 Mar 2024 22:29:49 +0000 Subject: [PATCH 08/13] Adding Snapshot Class --- .../Core/snapshot-tester/snapshot/snapshot-class.yaml | 6 ++++++ .../Testers/Core/snapshot-tester/snapshot/snapshot.yaml | 1 + 2 files changed, 7 insertions(+) create mode 100644 eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot/snapshot-class.yaml diff --git a/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot/snapshot-class.yaml b/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot/snapshot-class.yaml new file mode 100644 index 00000000..bcc707b3 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot/snapshot.yaml b/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot/snapshot.yaml index b344f616..d047efd7 100644 --- a/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot/snapshot.yaml +++ b/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot/snapshot.yaml @@ -4,5 +4,6 @@ metadata: name: vmware-csi-volume-snapshot namespace: default spec: + volumeSnapshotClassName: vmware-csi-snapshotclass source: persistentVolumeClaimName: vmware-csi-claim \ No newline at end of file From 6d37594cf84991ffeef80476f762c3239e7c0606 Mon Sep 17 00:00:00 2001 From: mikemcd3912 Date: Wed, 20 Mar 2024 22:37:25 +0000 Subject: [PATCH 09/13] Add SnapshotClass to Kustomization --- .../Testers/Core/snapshot-tester/snapshot/kustomization.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot/kustomization.yaml b/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot/kustomization.yaml index 645b614d..82eabe75 100644 --- a/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot/kustomization.yaml +++ b/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot/kustomization.yaml @@ -1,4 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - snapshot.yaml \ No newline at end of file + - snapshot.yaml + - snapshot-class.yaml \ No newline at end of file From 80486efd2e3df9c5ac55fa9bda5f79d450d31d99 Mon Sep 17 00:00:00 2001 From: mikemcd3912 Date: Wed, 20 Mar 2024 22:50:02 +0000 Subject: [PATCH 10/13] Remove restore from Kustomization --- .../Core/snapshot-tester/snapshot-tester.yaml | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot-tester.yaml b/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot-tester.yaml index afb02eed..9d83cd89 100644 --- a/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot-tester.yaml +++ b/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot-tester.yaml @@ -28,19 +28,19 @@ spec: interval: 5m0s 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 ---- \ No newline at end of file +# 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 +# --- \ No newline at end of file From c7ea7b4703227472e79c68c4426de0bd2052cfaa Mon Sep 17 00:00:00 2001 From: mikemcd3912 Date: Tue, 9 Apr 2024 16:25:17 +0000 Subject: [PATCH 11/13] Update Kustomizations to non-beta API version --- .../Core/snapshot-tester/kustomization.yaml | 4 -- .../snapshot-restore/claim.yaml | 16 ------- .../snapshot-restore/kustomization.yaml | 5 -- .../snapshot-restore-job.yaml | 24 ---------- .../snapshot-tester-kustomization.yaml | 29 ++++++++++++ .../Core/snapshot-tester/snapshot-tester.yaml | 46 ------------------- .../snapshot/kustomization.yaml | 5 -- .../test-app/kustomization.yaml | 5 -- 8 files changed, 29 insertions(+), 105 deletions(-) delete mode 100644 eks-anywhere-vsphere/Testers/Core/snapshot-tester/kustomization.yaml delete mode 100644 eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot-restore/claim.yaml delete mode 100644 eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot-restore/kustomization.yaml delete mode 100644 eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot-restore/snapshot-restore-job.yaml create mode 100644 eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot-tester-kustomization.yaml delete mode 100644 eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot-tester.yaml delete mode 100644 eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot/kustomization.yaml delete mode 100644 eks-anywhere-vsphere/Testers/Core/snapshot-tester/test-app/kustomization.yaml diff --git a/eks-anywhere-vsphere/Testers/Core/snapshot-tester/kustomization.yaml b/eks-anywhere-vsphere/Testers/Core/snapshot-tester/kustomization.yaml deleted file mode 100644 index fbded3c2..00000000 --- a/eks-anywhere-vsphere/Testers/Core/snapshot-tester/kustomization.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: - - snapshot-tester.yaml \ No newline at end of file diff --git a/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot-restore/claim.yaml b/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot-restore/claim.yaml deleted file mode 100644 index dcbf889d..00000000 --- a/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot-restore/claim.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: vmware-csi-snapshot-restored-claim - namespace: default -spec: - accessModes: - - ReadWriteOnce - storageClassName: vmware-sc - resources: - requests: - storage: 4Gi - dataSource: - name: vmware-csi-volume-snapshot - kind: VolumeSnapshot - apiGroup: snapshot.storage.k8s.io \ No newline at end of file diff --git a/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot-restore/kustomization.yaml b/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot-restore/kustomization.yaml deleted file mode 100644 index e42f8ea9..00000000 --- a/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot-restore/kustomization.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: - - claim.yaml - - snapshot-restore-job.yaml \ No newline at end of file diff --git a/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot-restore/snapshot-restore-job.yaml b/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot-restore/snapshot-restore-job.yaml deleted file mode 100644 index 6d680c66..00000000 --- a/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot-restore/snapshot-restore-job.yaml +++ /dev/null @@ -1,24 +0,0 @@ ---- -apiVersion: batch/v1 -kind: Job -metadata: - name: app-restore - namespace: default -spec: - backoffLimit: 3 - template: - spec: - containers: - - name: app - image: centos - imagePullPolicy: IfNotPresent - command: ["/bin/sh"] - args: ["-c", "while true; do echo $(date -u) >> /data/out.txt; sleep 5; done"] - volumeMounts: - - name: persistent-storage - mountPath: /data - restartPolicy: OnFailure - volumes: - - name: persistent-storage - persistentVolumeClaim: - claimName: vmware-csi-snapshot-restored-claim \ No newline at end of file diff --git a/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot-tester-kustomization.yaml b/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot-tester-kustomization.yaml new file mode 100644 index 00000000..a67ba6cc --- /dev/null +++ b/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot-tester-kustomization.yaml @@ -0,0 +1,29 @@ +apiVersion: kustomize.toolkit.fluxcd.io/v1 +kind: Kustomization +metadata: + name: test-app + namespace: flux-system +spec: + path: "./eks-anywhere-vsphere/Testers/Core/snapshot-tester/test-app" + sourceRef: + kind: GitRepository + name: addons + namespace: flux-system + interval: 1m0s + prune: true +--- +apiVersion: kustomize.toolkit.fluxcd.io/v1 +kind: Kustomization +metadata: + name: snapshot + namespace: flux-system +spec: + dependsOn: + - name: test-app + path: "./eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot" + sourceRef: + kind: GitRepository + name: addons + namespace: flux-system + interval: 1m0s + prune: true diff --git a/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot-tester.yaml b/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot-tester.yaml deleted file mode 100644 index 9d83cd89..00000000 --- a/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot-tester.yaml +++ /dev/null @@ -1,46 +0,0 @@ -apiVersion: kustomize.toolkit.fluxcd.io/v1beta2 -kind: Kustomization -metadata: - name: test-app - namespace: flux-system -spec: - path: "./eks-anywhere-vsphere/Testers/Core/snapshot-tester/test-app" - sourceRef: - kind: GitRepository - name: addons - namespace: flux-system - interval: 5m0s - prune: true ---- -apiVersion: kustomize.toolkit.fluxcd.io/v1beta2 -kind: Kustomization -metadata: - name: snapshot - namespace: flux-system -spec: - dependsOn: - - name: test-app - path: "./eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot" - sourceRef: - kind: GitRepository - name: addons - namespace: flux-system - interval: 5m0s - 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 -# --- \ No newline at end of file diff --git a/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot/kustomization.yaml b/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot/kustomization.yaml deleted file mode 100644 index 82eabe75..00000000 --- a/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot/kustomization.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: - - snapshot.yaml - - snapshot-class.yaml \ No newline at end of file diff --git a/eks-anywhere-vsphere/Testers/Core/snapshot-tester/test-app/kustomization.yaml b/eks-anywhere-vsphere/Testers/Core/snapshot-tester/test-app/kustomization.yaml deleted file mode 100644 index 8a2b46d1..00000000 --- a/eks-anywhere-vsphere/Testers/Core/snapshot-tester/test-app/kustomization.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: - - claim.yaml - - test-app-job.yaml \ No newline at end of file From a4c38de2752121903e649b86e5bb6a2df100a3a0 Mon Sep 17 00:00:00 2001 From: mikemcd3912 Date: Tue, 9 Apr 2024 23:15:23 +0000 Subject: [PATCH 12/13] Simplifying Kustomizations and file structure --- .../storage-driver/{vmware-csi => }/README.md | 0 .../vmware-csi-kustomization.yaml | 15 +++++ .../{vmware-csi-namespace => }/namespace.yaml | 0 .../vmware-csi/vmware-csi-kustomization.yaml | 62 ------------------- .../{vmware-csi-manifests => }/vmware-sc.yaml | 0 .../vsphere-cloud-controller-manager.yaml | 0 .../vsphere-csi-driver.yaml | 0 .../vsphere-external-secrets.yaml | 0 8 files changed, 15 insertions(+), 62 deletions(-) rename eks-anywhere-vsphere/Addons/Core/storage-driver/{vmware-csi => }/README.md (100%) create mode 100644 eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi-kustomization.yaml rename eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/{vmware-csi-namespace => }/namespace.yaml (100%) delete mode 100644 eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vmware-csi-kustomization.yaml rename eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/{vmware-csi-manifests => }/vmware-sc.yaml (100%) rename eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/{vmware-csi-manifests => }/vsphere-cloud-controller-manager.yaml (100%) rename eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/{vmware-csi-manifests => }/vsphere-csi-driver.yaml (100%) rename eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/{vmware-csi-secrets => }/vsphere-external-secrets.yaml (100%) diff --git a/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/README.md b/eks-anywhere-vsphere/Addons/Core/storage-driver/README.md similarity index 100% rename from eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/README.md rename to eks-anywhere-vsphere/Addons/Core/storage-driver/README.md diff --git a/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi-kustomization.yaml b/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi-kustomization.yaml new file mode 100644 index 00000000..8c3e791b --- /dev/null +++ b/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi-kustomization.yaml @@ -0,0 +1,15 @@ +--- +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 + prune: true + sourceRef: + kind: GitRepository + name: addons diff --git a/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vmware-csi-namespace/namespace.yaml b/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/namespace.yaml similarity index 100% rename from eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vmware-csi-namespace/namespace.yaml rename to eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/namespace.yaml diff --git a/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vmware-csi-kustomization.yaml b/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vmware-csi-kustomization.yaml deleted file mode 100644 index f56d8040..00000000 --- a/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vmware-csi-kustomization.yaml +++ /dev/null @@ -1,62 +0,0 @@ ---- -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 \ No newline at end of file diff --git a/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vmware-csi-manifests/vmware-sc.yaml b/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vmware-sc.yaml similarity index 100% rename from eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vmware-csi-manifests/vmware-sc.yaml rename to eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vmware-sc.yaml diff --git a/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vmware-csi-manifests/vsphere-cloud-controller-manager.yaml b/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vsphere-cloud-controller-manager.yaml similarity index 100% rename from eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vmware-csi-manifests/vsphere-cloud-controller-manager.yaml rename to eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vsphere-cloud-controller-manager.yaml diff --git a/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vmware-csi-manifests/vsphere-csi-driver.yaml b/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vsphere-csi-driver.yaml similarity index 100% rename from eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vmware-csi-manifests/vsphere-csi-driver.yaml rename to eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vsphere-csi-driver.yaml diff --git a/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vmware-csi-secrets/vsphere-external-secrets.yaml b/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vsphere-external-secrets.yaml similarity index 100% rename from eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vmware-csi-secrets/vsphere-external-secrets.yaml rename to eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vsphere-external-secrets.yaml From b27e81baf2c3b589476d549d648e4da29985e5b3 Mon Sep 17 00:00:00 2001 From: mikemcd3912 Date: Tue, 9 Apr 2024 23:25:21 +0000 Subject: [PATCH 13/13] Fix Kustomization Naming --- .../Addons/Core/storage-driver/vmware-csi-kustomization.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi-kustomization.yaml b/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi-kustomization.yaml index 8c3e791b..bab7dbdb 100644 --- a/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi-kustomization.yaml +++ b/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi-kustomization.yaml @@ -2,7 +2,7 @@ apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization metadata: - name: vmware-csi-namespace-kustomization + name: vmware-csi-kustomization namespace: flux-system labels: app: vmware-csi-driver