[stable/spring-cloud-data-flow] Update configs for additional vars (h…

…elm#17050) - add support for service labels/annotations, env var for cert trusting Signed-off-by: Chris Schaefer <cschaefer@pivotal.io>
yugabyte · Sep 30, 2019 · 8dc3a49 · 8dc3a49
1 parent 0ed1de5
commit 8dc3a49
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 3 deletions.
diff --git a/stable/spring-cloud-data-flow/Chart.yaml b/stable/spring-cloud-data-flow/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: Toolkit for building data processing pipelines.
 name: spring-cloud-data-flow
-version: 2.4.2
+version: 2.4.3
 appVersion: 2.2.1.RELEASE
 home: http://cloud.spring.io/spring-cloud-dataflow/
 sources:

diff --git a/stable/spring-cloud-data-flow/README.md b/stable/spring-cloud-data-flow/README.md
@@ -81,10 +81,12 @@ The following tables list the configurable parameters and their default values.
 | server.version                    | The version/tag of the Data Flow server                            | 2.2.1.RELEASE
 | server.imagePullPolicy            | The imagePullPolicy of the Data Flow server                        | IfNotPresent
 | server.service.type               | The service type for the Data Flow server                          | LoadBalancer
-| server.service.annotations        | Extra annotations for service resources                            | {}
-| server.platformName               | The name of the configured platform account                        | default
+| server.service.annotations        | Extra annotations for service resource                             | {}
 | server.service.externalPort       | The external port for the Data Flow server                         | 80
+| server.service.labels             | Extra labels for the service resource                              | {}
+| server.platformName               | The name of the configured platform account                        | default
 | server.configMap                  | Custom ConfigMap name for Data Flow server configuration           |
+| server.trustCerts                 | Trust self signed certs                                            | false
 
 ### Skipper Server Configuration
 
@@ -94,7 +96,10 @@ The following tables list the configurable parameters and their default values.
 | skipper.imagePullPolicy           | The imagePullPolicy of the Skipper server                        | IfNotPresent
 | skipper.platformName              | The name of the configured platform account                      | default
 | skipper.service.type              | The service type for the Skipper server                          | ClusterIP
+| skipper.service.annotations       | Extra annotations for service resources                          | {}
+| skipper.service.labels            | Extra labels for the service resource                            | {}
 | skipper.configMap                 | Custom ConfigMap name for Skipper server configuration           |
+| skipper.trustCerts                | Trust self signed certs                                          | false
 
 ### Spring Cloud Deployer for Kubernetes Configuration
 

diff --git a/stable/spring-cloud-data-flow/templates/server-deployment.yaml b/stable/spring-cloud-data-flow/templates/server-deployment.yaml
@@ -76,6 +76,8 @@ spec:
           value: 'http://${{ printf "{" }}{{ template "scdf.envname" . }}_SERVER_SERVICE_HOST}:${{ printf "{" }}{{ template "scdf.envname" . }}_SERVER_SERVICE_PORT}'
         - name: SPRING_APPLICATION_JSON
           value: "{ \"maven\": { \"local-repository\": null, \"remote-repositories\": { \"repo1\": { \"url\": \"https://repo.spring.io/libs-snapshot\"} } } }"
+        - name: KUBERNETES_TRUST_CERTIFICATES
+          value: {{ .Values.server.trustCerts | quote }}
       volumes:
         - name: database
           secret:

diff --git a/stable/spring-cloud-data-flow/templates/server-service.yaml b/stable/spring-cloud-data-flow/templates/server-service.yaml
@@ -8,6 +8,9 @@ metadata:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
+{{- if .Values.server.service.labels }}
+{{ toYaml .Values.server.service.labels | indent 4 }}
+{{- end }}
 {{- if .Values.server.service.annotations }}
   annotations:
 {{ toYaml .Values.server.service.annotations | indent 4 }}

diff --git a/stable/spring-cloud-data-flow/templates/skipper-deployment.yaml b/stable/spring-cloud-data-flow/templates/skipper-deployment.yaml
@@ -82,6 +82,8 @@ spec:
               {{- end }}
               key: rabbitmq-password
         {{- end }}
+        - name: KUBERNETES_TRUST_CERTIFICATES
+          value: {{ .Values.skipper.trustCerts | quote }}
       volumes:
         {{- if or .Values.rabbitmq.enabled (index .Values "rabbitmq-ha" "enabled") }}
         - name: rabbitmq

diff --git a/stable/spring-cloud-data-flow/templates/skipper-service.yaml b/stable/spring-cloud-data-flow/templates/skipper-service.yaml
@@ -8,6 +8,13 @@ metadata:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
+{{- if .Values.skipper.service.labels }}
+{{ toYaml .Values.skipper.service.labels | indent 4 }}
+{{- end }}
+{{- if .Values.skipper.service.annotations }}
+  annotations:
+{{ toYaml .Values.skipper.service.annotations | indent 4 }}
+{{- end }}
 spec:
   type: {{ .Values.skipper.service.type }}
   ports:

diff --git a/stable/spring-cloud-data-flow/values.yaml b/stable/spring-cloud-data-flow/values.yaml
@@ -21,10 +21,12 @@ server:
   version: 2.2.1.RELEASE
   imagePullPolicy: IfNotPresent
   platformName: default
+  trustCerts: false
   service:
     type: LoadBalancer
     externalPort: 80
     annotations: {}
+    labels: {}
   configMap:
   resources: {}
   #  limits:
@@ -41,6 +43,8 @@ skipper:
   platformName: default
   service:
     type: ClusterIP
+    annotations: {}
+    labels: {}
   configMap:
   resources: {}
   #  limits: