Bitnami/charts
2
0
Fork 0
mirror of https://github.com/bitnami/charts.git synced 2026-03-02 08:05:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

[bitnami/spring-cloud-dataflow] use common tpl function instead of toYaml (#11191)

Browse Source 
Signed-off-by: umer <umer.anwar@nuance.com>
This commit is contained in:
Umer Anwar
2022-07-19 05:40:23 -04:00
committed by GitHub
parent f5845cc3fd
commit be7cd82286
10 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bitnami/spring-cloud-dataflow/Chart.yaml
View File

@@ -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: 12.0.3
version: 12.0.4

4
bitnami/spring-cloud-dataflow/templates/prometheus-proxy/deployment.yaml
View File

@@ -15,7 +15,7 @@ metadata:
spec:
replicas: {{ .Values.metrics.replicaCount }}
{{- if .Values.metrics.updateStrategy }}
strategy: {{- toYaml .Values.metrics.updateStrategy | nindent 4 }}
strategy: {{- include "common.tplvalues.render" (dict "value" .Values.metrics.updateStrategy "context" $) | nindent 4 }}
{{- end }}
selector:
matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }}
@@ -102,7 +102,7 @@ spec:
volumeMounts: {{- include "common.tplvalues.render" (dict "value" .Values.metrics.extraVolumeMounts "context" $) | nindent 12 }}
{{- end }}
{{- if .Values.metrics.resources }}
resources: {{- toYaml .Values.metrics.resources | nindent 12 }}
resources: {{- include "common.tplvalues.render" (dict "value" .Values.metrics.resources "context" $) | nindent 12 }}
{{- end }}
{{- if .Values.metrics.sidecars }}
{{- include "common.tplvalues.render" (dict "value" .Values.metrics.sidecars "context" $) | trim | nindent 8 }}

2
bitnami/spring-cloud-dataflow/templates/prometheus-proxy/service.yaml
View File

@@ -25,7 +25,7 @@ spec:
externalTrafficPolicy: {{ .Values.metrics.service.externalTrafficPolicy | quote }}
{{- end }}
{{- if and (eq .Values.metrics.service.type "LoadBalancer") .Values.metrics.service.loadBalancerSourceRanges }}
loadBalancerSourceRanges: {{- toYaml .Values.metrics.service.loadBalancerSourceRanges | nindent 4 }}
loadBalancerSourceRanges: {{- include "common.tplvalues.render" (dict "value" .Values.metrics.service.loadBalancerSourceRanges "context" $) | nindent 4 }}
{{- end }}
{{- if (and (eq .Values.metrics.service.type "LoadBalancer") (not (empty .Values.metrics.service.loadBalancerIP))) }}
loadBalancerIP: {{ .Values.metrics.service.loadBalancerIP }}

14
bitnami/spring-cloud-dataflow/templates/server/configmap.yaml
View File

