From 39159ddeb17d962ffd1e37f3f015308f2af8ea78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ernst=20Pl=C3=BCss?= <851732+pluess@users.noreply.github.com> Date: Tue, 15 Mar 2022 09:54:20 +0100 Subject: [PATCH] bitnami/spring-cloud-dataflow: deployer.podSecurityContext can be switched off without warnings (#9405) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * deployer.podSecurityContext can be switched off without warnings Signed-off-by: Ernst Plüss * Updated the README.md Signed-off-by: Ernst Plüss --- bitnami/spring-cloud-dataflow/Chart.yaml | 2 +- bitnami/spring-cloud-dataflow/README.md | 1 + bitnami/spring-cloud-dataflow/templates/server/configmap.yaml | 4 ++-- .../spring-cloud-dataflow/templates/skipper/configmap.yaml | 4 ++-- bitnami/spring-cloud-dataflow/values.yaml | 3 ++- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/bitnami/spring-cloud-dataflow/Chart.yaml b/bitnami/spring-cloud-dataflow/Chart.yaml index 1f23f87b9..42ffe62fe 100644 --- a/bitnami/spring-cloud-dataflow/Chart.yaml +++ b/bitnami/spring-cloud-dataflow/Chart.yaml @@ -39,4 +39,4 @@ sources: - https://github.com/bitnami/bitnami-docker-spring-cloud-dataflow - https://github.com/bitnami/bitnami-docker-spring-cloud-skipper - https://dataflow.spring.io/ -version: 6.0.0 +version: 6.0.1 \ No newline at end of file diff --git a/bitnami/spring-cloud-dataflow/README.md b/bitnami/spring-cloud-dataflow/README.md index 0f077d3a7..fa8d4081e 100644 --- a/bitnami/spring-cloud-dataflow/README.md +++ b/bitnami/spring-cloud-dataflow/README.md @@ -291,6 +291,7 @@ helm uninstall my-release | `deployer.volumeMounts` | Streaming applications extra volume mounts | `{}` | | `deployer.volumes` | Streaming applications extra volumes | `{}` | | `deployer.environmentVariables` | Streaming applications environment variables | `[]` | +| `deployer.podSecurityContext.enabled` | Enabled pods' Security Context of the deployed pods batch or stream pods | `true` | | `deployer.podSecurityContext.runAsUser` | Set Dataflow Streams container's Security Context runAsUser | `1001` | | `deployer.imagePullSecrets` | Streaming applications imagePullSecrets | `[]` | | `deployer.secretRefs` | Streaming applications secretRefs | `[]` | diff --git a/bitnami/spring-cloud-dataflow/templates/server/configmap.yaml b/bitnami/spring-cloud-dataflow/templates/server/configmap.yaml index 48264b2d5..4278c4350 100644 --- a/bitnami/spring-cloud-dataflow/templates/server/configmap.yaml +++ b/bitnami/spring-cloud-dataflow/templates/server/configmap.yaml @@ -67,8 +67,8 @@ data: {{- if .Values.deployer.volumes }} volumes: {{- toYaml .Values.deployer.volumes | nindent 22 }} {{- end }} - {{- if .Values.deployer.podSecurityContext }} - podSecurityContext: {{- toYaml .Values.deployer.podSecurityContext | nindent 22 }} + {{- if .Values.deployer.podSecurityContext.enabled }} + podSecurityContext: {{- omit .Values.deployer.podSecurityContext "enabled" | toYaml | nindent 22 }} {{- end }} {{- if .Values.deployer.imagePullSecrets }} imagePullSecrets: {{- toYaml .Values.deployer.imagePullSecrets | nindent 22 }} diff --git a/bitnami/spring-cloud-dataflow/templates/skipper/configmap.yaml b/bitnami/spring-cloud-dataflow/templates/skipper/configmap.yaml index 5259c5a18..0ac86eb82 100644 --- a/bitnami/spring-cloud-dataflow/templates/skipper/configmap.yaml +++ b/bitnami/spring-cloud-dataflow/templates/skipper/configmap.yaml @@ -93,8 +93,8 @@ data: {{- if .Values.deployer.volumes }} volumes: {{- toYaml .Values.deployer.volumes | nindent 22 }} {{- end }} - {{- if .Values.deployer.podSecurityContext }} - podSecurityContext: {{- toYaml .Values.deployer.podSecurityContext | nindent 22 }} + {{- if .Values.deployer.podSecurityContext.enabled }} + podSecurityContext: {{- omit .Values.deployer.podSecurityContext "enabled" | toYaml | nindent 22 }} {{- end }} {{- if .Values.deployer.imagePullSecrets }} imagePullSecrets: {{- toYaml .Values.deployer.imagePullSecrets | nindent 22 }} diff --git a/bitnami/spring-cloud-dataflow/values.yaml b/bitnami/spring-cloud-dataflow/values.yaml index 129b44505..d9f645c03 100644 --- a/bitnami/spring-cloud-dataflow/values.yaml +++ b/bitnami/spring-cloud-dataflow/values.yaml @@ -982,9 +982,10 @@ deployer: environmentVariables: [] ## Streams containers' Security Context. This security context will be use in every deployed stream. ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container + ## @param deployer.podSecurityContext.enabled Enabled pods' Security Context of the deployed pods batch or stream pods ## @param deployer.podSecurityContext.runAsUser Set Dataflow Streams container's Security Context runAsUser - ## podSecurityContext: + enabled: true runAsUser: 1001 ## @param deployer.imagePullSecrets Streaming applications imagePullSecrets ##