Skip to content

Commit

Permalink
set merge destination map to nil
Browse files Browse the repository at this point in the history
  • Loading branch information
@semihbkgr
semihbkgr committed Sep 19, 2023
1 parent adfffc3 commit 10e45d1
Show file tree
Hide file tree
Showing 18 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion stable/hazelcast-enterprise/templates/mancenter-ingress.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ metadata:
{{- end }}
{{- if or .Values.mancenter.ingress.annotations .Values.commonAnnotations }}
annotations:
{{- range $key, $val := (merge .Values.mancenter.ingress.annotations .Values.commonAnnotations) }}
{{- range $key, $val := (merge nil .Values.mancenter.ingress.annotations .Values.commonAnnotations) }}
{{ $key }}: {{ $val | quote }}
{{- end }}
{{- end }}
Expand Down
2 changes: 1 addition & 1 deletion stable/hazelcast-enterprise/templates/mancenter-service.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ metadata:
helm.sh/chart: {{ template "hazelcast.chart" . }}
app.kubernetes.io/instance: "{{ .Release.Name }}"
app.kubernetes.io/managed-by: "{{ .Release.Service }}"
{{- range $key, $value := (merge .Values.mancenter.service.labels .Values.commonLabels) }}
{{- range $key, $value := (merge nil .Values.mancenter.service.labels .Values.commonLabels) }}
{{ $key }}: {{ $value | quote }}
{{- end }}
{{- if .Values.commonAnnotations }}
Expand Down
2 changes: 1 addition & 1 deletion stable/hazelcast-enterprise/templates/mancenter-statefulset.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ metadata:
helm.sh/chart: {{ template "hazelcast.chart" . }}
app.kubernetes.io/instance: "{{ .Release.Name }}"
app.kubernetes.io/managed-by: "{{ .Release.Service }}"
{{- range $key, $value := (merge .Values.mancenter.labels .Values.commonLabels) }}
{{- range $key, $value := (merge nil .Values.mancenter.labels .Values.commonLabels) }}
{{ $key }}: {{ $value | quote }}
{{- end }}
{{- if .Values.commonAnnotations }}
Expand Down
2 changes: 1 addition & 1 deletion stable/hazelcast-enterprise/templates/metrics-service.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ metadata:
{{- end }}
{{- if or .Values.metrics.service.annotations .Values.commonAnnotations }}
annotations:
{{- range $key, $val := (merge .Values.metrics.service.annotations .Values.commonAnnotations) }}
{{- range $key, $val := (merge nil .Values.metrics.service.annotations .Values.commonAnnotations) }}
{{ $key }}: {{ $val | quote }}
{{- end }}
{{- end }}
Expand Down
2 changes: 1 addition & 1 deletion stable/hazelcast-enterprise/templates/prometheusrule.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
helm.sh/chart: {{ template "hazelcast.chart" . }}
app.kubernetes.io/instance: "{{ .Release.Name }}"
app.kubernetes.io/managed-by: "{{ .Release.Service }}"
{{- range $key, $val := (merge .Values.metrics.prometheusRule.labels .Values.commonLabels) }}
{{- range $key, $val := (merge nil .Values.metrics.prometheusRule.labels .Values.commonLabels) }}
{{ $key }}: {{ $val | quote }}
{{- end }}
{{- if .Values.commonAnnotations }}
Expand Down
4 changes: 2 additions & 2 deletions stable/hazelcast-enterprise/templates/service-external.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ metadata:
app.kubernetes.io/instance: "{{ $.Release.Name }}"
app.kubernetes.io/managed-by: "{{ $.Release.Service }}"
pod: {{ $targetPod }}
{{- range $key, $value := (merge .Values.externalAccess.service.labels .Values.commonLabels) }}
{{- range $key, $value := (merge nil .Values.externalAccess.service.labels .Values.commonLabels) }}
{{ $key }}: {{ $value | quote }}
{{- end }}
{{- if or .Values.externalAccess.service.annotations .Values.commonAnnotations }}
annotations:
{{- range $key, $val := (merge .Values.externalAccess.service.annotations .Values.commonAnnotations) }}
{{- range $key, $val := (merge nil .Values.externalAccess.service.annotations .Values.commonAnnotations) }}
{{ $key }}: {{ $val | quote }}
{{- end }}
{{- end }}
Expand Down
2 changes: 1 addition & 1 deletion stable/hazelcast-enterprise/templates/service.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ metadata:
helm.sh/chart: {{ template "hazelcast.chart" . }}
app.kubernetes.io/instance: "{{ .Release.Name }}"
app.kubernetes.io/managed-by: "{{ .Release.Service }}"
{{- range $key, $value := (merge .Values.service.labels .Values.commonLabels) }}
{{- range $key, $value := (merge nil .Values.service.labels .Values.commonLabels) }}
{{ $key }}: {{ $value | quote }}
{{- end }}
{{- if .Values.commonAnnotations }}
Expand Down
2 changes: 1 addition & 1 deletion stable/hazelcast-enterprise/templates/servicemonitor.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
helm.sh/chart: {{ template "hazelcast.chart" . }}
app.kubernetes.io/instance: "{{ .Release.Name }}"
app.kubernetes.io/managed-by: "{{ .Release.Service }}"
{{- range $key, $val := (merge .Values.metrics.serviceMonitor.labels .Values.commonLabels) }}
{{- range $key, $val := (merge nil .Values.metrics.serviceMonitor.labels .Values.commonLabels) }}
{{ $key }}: {{ $val | quote }}
{{- end }}
{{- if .Values.commonAnnotations }}
Expand Down
4 changes: 2 additions & 2 deletions stable/hazelcast-enterprise/templates/statefulset.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ metadata:
helm.sh/chart: {{ template "hazelcast.chart" . }}
app.kubernetes.io/instance: "{{ .Release.Name }}"
app.kubernetes.io/managed-by: "{{ .Release.Service }}"
{{- range $key, $value := (merge .Values.labels .Values.commonLabels) }}
{{- range $key, $value := (merge nil .Values.labels .Values.commonLabels) }}
{{ $key }}: {{ $value | quote }}
{{- end }}
{{- if or .Values.annotations .Values.commonAnnotations }}
annotations:
{{- range $key, $val := (merge .Values.annotations .Values.commonAnnotations) }}
{{- range $key, $val := (merge nil .Values.annotations .Values.commonAnnotations) }}
{{ $key }}: {{ $val | quote }}
{{- end }}
{{- end }}
Expand Down
2 changes: 1 addition & 1 deletion stable/hazelcast/templates/mancenter-ingress.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ metadata:
{{- end }}
{{- if or .Values.mancenter.ingress.annotations .Values.commonAnnotations }}
annotations:
{{- range $key, $val := (merge .Values.mancenter.ingress.annotations .Values.commonAnnotations) }}
{{- range $key, $val := (merge nil .Values.mancenter.ingress.annotations .Values.commonAnnotations) }}
{{ $key }}: {{ $val | quote }}
{{- end }}
{{- end }}
Expand Down
2 changes: 1 addition & 1 deletion stable/hazelcast/templates/mancenter-service.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ metadata:
helm.sh/chart: {{ template "hazelcast.chart" . }}
app.kubernetes.io/instance: "{{ .Release.Name }}"
app.kubernetes.io/managed-by: "{{ .Release.Service }}"
{{- range $key, $value := (merge .Values.mancenter.service.labels .Values.commonLabels) }}
{{- range $key, $value := (merge nil .Values.mancenter.service.labels .Values.commonLabels) }}
{{ $key }}: {{ $value | quote }}
{{- end }}
{{- if .Values.commonAnnotations }}
Expand Down
2 changes: 1 addition & 1 deletion stable/hazelcast/templates/mancenter-statefulset.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ metadata:
helm.sh/chart: {{ template "hazelcast.chart" . }}
app.kubernetes.io/instance: "{{ .Release.Name }}"
app.kubernetes.io/managed-by: "{{ .Release.Service }}"
{{- range $key, $value := (merge .Values.mancenter.labels .Values.commonLabels) }}
{{- range $key, $value := (merge nil .Values.mancenter.labels .Values.commonLabels) }}
{{ $key }}: {{ $value | quote }}
{{- end }}
{{- if .Values.commonAnnotations }}
Expand Down
2 changes: 1 addition & 1 deletion stable/hazelcast/templates/metrics-service.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ metadata:
{{- end }}
{{- if or .Values.metrics.service.annotations .Values.commonAnnotations }}
annotations:
{{- range $key, $val := (merge .Values.metrics.service.annotations .Values.commonAnnotations) }}
{{- range $key, $val := (merge nil .Values.metrics.service.annotations .Values.commonAnnotations) }}
{{ $key }}: {{ $val | quote }}
{{- end }}
{{- end }}
Expand Down
2 changes: 1 addition & 1 deletion stable/hazelcast/templates/prometheusrule.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
helm.sh/chart: {{ template "hazelcast.chart" . }}
app.kubernetes.io/instance: "{{ .Release.Name }}"
app.kubernetes.io/managed-by: "{{ .Release.Service }}"
{{- range $key, $val := (merge .Values.metrics.prometheusRule.labels .Values.commonLabels) }}
{{- range $key, $val := (merge nil .Values.metrics.prometheusRule.labels .Values.commonLabels) }}
{{ $key }}: {{ $val | quote }}
{{- end }}
{{- if .Values.commonAnnotations }}
Expand Down
4 changes: 2 additions & 2 deletions stable/hazelcast/templates/service-external.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ metadata:
app.kubernetes.io/instance: "{{ $.Release.Name }}"
app.kubernetes.io/managed-by: "{{ $.Release.Service }}"
pod: {{ $targetPod }}
{{- range $key, $value := (merge .Values.externalAccess.service.labels .Values.commonLabels) }}
{{- range $key, $value := (merge nil .Values.externalAccess.service.labels .Values.commonLabels) }}
{{ $key }}: {{ $value | quote }}
{{- end }}
{{- if or .Values.externalAccess.service.annotations .Values.commonAnnotations }}
annotations:
{{- range $key, $val := (merge .Values.externalAccess.service.annotations .Values.commonAnnotations) }}
{{- range $key, $val := (merge nil .Values.externalAccess.service.annotations .Values.commonAnnotations) }}
{{ $key }}: {{ $val | quote }}
{{- end }}
{{- end }}
Expand Down
2 changes: 1 addition & 1 deletion stable/hazelcast/templates/service.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ metadata:
helm.sh/chart: {{ template "hazelcast.chart" . }}
app.kubernetes.io/instance: "{{ .Release.Name }}"
app.kubernetes.io/managed-by: "{{ .Release.Service }}"
{{- range $key, $value := (merge .Values.service.labels .Values.commonLabels) }}
{{- range $key, $value := (merge nil .Values.service.labels .Values.commonLabels) }}
{{ $key }}: {{ $value | quote }}
{{- end }}
{{- if .Values.commonAnnotations }}
Expand Down
2 changes: 1 addition & 1 deletion stable/hazelcast/templates/servicemonitor.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
helm.sh/chart: {{ template "hazelcast.chart" . }}
app.kubernetes.io/instance: "{{ .Release.Name }}"
app.kubernetes.io/managed-by: "{{ .Release.Service }}"
{{- range $key, $val := (merge .Values.metrics.serviceMonitor.labels .Values.commonLabels) }}
{{- range $key, $val := (merge nil .Values.metrics.serviceMonitor.labels .Values.commonLabels) }}
{{ $key }}: {{ $val | quote }}
{{- end }}
{{- if .Values.commonAnnotations }}
Expand Down
4 changes: 2 additions & 2 deletions stable/hazelcast/templates/statefulset.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ metadata:
helm.sh/chart: {{ template "hazelcast.chart" . }}
app.kubernetes.io/instance: "{{ .Release.Name }}"
app.kubernetes.io/managed-by: "{{ .Release.Service }}"
{{- range $key, $value := (merge .Values.labels .Values.commonLabels) }}
{{- range $key, $value := (merge nil .Values.labels .Values.commonLabels) }}
{{ $key }}: {{ $value | quote }}
{{- end }}
{{- if or .Values.annotations .Values.commonAnnotations }}
annotations:
{{- range $key, $val := (merge .Values.annotations .Values.commonAnnotations) }}
{{- range $key, $val := (merge nil .Values.annotations .Values.commonAnnotations) }}
{{ $key }}: {{ $val | quote }}
{{- end }}
{{- end }}
Expand Down

0 comments on commit 10e45d1

Please sign in to comment.