@@ -44,10 +44,10 @@ data:
environmentVariables: {{- $environmentVariables | trim | nindent 22 }}
{{- end }}
{{- if .Values.deployer.resources.limits }}
limits: {{- toYaml .Values.deployer.resources.limits | trim | nindent 22 }}
limits: {{- include "common.tplvalues.render" (dict "value" .Values.deployer.resources.limits "context" $) | trim | nindent 22 }}
{{- end }}
{{- if .Values.deployer.resources.requests }}
requests: {{- toYaml .Values.deployer.resources.requests | trim | nindent 22 }}
requests: {{- include "common.tplvalues.render" (dict "value" .Values.deployer.resources.requests "context" $) | trim | nindent 22 }}
{{- end }}
{{- if .Values.deployer.readinessProbe.initialDelaySeconds }}
readinessProbeDelay: {{ .Values.deployer.readinessProbe.initialDelaySeconds }}
@@ -59,22 +59,22 @@ data:
nodeSelector: {{ .Values.deployer.nodeSelector }}
{{- end }}
{{- if .Values.deployer.tolerations }}
tolerations: {{- toYaml .Values.deployer.tolerations | nindent 22 }}
tolerations: {{- include "common.tplvalues.render" (dict "value" .Values.deployer.tolerations "context" $) | nindent 22 }}
{{- end }}
{{- if .Values.deployer.volumeMounts }}
volumeMounts: {{- toYaml .Values.deployer.volumeMounts | nindent 22 }}
volumeMounts: {{- include "common.tplvalues.render" (dict "value" .Values.deployer.volumeMounts "context" $) | nindent 22 }}
{{- end }}
{{- if .Values.deployer.volumes }}
volumes: {{- toYaml .Values.deployer.volumes | nindent 22 }}
volumes: {{- include "common.tplvalues.render" (dict "value" .Values.deployer.volumes "context" $) | nindent 22 }}
{{- end }}
{{- 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 }}
imagePullSecrets: {{- include "common.tplvalues.render" (dict "value" .Values.deployer.imagePullSecrets "context" $) | nindent 22 }}
{{- end }}
{{- if .Values.deployer.secretRefs }}
secretRefs: {{- toYaml .Values.deployer.secretRefs | nindent 22 }}
secretRefs: {{- include "common.tplvalues.render" (dict "value" .Values.deployer.secretRefs "context" $) | nindent 22 }}
{{- end }}
{{- if .Values.deployer.entryPointStyle }}
entryPointStyle: {{ .Values.deployer.entryPointStyle }}

10
bitnami/spring-cloud-dataflow/templates/server/deployment.yaml
View File

@@ -22,7 +22,7 @@ spec:
matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }}
app.kubernetes.io/component: server
{{- if .Values.server.updateStrategy }}
strategy: {{- toYaml .Values.server.updateStrategy | nindent 4 }}
strategy: {{- include "common.tplvalues.render" (dict "value" .Values.server.updateStrategy "context" $) | nindent 4 }}
{{- end }}
template:
metadata:
@@ -81,7 +81,7 @@ spec:
command:
- /scripts/wait-for-backends.sh
{{- if .Values.waitForBackends.resources }}
resources: {{- toYaml .Values.waitForBackends.resources | nindent 12 }}
resources: {{- include "common.tplvalues.render" (dict "value" .Values.waitForBackends.resources "context" $) | nindent 12 }}
{{- end }}
volumeMounts:
- name: scripts
@@ -233,7 +233,7 @@ spec:
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.server.customReadinessProbe "context" $) | nindent 12 }}
{{- end }}
{{- if .Values.server.resources }}
resources: {{- toYaml .Values.server.resources | nindent 12 }}
resources: {{- include "common.tplvalues.render" (dict "value" .Values.server.resources "context" $) | nindent 12 }}
{{- end }}
volumeMounts:
- name: database
@@ -243,7 +243,7 @@ spec:
mountPath: /opt/bitnami/spring-cloud-dataflow/conf
readOnly: true
{{- if .Values.server.extraVolumeMounts }}
{{- toYaml .Values.server.extraVolumeMounts | nindent 12 }}
{{- include "common.tplvalues.render" (dict "value" .Values.server.extraVolumeMounts "context" $) | nindent 12 }}
{{- end }}
{{- if .Values.server.sidecars }}
{{- include "common.tplvalues.render" ( dict "value" .Values.server.sidecars "context" $) | nindent 8 }}
@@ -265,5 +265,5 @@ spec:
defaultMode: 0755
{{- end }}
{{- if .Values.server.extraVolumes }}
{{- toYaml .Values.server.extraVolumes | nindent 8 }}
{{- include "common.tplvalues.render" (dict "value" .Values.server.extraVolumes "context" $) | nindent 8 }}
{{- end }}

4
bitnami/spring-cloud-dataflow/templates/server/ingress.yaml
View File

