Add back storageclass and azuredisk

kubernetes-sigs · Dec 10, 2024 · b03091a · b03091a
1 parent 782889c
commit b03091a
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 0 deletions.
diff --git a/templates/test/dev/cluster-template-custom-builds-load.yaml b/templates/test/dev/cluster-template-custom-builds-load.yaml
diff --git a/templates/test/dev/custom-builds-load/kustomization.yaml b/templates/test/dev/custom-builds-load/kustomization.yaml
@@ -3,7 +3,10 @@ kind: Kustomization
 namespace: default
 resources:
 - ../custom-builds
+- storageclass-resource-set.yaml
 patches:
+- path: patches/cluster-label-storageclass.yaml
+- path: patches/cluster-label-azuredisk.yaml
 - path: patches/kcp-scheduler.yaml
 generatorOptions:
   annotations:

diff --git a/templates/test/dev/custom-builds-load/patches/cluster-label-azuredisk.yaml b/templates/test/dev/custom-builds-load/patches/cluster-label-azuredisk.yaml
@@ -0,0 +1,6 @@
+apiVersion: cluster.x-k8s.io/v1beta1
+kind: Cluster
+metadata:
+  name: ${CLUSTER_NAME}
+  labels:
+    azuredisk-csi: "true"
diff --git a/templates/test/dev/custom-builds-load/patches/cluster-label-storageclass.yaml b/templates/test/dev/custom-builds-load/patches/cluster-label-storageclass.yaml
@@ -0,0 +1,7 @@
+---
+apiVersion: cluster.x-k8s.io/v1beta1
+kind: Cluster
+metadata:
+  name: ${CLUSTER_NAME}
+  labels:
+    storageclass: "true"
diff --git a/templates/test/dev/custom-builds-load/storageclass-resource-set.yaml b/templates/test/dev/custom-builds-load/storageclass-resource-set.yaml
@@ -0,0 +1,14 @@
+---
+apiVersion: addons.cluster.x-k8s.io/v1beta1
+kind: ClusterResourceSet
+metadata:
+  name: ${CLUSTER_NAME}-storageclass
+  namespace: default
+spec:
+  clusterSelector:
+    matchLabels:
+      storageclass: "true"
+  resources:
+  - kind: ConfigMap
+    name: cni-${CLUSTER_NAME}-storageclass
+  strategy: ApplyOnce