build: add CSI configuration to Nutanix examples

d2iq-labs · Apr 5, 2024 · b9c569c · b9c569c
1 parent c4bed7a
commit b9c569c
Show file tree

Hide file tree

Showing 7 changed files with 120 additions and 0 deletions.
diff --git a/examples/capi-quick-start/nutanix-cluster-calico-crs.yaml b/examples/capi-quick-start/nutanix-cluster-calico-crs.yaml
@@ -1,4 +1,13 @@
 apiVersion: v1
+kind: Secret
+metadata:
+  labels:
+    cluster.x-k8s.io/provider: nutanix
+  name: ${CLUSTER_NAME}-pe-creds-for-csi
+stringData:
+  key: ${NUTANIX_PRISM_ELEMENT_ENDPOINT}:${NUTANIX_PORT}:${NUTANIX_USER}:${NUTANIX_PASSWORD}
+---
+apiVersion: v1
 data:
   nutanix-ccm.yaml: |
     ---
@@ -317,6 +326,19 @@ spec:
           cni:
             provider: Calico
             strategy: ClusterResourceSet
+          csi:
+            defaultStorage:
+              providerName: nutanix
+              storageClassConfigName: nutanix-volume
+            providers:
+            - credentials:
+                name: ${CLUSTER_NAME}-pe-creds-for-csi
+              name: nutanix
+              storageClassConfig:
+              - name: nutanix-volume
+                parameters:
+                  storageContainer: ${NUTANIX_STORAGE_CONTAINER_NAME}
+              strategy: HelmAddon
           nfd:
             strategy: ClusterResourceSet
         controlPlane:

diff --git a/examples/capi-quick-start/nutanix-cluster-calico-helm-addon.yaml b/examples/capi-quick-start/nutanix-cluster-calico-helm-addon.yaml
@@ -1,4 +1,13 @@
 apiVersion: v1
+kind: Secret
+metadata:
+  labels:
+    cluster.x-k8s.io/provider: nutanix
+  name: ${CLUSTER_NAME}-pe-creds-for-csi
+stringData:
+  key: ${NUTANIX_PRISM_ELEMENT_ENDPOINT}:${NUTANIX_PORT}:${NUTANIX_USER}:${NUTANIX_PASSWORD}
+---
+apiVersion: v1
 data:
   nutanix-ccm.yaml: |
     ---
@@ -317,6 +326,19 @@ spec:
           cni:
             provider: Calico
             strategy: HelmAddon
+          csi:
+            defaultStorage:
+              providerName: nutanix
+              storageClassConfigName: nutanix-volume
+            providers:
+            - credentials:
+                name: ${CLUSTER_NAME}-pe-creds-for-csi
+              name: nutanix
+              storageClassConfig:
+              - name: nutanix-volume
+                parameters:
+                  storageContainer: ${NUTANIX_STORAGE_CONTAINER_NAME}
+              strategy: HelmAddon
           nfd:
             strategy: HelmAddon
         controlPlane:

diff --git a/examples/capi-quick-start/nutanix-cluster-cilium-crs.yaml b/examples/capi-quick-start/nutanix-cluster-cilium-crs.yaml
@@ -1,4 +1,13 @@
 apiVersion: v1
+kind: Secret
+metadata:
+  labels:
+    cluster.x-k8s.io/provider: nutanix
+  name: ${CLUSTER_NAME}-pe-creds-for-csi
+stringData:
+  key: ${NUTANIX_PRISM_ELEMENT_ENDPOINT}:${NUTANIX_PORT}:${NUTANIX_USER}:${NUTANIX_PASSWORD}
+---
+apiVersion: v1
 data:
   nutanix-ccm.yaml: |
     ---
@@ -317,6 +326,19 @@ spec:
           cni:
             provider: Cilium
             strategy: ClusterResourceSet