@@ -34,7 +34,7 @@ spec:
{{- end }}
backend: {{- include "common.ingress.backend" (dict "serviceName" (printf "%s-server" (include "common.names.fullname" .)) "servicePort" "http" "context" $) | nindent 14 }}
{{- if .Values.server.ingress.extraPaths }}
{{- toYaml .Values.server.ingress.extraPaths | nindent 10 }}
{{- include "common.tplvalues.render" (dict "value" .Values.server.ingress.extraPaths "context" $) | nindent 10 }}
{{- end }}
{{- end }}
{{- range .Values.server.ingress.extraHosts }}
@@ -58,7 +58,7 @@ spec:
secretName: {{ printf "%s-tls" .Values.server.ingress.hostname }}
{{- end }}
{{- if .Values.server.ingress.extraTls }}
{{- toYaml .Values.server.ingress.extraTls | nindent 4 }}
{{- include "common.tplvalues.render" (dict "value" .Values.server.ingress.extraTls "context" $) | nindent 4 }}
{{- end }}
{{- end }}
{{- end }}

2
bitnami/spring-cloud-dataflow/templates/server/service.yaml
View File

@@ -24,7 +24,7 @@ spec:
loadBalancerIP: {{ .Values.server.service.loadBalancerIP }}
{{- end }}
{{- if and (eq .Values.server.service.type "LoadBalancer") .Values.server.service.loadBalancerSourceRanges }}
loadBalancerSourceRanges: {{- toYaml .Values.server.service.loadBalancerSourceRanges | nindent 4 }}
loadBalancerSourceRanges: {{- include "common.tplvalues.render" (dict "value" .Values.server.service.loadBalancerSourceRanges "context" $) | nindent 4 }}
{{- end }}
{{- if or (eq .Values.server.service.type "LoadBalancer") (eq .Values.server.service.type "NodePort") }}
externalTrafficPolicy: {{ .Values.server.service.externalTrafficPolicy | quote }}

14
bitnami/spring-cloud-dataflow/templates/skipper/configmap.yaml
View File

@@ -70,10 +70,10 @@ data:
{{- end }}
{{- end }}
{{- if .Values.deployer.resources.limits }}
limits: {{- toYaml .Values.deployer.resources.limits | trim | nindent 22 }}
limits: {{- include "common.tplvalues.render" (dict "value" .Values.deployer.resources.limits "context" $) | trim | nindent 22 }}
{{- end }}
{{- if .Values.deployer.resources.requests }}
requests: {{- toYaml .Values.deployer.resources.requests | trim | nindent 22 }}
requests: {{- include "common.tplvalues.render" (dict "value" .Values.deployer.resources.requests "context" $) | trim | nindent 22 }}
{{- end }}
{{- if .Values.deployer.readinessProbe.initialDelaySeconds }}
readinessProbeDelay: {{ .Values.deployer.readinessProbe.initialDelaySeconds }}
@@ -85,22 +85,22 @@ data:
nodeSelector: {{ .Values.deployer.nodeSelector }}
{{- end }}
{{- if .Values.deployer.tolerations }}
tolerations: {{- toYaml .Values.deployer.tolerations | nindent 22 }}
tolerations: {{- include "common.tplvalues.render" (dict "value" .Values.deployer.tolerations "context" $) | nindent 22 }}
{{- end }}
{{- if .Values.deployer.volumeMounts }}
volumeMounts: {{- toYaml .Values.deployer.volumeMounts | nindent 22 }}
volumeMounts: {{- include "common.tplvalues.render" (dict "value" .Values.deployer.volumeMounts "context" $) | nindent 22 }}
{{- end }}
{{- if .Values.deployer.volumes }}
volumes: {{- toYaml .Values.deployer.volumes | nindent 22 }}
volumes: {{- include "common.tplvalues.render" (dict "value" .Values.deployer.volumes "context" $) | nindent 22 }}
{{- end }}
{{- 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 }}
imagePullSecrets: {{- include "common.tplvalues.render" (dict "value" .Values.deployer.imagePullSecrets "context" $) | nindent 22 }}
{{- end }}
{{- if .Values.deployer.secretRefs }}
secretRefs: {{- toYaml .Values.deployer.secretRefs | nindent 22 }}
secretRefs: {{- include "common.tplvalues.render" (dict "value" .Values.deployer.secretRefs "context" $) | nindent 22 }}
{{- end }}
{{- if .Values.deployer.entryPointStyle }}
entryPointStyle: {{ .Values.deployer.entryPointStyle }}

