Merge pull request #413 from AndrewChubatiuk/added-allowed-topologies

feat: add allowedTopologies for storage class in helm
kubernetes-sigs · Dec 11, 2023 · 02d16b8 · 02d16b8
2 parents 9cd16b4 + 3402dbc
commit 02d16b8
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/helm/provisioner/templates/rbac.yaml b/helm/provisioner/templates/rbac.yaml
@@ -24,6 +24,9 @@ rules:
 - apiGroups: [""]
   resources: ["nodes"]
   verbs: ["get"]
+{{- if .Values.rbac.extraRules }}
+{{ toYaml .Values.rbac.extraRules }}
+{{- end}}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding

diff --git a/helm/provisioner/templates/storageclass.yaml b/helm/provisioner/templates/storageclass.yaml
@@ -23,5 +23,12 @@ reclaimPolicy: {{ $val.storageClass.reclaimPolicy | default "Delete" }}
 {{- else }}
 reclaimPolicy: Delete
 {{- end }}
+{{- if $val.allowedTopologies }}
+{{- if kindIs "string" $val.allowedTopologies }}
+allowedTopologies: {{ tpl $val.allowedTopologies $ }}
+{{- else }}
+allowedTopologies: {{ $val.allowedTopologies | toYaml | nindent 0 }}
+{{- end }}
+{{- end }}
 {{- end }}
 {{- end }}
diff --git a/helm/provisioner/values.yaml b/helm/provisioner/values.yaml
@@ -5,6 +5,8 @@ fullnameOverride: ""
 rbac:
   # rbac.create: `true` if rbac resources should be created
   create: true
+  # list of additional rbac rules that may be needed by init containers
+  extraRules: []
 
 # Defines whether to generate a serviceAccount
 serviceAccount:
@@ -67,6 +69,8 @@ classes:
     fsType: ext4
     # File name pattern to discover. By default, discover all file names.
     namePattern: "*"
+    # Restrict topology of provisioned volumes to specific labels
+    allowedTopologies:
     blockCleanerCommand:
       #  Do a quick reset of the block device during its cleanup.
       #  - "/scripts/quick_reset.sh"