+          csi:
+            defaultStorage:
+              providerName: nutanix
+              storageClassConfigName: nutanix-volume
+            providers:
+            - credentials:
+                name: ${CLUSTER_NAME}-pe-creds-for-csi
+              name: nutanix
+              storageClassConfig:
+              - name: nutanix-volume
+                parameters:
+                  storageContainer: ${NUTANIX_STORAGE_CONTAINER_NAME}
+              strategy: HelmAddon
           nfd:
             strategy: ClusterResourceSet
         controlPlane:

diff --git a/examples/capi-quick-start/nutanix-cluster-cilium-helm-addon.yaml b/examples/capi-quick-start/nutanix-cluster-cilium-helm-addon.yaml
@@ -1,4 +1,13 @@
 apiVersion: v1
+kind: Secret
+metadata:
+  labels:
+    cluster.x-k8s.io/provider: nutanix
+  name: ${CLUSTER_NAME}-pe-creds-for-csi
+stringData:
+  key: ${NUTANIX_PRISM_ELEMENT_ENDPOINT}:${NUTANIX_PORT}:${NUTANIX_USER}:${NUTANIX_PASSWORD}
+---
+apiVersion: v1
 data:
   nutanix-ccm.yaml: |
     ---
@@ -317,6 +326,19 @@ spec:
           cni:
             provider: Cilium
             strategy: HelmAddon
+          csi:
+            defaultStorage:
+              providerName: nutanix
+              storageClassConfigName: nutanix-volume
+            providers:
+            - credentials:
+                name: ${CLUSTER_NAME}-pe-creds-for-csi
+              name: nutanix
+              storageClassConfig:
+              - name: nutanix-volume
+                parameters:
+                  storageContainer: ${NUTANIX_STORAGE_CONTAINER_NAME}
+              strategy: HelmAddon
           nfd:
             strategy: HelmAddon
         controlPlane:

diff --git a/hack/examples/additional-resources/nutanix/csi-secret.yaml b/hack/examples/additional-resources/nutanix/csi-secret.yaml
@@ -0,0 +1,10 @@
+# Copyright 2023 D2iQ, Inc. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: ${CLUSTER_NAME}-pe-creds-for-csi
+stringData:
+  key: "${NUTANIX_PRISM_ELEMENT_ENDPOINT}:${NUTANIX_PORT}:${NUTANIX_USER}:${NUTANIX_PASSWORD}"
diff --git a/hack/examples/bases/nutanix/cluster/kustomization.yaml.tmpl b/hack/examples/bases/nutanix/cluster/kustomization.yaml.tmpl
@@ -5,6 +5,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
+- ../../../additional-resources/nutanix/csi-secret.yaml
 - https://raw.githubusercontent.com/nutanix-cloud-native/cluster-api-provider-nutanix/1a7cd69ba35de01e56dcf2dda7f31973111d2317/templates/cluster-template-topology.yaml
 
 sortOptions:
@@ -25,6 +26,9 @@ patches:
 - target:
     kind: Cluster
   path: ../../../patches/cluster-autoscaler.yaml
+- target:
+    kind: Cluster
+  path: ../../../patches/nutanix/csi.yaml
 - target:
     kind: Cluster
   path: ../../../patches/nutanix/initialize-variables.yaml

diff --git a/hack/examples/patches/nutanix/csi.yaml b/hack/examples/patches/nutanix/csi.yaml
@@ -0,0 +1,18 @@
+# Copyright 2024 D2iQ, Inc. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+- op: "add"
+  path: "/spec/topology/variables/0/value/addons/csi"
+  value:
+    defaultStorage:
+      providerName: nutanix
+      storageClassConfigName: nutanix-volume
+    providers:
+      - name: nutanix
+        storageClassConfig:
+        - name: nutanix-volume
+          parameters:
+            storageContainer: ${NUTANIX_STORAGE_CONTAINER_NAME}
+        strategy: HelmAddon
+        credentials:
+          name: ${CLUSTER_NAME}-pe-creds-for-csi