12
bitnami/spring-cloud-dataflow/templates/skipper/deployment.yaml
View File

@@ -18,7 +18,7 @@ spec:
matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }}
app.kubernetes.io/component: skipper
{{- if .Values.skipper.updateStrategy }}
strategy: {{- toYaml .Values.skipper.updateStrategy | nindent 4 }}
strategy: {{- include "common.tplvalues.render" (dict "value" .Values.skipper.updateStrategy "context" $) | nindent 4 }}
{{- end }}
template:
metadata:
@@ -60,7 +60,7 @@ spec:
schedulerName: {{ .Values.skipper.schedulerName }}
{{- end }}
{{- if .Values.skipper.topologySpreadConstraints }}
topologySpreadConstraints: {{- include "common.tplvalues.render" (dict "value" .Values.skipper.topologySpreadConstraints "context" .) | nindent 8 }}
topologySpreadConstraints: {{- include "common.tplvalues.render" (dict "value" .Values.skipper.topologySpreadConstraints "context" $) | nindent 8 }}
{{- end }}
{{- if .Values.skipper.priorityClassName }}
priorityClassName: {{ .Values.skipper.priorityClassName | quote }}
@@ -77,7 +77,7 @@ spec:
command:
- /scripts/wait-for-backends.sh
{{- if .Values.waitForBackends.resources }}
resources: {{- toYaml .Values.waitForBackends.resources | nindent 12 }}
resources: {{- include "common.tplvalues.render" (dict "value" .Values.waitForBackends.resources "context" $) | nindent 12 }}
{{- end }}
volumeMounts:
- name: scripts
@@ -191,7 +191,7 @@ spec:
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.skipper.customReadinessProbe "context" $) | nindent 12 }}
{{- end }}
{{- if .Values.skipper.resources }}
resources: {{- toYaml .Values.skipper.resources | nindent 12 }}
resources: {{- include "common.tplvalues.render" (dict "value" .Values.skipper.resources "context" $) | nindent 12 }}
{{- end }}
volumeMounts:
- name: database
@@ -206,7 +206,7 @@ spec:
readOnly: true
{{- end }}
{{- if .Values.skipper.extraVolumeMounts }}
{{- toYaml .Values.skipper.extraVolumeMounts | nindent 12 }}
{{- include "common.tplvalues.render" (dict "value" .Values.skipper.extraVolumeMounts "context" $) | nindent 12 }}
{{- end }}
{{- if .Values.skipper.sidecars }}
{{- include "common.tplvalues.render" ( dict "value" .Values.skipper.sidecars "context" $) | nindent 8 }}
@@ -233,6 +233,6 @@ spec:
defaultMode: 0755
{{- end }}
{{- if .Values.skipper.extraVolumes }}
{{- toYaml .Values.skipper.extraVolumes | nindent 8 }}
{{- include "common.tplvalues.render" (dict "value" .Values.skipper.extraVolumes "context" $) | nindent 8 }}
{{- end }}
{{- end }}

2
bitnami/spring-cloud-dataflow/templates/skipper/service.yaml
View File

@@ -25,7 +25,7 @@ spec:
loadBalancerIP: {{ .Values.skipper.service.loadBalancerIP }}
{{- end }}
{{- if and (eq .Values.skipper.service.type "LoadBalancer") .Values.skipper.service.loadBalancerSourceRanges }}
loadBalancerSourceRanges: {{- toYaml .Values.skipper.service.loadBalancerSourceRanges | nindent 4 }}
loadBalancerSourceRanges: {{- include "common.tplvalues.render" (dict "value" .Values.skipper.service.loadBalancerSourceRanges "context" $) | nindent 4 }}
{{- end }}
{{- if or (eq .Values.skipper.service.type "LoadBalancer") (eq .Values.skipper.service.type "NodePort") }}
externalTrafficPolicy: {{ .Values.skipper.service.externalTrafficPolicy | quote }}