From a7f805734f45eda6def0d5e1fa82473791427e85 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 12:46:13 +0100 Subject: [PATCH] =?UTF-8?q?[bitnami/spring-cloud-dataflow]=20Added=20entry?= =?UTF-8?q?PointStyle=20and=20imagePullPo=E2=80=A6=20(#9409)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [bitnami/spring-cloud-dataflow] Added entryPointStyle and imagePullPolicy to skipper kubernetes configuration. Signed-off-by: Ernst Plüss * [bitnami/spring-cloud-dataflow] Bump chart version. Signed-off-by: Ernst Plüss --- bitnami/spring-cloud-dataflow/Chart.yaml | 2 +- bitnami/spring-cloud-dataflow/README.md | 32 ++++++++++--------- .../templates/skipper/configmap.yaml | 6 ++++ bitnami/spring-cloud-dataflow/values.yaml | 7 +++- 4 files changed, 30 insertions(+), 17 deletions(-) mode change 100644 => 100755 bitnami/spring-cloud-dataflow/values.yaml diff --git a/bitnami/spring-cloud-dataflow/Chart.yaml b/bitnami/spring-cloud-dataflow/Chart.yaml index 42ffe62fec..438b604f89 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.1 \ No newline at end of file +version: 6.0.2 \ No newline at end of file diff --git a/bitnami/spring-cloud-dataflow/README.md b/bitnami/spring-cloud-dataflow/README.md index fa8d4081eb..7970edb2db 100644 --- a/bitnami/spring-cloud-dataflow/README.md +++ b/bitnami/spring-cloud-dataflow/README.md @@ -280,21 +280,23 @@ helm uninstall my-release ### Deployer parameters -| Name | Description | Value | -| --------------------------------------------- | ------------------------------------------------------------------------------------------- | ------ | -| `deployer.resources.limits` | Streaming applications resource limits | `{}` | -| `deployer.resources.requests` | Streaming applications resource requests | `{}` | -| `deployer.readinessProbe.initialDelaySeconds` | Initial delay seconds for readinessProbe | `120` | -| `deployer.livenessProbe.initialDelaySeconds` | Initial delay seconds for livenessProbe | `90` | -| `deployer.nodeSelector` | The node selectors to apply to the streaming applications deployments in "key:value" format | `""` | -| `deployer.tolerations` | Streaming applications tolerations | `{}` | -| `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 | `[]` | +| Name | Description | Value | +| --------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------- | -------------- | +| `deployer.resources.limits` | Streaming applications resource limits | `{}` | +| `deployer.resources.requests` | Streaming applications resource requests | `{}` | +| `deployer.readinessProbe.initialDelaySeconds` | Initial delay seconds for readinessProbe | `120` | +| `deployer.livenessProbe.initialDelaySeconds` | Initial delay seconds for livenessProbe | `90` | +| `deployer.nodeSelector` | The node selectors to apply to the streaming applications deployments in "key:value" format | `""` | +| `deployer.tolerations` | Streaming applications tolerations | `{}` | +| `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 | `[]` | +| `deployer.entryPointStyle` | An entry point style affects how application properties are passed to the container to be deployed. Allowed values: exec (default), shell, boot | `exec` | +| `deployer.imagePullPolicy` | An image pull policy defines when a Docker image should be pulled to the local registry. Allowed values: IfNotPresent (default), Always, Never | `IfNotPresent` | ### RBAC parameters diff --git a/bitnami/spring-cloud-dataflow/templates/skipper/configmap.yaml b/bitnami/spring-cloud-dataflow/templates/skipper/configmap.yaml index 0ac86eb826..9e91fff80b 100644 --- a/bitnami/spring-cloud-dataflow/templates/skipper/configmap.yaml +++ b/bitnami/spring-cloud-dataflow/templates/skipper/configmap.yaml @@ -102,6 +102,12 @@ data: {{- if .Values.deployer.secretRefs }} secretRefs: {{- toYaml .Values.deployer.secretRefs | nindent 22 }} {{- end }} + {{- if .Values.deployer.entryPointStyle }} + entryPointStyle: {{ .Values.deployer.entryPointStyle }} + {{- end }} + {{- if .Values.deployer.imagePullPolicy }} + imagePullPolicy: {{ .Values.deployer.imagePullPolicy }} + {{- end }} {{- $hibernateDialect := include "scdf.database.hibernate.dialect" . }} {{- if $hibernateDialect }} jpa: diff --git a/bitnami/spring-cloud-dataflow/values.yaml b/bitnami/spring-cloud-dataflow/values.yaml old mode 100644 new mode 100755 index d9f645c03e..7c2ee247dc --- a/bitnami/spring-cloud-dataflow/values.yaml +++ b/bitnami/spring-cloud-dataflow/values.yaml @@ -990,10 +990,15 @@ deployer: ## @param deployer.imagePullSecrets Streaming applications imagePullSecrets ## imagePullSecrets: [] - ## @param deployer.secretRefs Streaming applications secretRefs ## secretRefs: [] + ## @param deployer.entryPointStyle An entry point style affects how application properties are passed to the container to be deployed. Allowed values: exec (default), shell, boot + ## ref: https://docs.spring.io/spring-cloud-dataflow/docs/current/reference/htmlsingle/#_entry_point_style + entryPointStyle: exec + ## @param deployer.imagePullPolicy An image pull policy defines when a Docker image should be pulled to the local registry. Allowed values: IfNotPresent (default), Always, Never + ## ref: https://docs.spring.io/spring-cloud-dataflow/docs/current/reference/htmlsingle/#_image_pull_policy + imagePullPolicy: IfNotPresent ## @section RBAC parameters