chore: make token requests conditional for v1.20+

Signed-off-by: Anish Ramasekar <[email protected]>
kubernetes-sigs · Feb 17, 2022 · b46dfcb · b46dfcb
1 parent 5210590
commit b46dfcb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/manifest_staging/charts/secrets-store-csi-driver/README.md b/manifest_staging/charts/secrets-store-csi-driver/README.md
@@ -103,4 +103,4 @@ The following table lists the configurable parameters of the csi-secrets-store-p
 | `providerHealthCheck`                   | Enable health check for configured providers                                                                                              | `false`                                                 |
 | `providerHealthCheckInterval`           | Provider healthcheck interval duration                                                                                                    | `2m`                                                    |
 | `imagePullSecrets`                      | One or more secrets to be used when pulling images                                                                                        | `""`                                                    |
-| `tokenRequests`                         | Token requests configuration for the csi driver. Refer to [doc](https://kubernetes-csi.github.io/docs/token-requests.html) for more info. | `""`                                                    |
+| `tokenRequests`                         | Token requests configuration for the csi driver. Refer to [doc](https://kubernetes-csi.github.io/docs/token-requests.html) for more info. Supported only for Kubernetes v1.20+ | `""`                                                    |
diff --git a/manifest_staging/charts/secrets-store-csi-driver/templates/csidriver.yaml b/manifest_staging/charts/secrets-store-csi-driver/templates/csidriver.yaml
@@ -8,7 +8,7 @@ spec:
   # Added in Kubernetes 1.16 with default mode of Persistent. Secrets store csi driver needs Ephermeral to be set.
   volumeLifecycleModes: 
   - Ephemeral
-  {{- if .Values.tokenRequests }}
+  {{- if and (semverCompare ">=1.20-0" .Capabilities.KubeVersion.Version) .Values.tokenRequests }}
   tokenRequests:
     {{- toYaml .Values.tokenRequests | nindent 2}}
   {{- end }}
diff --git a/manifest_staging/charts/secrets-store-csi-driver/values.yaml b/manifest_staging/charts/secrets-store-csi-driver/values.yaml
@@ -212,6 +212,7 @@ imagePullSecrets: []
 
 ## This allows CSI drivers to impersonate the pods that they mount the volumes for.
 # refer to https://kubernetes-csi.github.io/docs/token-requests.html for more details.
+# Supported only for Kubernetes v1.20+
 tokenRequests: []
 # - audience: aud1
 # - audience: aud2