From 51aa460f45845e6f73481bdcda240835640c3a25 Mon Sep 17 00:00:00 2001 From: Nate Bhurinat Wangsutthitham Date: Sun, 21 Jul 2019 01:07:05 +0700 Subject: [PATCH] [stable/spring-cloud-data-flow] Update service resource to enable annotations templating (#15728) * [stable/spring-cloud-data-flow] Update service resource to enable annotations templating - Update server-service for scdf service annotations - Update README and default value for `.Values.server.service.annotations` Signed-off-by: natebwangsut * Bump chart version Signed-off-by: natebwangsut --- stable/spring-cloud-data-flow/Chart.yaml | 2 +- stable/spring-cloud-data-flow/README.md | 1 + stable/spring-cloud-data-flow/templates/server-service.yaml | 4 ++++ stable/spring-cloud-data-flow/values.yaml | 1 + 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/stable/spring-cloud-data-flow/Chart.yaml b/stable/spring-cloud-data-flow/Chart.yaml index 6c65c6ab69..b1b34df7c0 100644 --- 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.3.0 +version: 2.3.1 appVersion: 2.1.2.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 index fd39207b69..31ff85a264 100644 --- a/stable/spring-cloud-data-flow/README.md +++ b/stable/spring-cloud-data-flow/README.md @@ -81,6 +81,7 @@ The following tables list the configurable parameters and their default values. | server.version | The version/tag of the Data Flow server | 2.0.2.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.externalPort | The external port for the Data Flow server | 80 diff --git a/stable/spring-cloud-data-flow/templates/server-service.yaml b/stable/spring-cloud-data-flow/templates/server-service.yaml index 85588e68da..451863d4ed 100644 --- a/stable/spring-cloud-data-flow/templates/server-service.yaml +++ b/stable/spring-cloud-data-flow/templates/server-service.yaml @@ -8,6 +8,10 @@ metadata: chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" +{{- if .Values.server.service.annotations }} + annotations: +{{ toYaml .Values.server.service.annotations | indent 4 }} +{{- end }} spec: # If you are running k8s on a local dev box, you can use type NodePort instead type: {{ .Values.server.service.type }} diff --git a/stable/spring-cloud-data-flow/values.yaml b/stable/spring-cloud-data-flow/values.yaml index b8244faa0b..0094f3482d 100644 --- a/stable/spring-cloud-data-flow/values.yaml +++ b/stable/spring-cloud-data-flow/values.yaml @@ -31,6 +31,7 @@ server: # requests: # cpu: 0.5 # memory: 640Mi + annotations: {} skipper: image: springcloud/spring-cloud-skipper-server