Merge pull request kubernetes-sigs#452 from yurrriq/helm-extra-args

Add support for --extra-tags to Helm chart

Author: k8s-ci-robot

charts/aws-fsx-csi-driver/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Helm chart
 
+# v1.12.1
+* Parameterize controller.extraTags
+
 # v1.12.0
 * Use driver image 1.5.0
 

charts/aws-fsx-csi-driver/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: "1.5.0"
 name: aws-fsx-csi-driver
 description: A Helm chart for AWS FSx for Lustre CSI Driver
-version: 1.12.0
+version: 1.12.1
 kubeVersion: ">=1.17.0-0"
 home: https://github.com/kubernetes-sigs/aws-fsx-csi-driver
 sources:

charts/aws-fsx-csi-driver/templates/_helpers.tpl

@@ -54,3 +54,16 @@ app.kubernetes.io/name: {{ include "aws-fsx-csi-driver.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 {{- end -}}
+
+{{/*
+Prepare the `--extra-tags` controller flag from a map.
+*/}}
+{{- define "aws-fsx-csi-driver.extra-tags" -}}
+{{- $extraTags := list -}}
+{{- range $key, $value := .Values.controller.extraTags -}}
+{{- $extraTags = printf "%s=%v" $key $value | append $extraTags -}}
+{{- end -}}
+{{- if $extraTags -}}
+{{- printf "- \"--extra-tags=%s\"" (join "," $extraTags) -}}
+{{- end -}}
+{{- end -}}

charts/aws-fsx-csi-driver/templates/controller-deployment.yaml

@@ -44,6 +44,9 @@ spec:
           args:
             - --mode={{ .Values.controller.mode }}
             - --endpoint=$(CSI_ENDPOINT)
+            {{- if .Values.controller.extraTags }}
+              {{- include "aws-fsx-csi-driver.extra-tags" . | nindent 12 }}
+            {{- end }}
             - --logging-format={{ .Values.controller.loggingFormat }}
             - --v={{ .Values.controller.logLevel }}
           env:

charts/aws-fsx-csi-driver/values.yaml

@@ -31,7 +31,7 @@ sidecars:
       tag: v2.13.0-eks-1-33-9
       pullPolicy: IfNotPresent
     logLevel: 2
-    resources: 
+    resources:
       requests:
         cpu: 10m
         memory: 32Mi
@@ -46,7 +46,7 @@ sidecars:
       tag: v5.2.0-eks-1-33-9
       pullPolicy: IfNotPresent
     logLevel: 2
-    resources: 
+    resources:
       requests:
         cpu: 10m
         memory: 32Mi
@@ -61,7 +61,7 @@ sidecars:
       tag: v1.13.2-eks-1-33-9
       pullPolicy: IfNotPresent
     logLevel: 2
-    resources: 
+    resources:
       requests:
         cpu: 10m
         memory: 32Mi
@@ -133,11 +133,17 @@ controller:
   #  - maxSkew: 1
   #    topologyKey: kubernetes.io/hostname
   #    whenUnsatisfiable: ScheduleAnyway
-  topologySpreadConstraints: []  
+  topologySpreadConstraints: []
   podDisruptionBudget:
     # Warning: Disabling PodDisruptionBudget may lead to delays in stateful workloads starting due to controller
     # pod restarts or evictions.
     enabled: true
+  # Extra tags to attach to each dynamically provisioned file system.
+  # ---
+  # extraTags:
+  #   key1: value1
+  #   key2: value2
+  extraTags: {}
 
 node:
   mode: node
@@ -193,8 +199,8 @@ node:
             operator: NotIn
             values:
             - fargate
-            - hybrid 
-            
+            - hybrid
+
 nameOverride: ""
 fullnameOverride: ""