Update spring cloud dataflow ingress

bitnami · Jan 13, 2021 · b400a3e · b400a3e
1 parent 600a15a
commit b400a3e
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 8 deletions.
diff --git a/bitnami/spring-cloud-dataflow/Chart.yaml b/bitnami/spring-cloud-dataflow/Chart.yaml
@@ -38,4 +38,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: 2.4.2
+version: 2.5.0
diff --git a/bitnami/spring-cloud-dataflow/README.md b/bitnami/spring-cloud-dataflow/README.md
@@ -71,6 +71,8 @@ The following tables lists the configurable parameters of the Spring Cloud Data
 | `deployer.volumes` | Streaming applications extra volumes | `{}` |
 | `deployer.environmentVariables` | Streaming applications environment variables | `""` |
 | `deployer.podSecurityContext` | Streaming applications Security Context. | `{runAsUser: 1001}` |
+| `kubeVersion` | Force target Kubernetes version (using Helm capabilities if not set) | `nil` |
+
 
 ### Dataflow Server parameters
 
@@ -123,6 +125,9 @@ The following tables lists the configurable parameters of the Spring Cloud Data
 | `server.service.loadBalancerSourceRanges` | Address that are allowed when service is LoadBalancer | `[]` |
 | `server.service.annotations` | Annotations for Dataflow server service | `{}` |
 | `server.ingress.enabled` | Enable ingress controller resource | `false` |
+| `server.ingress.apiVersion` | Force Ingress API version (automatically detected if not set) | `` |
+| `server.ingress.path` | Ingress path | `/` |
+| `server.ingress.pathType` | Ingress path type | `ImplementationSpecific` |
 | `server.ingress.certManager` | Add annotations for cert-manager | `false` |
 | `server.ingress.hostname` | Default host for the ingress resource | `dataflow.local` |
 | `server.ingress.annotations` | Ingress annotations | `[]` |

diff --git a/bitnami/spring-cloud-dataflow/templates/server/ingress.yaml b/bitnami/spring-cloud-dataflow/templates/server/ingress.yaml
@@ -18,19 +18,21 @@ spec:
  - host: {{ .Values.server.ingress.hostname }}
  http:
  paths:
- - path: /
- backend:
- serviceName: {{ include "scdf.fullname" . }}-server
- servicePort: http
+ - path: {{ .Values.server.ingress.path }}
+ {{- if eq "true" (include "common.ingress.supportsPathType" .) }}
+ pathType: {{ .Values.server.ingress.pathType }}
+ {{- end }}
+ backend: {{- include "common.ingress.backend" (dict "serviceName" (printf "%s-%s" (include "common.names.fullname" .) "server") "servicePort" "http" "context" $) | nindent 14 }}
  {{- end }}
  {{- range .Values.server.ingress.extraHosts }}
  - host: {{ .name }}
  http:
  paths:
  - path: {{ default "/" .path }}
- backend:
- serviceName: {{ include "scdf.fullname" . }}-server
- servicePort: http
+ {{- if eq "true" (include "common.ingress.supportsPathType" $) }}
+ pathType: {{ default "ImplementationSpecific" .pathType }}
+ {{- end }}
+ backend: {{- include "common.ingress.backend" (dict "serviceName" (printf "%s-%s" (include "common.names.fullname" .) "server") "servicePort" "http" "context" $) | nindent 14 }}
  {{- end }}
  {{- if or .Values.server.ingress.tls .Values.server.ingress.extraTls .Values.server.ingress.hosts }}
  tls:

diff --git a/bitnami/spring-cloud-dataflow/values-production.yaml b/bitnami/spring-cloud-dataflow/values-production.yaml
@@ -8,6 +8,10 @@
 # - myRegistryKeySecretName
 # storageClass: myStorageClass
 
+## Force target Kubernetes version (using Helm capabilites if not set)
+##
+kubeVersion:
+
 ## String to partially override scdf.fullname template (will maintain the release name).
 ##
 # nameOverride:
@@ -292,6 +296,7 @@ server:
  ## extraHosts:
  ## - name: dataflow.local
  ## path: /
+ ## pathType: ImplementationSpecific
 
  ## The tls configuration for additional hostnames to be covered with this ingress record.
  ## see: https://kubernetes.io/docs/concepts/services-networking/ingress/#tls
@@ -315,6 +320,18 @@ server:
  ## key:
  ## certificate:
 
+ ## Override API Version (automatically detected if not set)
+ ##
+ apiVersion:
+
+ ## Ingress Path
+ ##
+ path: /
+
+ ## Ingress Path type
+ ##
+ pathType: ImplementationSpecific
+
  ## Add init containers to the Dataflow Server pods.
  ## Example:
  ## initContainers:

diff --git a/bitnami/spring-cloud-dataflow/values.yaml b/bitnami/spring-cloud-dataflow/values.yaml
@@ -8,6 +8,10 @@
 # - myRegistryKeySecretName
 # storageClass: myStorageClass
 
+## Force target Kubernetes version (using Helm capabilites if not set)
+##
+kubeVersion:
+
 ## String to partially override scdf.fullname template (will maintain the release name).
 ##
 # nameOverride:
@@ -292,6 +296,7 @@ server:
  ## extraHosts:
  ## - name: dataflow.local
  ## path: /
+ ## pathType: ImplementationSpecific
 
  ## The tls configuration for additional hostnames to be covered with this ingress record.
  ## see: https://kubernetes.io/docs/concepts/services-networking/ingress/#tls
@@ -315,6 +320,18 @@ server:
  ## key:
  ## certificate:
 
+ ## Override API Version (automatically detected if not set)
+ ##
+ apiVersion:
+
+ ## Ingress Path
+ ##
+ path: /
+
+ ## Ingress Path type
+ ##
+ pathType: ImplementationSpecific
+
  ## Add init containers to the Dataflow Server pods.
  ## Example:
  ## initContainers:

diff --git a/bitnami/suitecrm/values.yaml b/bitnami/suitecrm/values.yaml
@@ -299,6 +299,7 @@ ingress:
  ## hosts:
  ## - name: suitecrm.local
  ## path: /
+ ## pathType: ImplementationSpecific
  ##
  hosts:
  ## The tls configuration for the ingress