Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix hazelcast and mancenter service annotations #403

Merged
merged 1 commit into from
Nov 15, 2023
Merged

Fix hazelcast and mancenter service annotations #403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion stable/hazelcast-enterprise/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v1
name: hazelcast-enterprise
version: 5.10.11
version: 5.10.12
appVersion: "5.3.6"
kubeVersion: ">=1.19.0-0"
description: Hazelcast is a streaming and memory-first application platform for fast, stateful, data-intensive workloads on-premises, at the edge or as a fully managed cloud service.
Expand Down
8 changes: 2 additions & 6 deletions stable/hazelcast-enterprise/templates/mancenter-service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@
apiVersion: v1
kind: Service
metadata:
{{- if .Values.mancenter.service.annotations }}
annotations:
{{ toYaml .Values.mancenter.service.annotations | indent 4 }}
{{- end }}
name: {{ template "mancenter.fullname" . }}
labels:
app.kubernetes.io/name: {{ template "mancenter.name" . }}
Expand All @@ -15,9 +11,9 @@ metadata:
{{- range $key, $value := (merge nil .Values.mancenter.service.labels .Values.commonLabels) }}
{{ $key }}: {{ $value | quote }}
{{- end }}
{{- with .Values.commonAnnotations }}
{{- if or .Values.mancenter.service.annotations .Values.commonAnnotations }}
annotations:
{{- toYaml . | nindent 4 }}
{{- merge nil .Values.mancenter.service.annotations .Values.commonAnnotations | toYaml | nindent 4 }}
{{- end }}
spec:
type: {{ .Values.mancenter.service.type }}
Expand Down
8 changes: 2 additions & 6 deletions stable/hazelcast-enterprise/templates/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@
apiVersion: v1
kind: Service
metadata:
{{- if .Values.service.annotations }}
annotations:
{{ toYaml .Values.service.annotations | indent 4 }}
{{- end }}
name: {{ template "hazelcast.serviceName" . }}
labels:
app.kubernetes.io/name: {{ template "hazelcast.name" . }}
Expand All @@ -15,9 +11,9 @@ metadata:
{{- range $key, $value := (merge nil .Values.service.labels .Values.commonLabels) }}
{{ $key }}: {{ $value | quote }}
{{- end }}
{{- with .Values.commonAnnotations }}
{{- if or .Values.service.annotations .Values.commonAnnotations }}
annotations:
{{- toYaml . | nindent 4 }}
{{- merge nil .Values.service.annotations .Values.commonAnnotations | toYaml | nindent 4 }}
{{- end }}
spec:
type: {{ .Values.service.type }}
Expand Down
2 changes: 1 addition & 1 deletion stable/hazelcast/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v1
name: hazelcast
version: 5.8.12
version: 5.8.13
appVersion: "5.3.6"
kubeVersion: ">=1.19.0-0"
description: Hazelcast is a streaming and memory-first application platform for fast, stateful, data-intensive workloads on-premises, at the edge or as a fully managed cloud service.
Expand Down
8 changes: 2 additions & 6 deletions stable/hazelcast/templates/mancenter-service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@
apiVersion: v1
kind: Service
metadata:
{{- if .Values.mancenter.service.annotations }}
annotations:
{{ toYaml .Values.mancenter.service.annotations | indent 4 }}
{{- end }}
name: {{ template "mancenter.fullname" . }}
labels:
app.kubernetes.io/name: {{ template "mancenter.name" . }}
Expand All @@ -15,9 +11,9 @@ metadata:
{{- range $key, $value := (merge nil .Values.mancenter.service.labels .Values.commonLabels) }}
{{ $key }}: {{ $value | quote }}
{{- end }}
{{- with .Values.commonAnnotations }}
{{- if or .Values.mancenter.service.annotations .Values.commonAnnotations }}
annotations:
{{- toYaml . | nindent 4 }}
{{- merge nil .Values.mancenter.service.annotations .Values.commonAnnotations | toYaml | nindent 4 }}
{{- end }}
spec:
type: {{ .Values.mancenter.service.type }}
Expand Down
8 changes: 2 additions & 6 deletions stable/hazelcast/templates/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@
apiVersion: v1
kind: Service
metadata:
{{- if .Values.service.annotations }}
annotations:
{{ toYaml .Values.service.annotations | indent 4 }}
{{- end }}
name: {{ template "hazelcast.serviceName" . }}
labels:
app.kubernetes.io/name: {{ template "hazelcast.name" . }}
Expand All @@ -15,9 +11,9 @@ metadata:
{{- range $key, $value := (merge nil .Values.service.labels .Values.commonLabels) }}
{{ $key }}: {{ $value | quote }}
{{- end }}
{{- with .Values.commonAnnotations }}
{{- if or .Values.service.annotations .Values.commonAnnotations }}
annotations:
{{- toYaml . | nindent 4 }}
{{- merge nil .Values.service.annotations .Values.commonAnnotations | toYaml | nindent 4 }}
{{- end }}
spec:
type: {{ .Values.service.type }}
Expand Down
Loading