[bitnami/spring-cloud-dataflow] fix: 🔒 Move service-account token auto-mount to pod declaration (#22463)

Signed-off-by: Javier Salmeron Garcia <jsalmeron@vmware.com>
Signed-off-by: Javier J. Salmerón-García <jsalmeron@vmware.com>
This commit is contained in:
Javier J. Salmerón-García
2024-01-19 10:12:48 +01:00
committed by GitHub
parent f824fb5553
commit 18506b8a92
6 changed files with 24 additions and 9 deletions
+1 -1
View File
@@ -53,4 +53,4 @@ maintainers:
name: spring-cloud-dataflow
sources:
- https://github.com/bitnami/charts/tree/main/bitnami/spring-cloud-dataflow
version: 26.3.1
version: 26.4.0
+10 -7
View File
@@ -80,6 +80,7 @@ helm uninstall my-release
| `server.image.pullPolicy` | Spring Cloud Dataflow image pull policy | `IfNotPresent` |
| `server.image.pullSecrets` | Specify docker-registry secret names as an array | `[]` |
| `server.image.debug` | Enable image debug mode | `false` |
| `server.automountServiceAccountToken` | Mount Service Account token in pod | `true` |
| `server.hostAliases` | Deployment pod host aliases | `[]` |
| `server.composedTaskRunner.image.registry` | Spring Cloud Dataflow Composed Task Runner image registry | `REGISTRY_NAME` |
| `server.composedTaskRunner.image.repository` | Spring Cloud Dataflow Composed Task Runner image repository | `REPOSITORY_NAME/spring-cloud-dataflow-composed-task-runner` |
@@ -199,6 +200,7 @@ helm uninstall my-release
| Name | Description | Value |
| ----------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------- | -------------------------------------- |
| `skipper.enabled` | Enable Spring Cloud Skipper component | `true` |
| `skipper.automountServiceAccountToken` | Mount Service Account token in pod | `true` |
| `skipper.hostAliases` | Deployment pod host aliases | `[]` |
| `skipper.image.registry` | Spring Cloud Skipper image registry | `REGISTRY_NAME` |
| `skipper.image.repository` | Spring Cloud Skipper image repository | `REPOSITORY_NAME/spring-cloud-skipper` |
@@ -317,13 +319,13 @@ helm uninstall my-release
### RBAC parameters
| Name | Description | Value |
| --------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------- | ------ |
| `serviceAccount.create` | Enable the creation of a ServiceAccount for Dataflow server and Skipper server pods | `true` |
| `serviceAccount.name` | Name of the created serviceAccount. If not set and create is true, a name is generated using the scdf.fullname template | `""` |
| `serviceAccount.automountServiceAccountToken` | Automount service account token for the server service account | `true` |
| `serviceAccount.annotations` | Annotations for service account. Evaluated as a template. Only used if `create` is `true`. | `{}` |
| `rbac.create` | Whether to create and use RBAC resources or not | `true` |
| Name | Description | Value |
| --------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------- | ------- |
| `serviceAccount.create` | Enable the creation of a ServiceAccount for Dataflow server and Skipper server pods | `true` |
| `serviceAccount.name` | Name of the created serviceAccount. If not set and create is true, a name is generated using the scdf.fullname template | `""` |
| `serviceAccount.automountServiceAccountToken` | Automount service account token for the server service account | `false` |
| `serviceAccount.annotations` | Annotations for service account. Evaluated as a template. Only used if `create` is `true`. | `{}` |
| `rbac.create` | Whether to create and use RBAC resources or not | `true` |
### Metrics parameters
@@ -345,6 +347,7 @@ helm uninstall my-release
| `metrics.nodeAffinityPreset.values` | Prometheus Rsocket Proxy node label values to match. Ignored if `metrics.affinity` is set. | `[]` |
| `metrics.affinity` | Prometheus Rsocket Proxy affinity for pod assignment | `{}` |
| `metrics.nodeSelector` | Prometheus Rsocket Proxy node labels for pod assignment | `{}` |
| `metrics.automountServiceAccountToken` | Mount Service Account token in pod | `true` |
| `metrics.hostAliases` | Prometheus Proxy pods host aliases | `[]` |
| `metrics.tolerations` | Prometheus Rsocket Proxy tolerations for pod assignment | `[]` |
| `metrics.podAnnotations` | Annotations for Prometheus Rsocket Proxy pods | `{}` |
@@ -33,6 +33,7 @@ spec:
spec:
{{- include "scdf.imagePullSecrets" . | nindent 6 }}
serviceAccountName: {{ include "scdf.serviceAccountName" . }}
automountServiceAccountToken: {{ .Values.metrics.automountServiceAccountToken }}
{{- if .Values.metrics.hostAliases }}
hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.metrics.hostAliases "context" $) | nindent 8 }}
{{- end }}
@@ -43,6 +43,7 @@ spec:
spec:
{{- include "scdf.imagePullSecrets" . | nindent 6 }}
serviceAccountName: {{ include "scdf.serviceAccountName" . }}
automountServiceAccountToken: {{ .Values.server.automountServiceAccountToken }}
{{- if .Values.server.hostAliases }}
hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.server.hostAliases "context" $) | nindent 8 }}
{{- end }}
@@ -41,6 +41,7 @@ spec:
spec:
{{- include "scdf.imagePullSecrets" . | nindent 6 }}
serviceAccountName: {{ include "scdf.serviceAccountName" . }}
automountServiceAccountToken: {{ .Values.skipper.automountServiceAccountToken }}
{{- if .Values.skipper.hostAliases }}
hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.skipper.hostAliases "context" $) | nindent 8 }}
{{- end }}
+10 -1
View File
@@ -78,6 +78,9 @@ server:
## Set to true if you would like to see extra information on logs
##
debug: false
## @param server.automountServiceAccountToken Mount Service Account token in pod
##
automountServiceAccountToken: true
## @param server.hostAliases Deployment pod host aliases
## https://kubernetes.io/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases/
##
@@ -601,6 +604,9 @@ skipper:
## Note: it'll be also enabled if streams are enabled in Dataflow server configuration.
##
enabled: true
## @param skipper.automountServiceAccountToken Mount Service Account token in pod
##
automountServiceAccountToken: true
## @param skipper.hostAliases Deployment pod host aliases
## https://kubernetes.io/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases/
##
@@ -1079,7 +1085,7 @@ deployer:
serviceAccount:
create: true
name: ""
automountServiceAccountToken: true
automountServiceAccountToken: false
annotations: {}
## Role Based Access
## ref: https://kubernetes.io/docs/admin/authorization/rbac/
@@ -1184,6 +1190,9 @@ metrics:
## ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/
##
nodeSelector: {}
## @param metrics.automountServiceAccountToken Mount Service Account token in pod
##
automountServiceAccountToken: true
## @param metrics.hostAliases Prometheus Proxy pods host aliases
## https://kubernetes.io/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases/
##