@@ -101,7 +101,8 @@ spec:
101
101
selector : {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }}
102
102
app.kubernetes.io/component : node
103
103
104
- {{- if and .Values.sentinel.enabled .Values.sentinel.service.createMaster}}
104
+ {{- $masterServiceConfig := ternary .Values.sentinel.masterService .Values.sentinel.service .Values.sentinel.masterService.enabled -}}
105
+ {{- if and .Values.sentinel.enabled (or .Values.sentinel.masterService.enabled .Values.sentinel.service.createMaster) }}
105
106
---
106
107
apiVersion : v1
107
108
kind : Service
@@ -110,48 +111,46 @@ metadata:
110
111
namespace : {{ include "common.names.namespace" . | quote }}
111
112
labels : {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
112
113
app.kubernetes.io/component : node
113
- {{- if or .Values.sentinel.service .annotations .Values.commonAnnotations }}
114
- {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.sentinel.service. annotations .Values.commonAnnotations ) "context" . ) }}
114
+ {{- if or $masterServiceConfig .annotations .Values.commonAnnotations }}
115
+ {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list ($masterServiceConfig. annotations) .Values.commonAnnotations ) "context" . ) }}
115
116
annotations : {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
116
117
{{- end }}
117
118
spec :
118
- type : {{ .Values.sentinel.service.type }}
119
- {{- if or (eq .Values.sentinel.service.type "LoadBalancer") (eq .Values.sentinel.service.type "NodePort") }}
120
- externalTrafficPolicy : {{ .Values.sentinel.service.externalTrafficPolicy | quote }}
121
- {{- end }}
122
- {{- if and (eq .Values.sentinel.service.type "LoadBalancer") (not (empty .Values.sentinel.service.loadBalancerIP)) }}
123
- loadBalancerIP : {{ .Values.sentinel.service.loadBalancerIP }}
119
+ type : {{ $masterServiceConfig.type }}
120
+ {{- if or (eq $masterServiceConfig.type "LoadBalancer") (eq $masterServiceConfig.type "NodePort") }}
121
+ externalTrafficPolicy : {{ $masterServiceConfig.externalTrafficPolicy | quote }}
124
122
{{- end }}
125
- {{- if and (eq .Values.sentinel.service. type "LoadBalancer") .Values.sentinel.service.loadBalancerClass }}
126
- loadBalancerClass : {{ .Values.sentinel.service.loadBalancerClass }}
123
+ {{- if and (eq $masterServiceConfig. type "LoadBalancer") (not (empty ($masterServiceConfig.loadBalancerIP))) }}
124
+ loadBalancerIP : {{ $masterServiceConfig.loadBalancerIP }}
127
125
{{- end }}
128
- {{- if and (eq .Values.sentinel.service. type "LoadBalancer") (not (empty .Values.sentinel.service.loadBalancerSourceRanges )) }}
129
- loadBalancerSourceRanges : {{ toYaml .Values.sentinel.service.loadBalancerSourceRanges | nindent 4 }}
126
+ {{- if and (eq $masterServiceConfig. type "LoadBalancer") (not (empty ($masterServiceConfig.loadBalancerClass) )) }}
127
+ loadBalancerClass : {{ $masterServiceConfig.loadBalancerClass }}
130
128
{{- end }}
131
- {{- if and .Values.sentinel.service.clusterIP (eq .Values.sentinel.service. type "ClusterIP" ) }}
132
- clusterIP : {{ .Values.sentinel.service.clusterIP }}
129
+ {{- if and (eq $masterServiceConfig. type "LoadBalancer") (not (empty ($masterServiceConfig.loadBalancerSourceRanges)) ) }}
130
+ loadBalancerSourceRanges : {{ toYaml ($masterServiceConfig.loadBalancerSourceRanges) | nindent 4 }}
133
131
{{- end }}
134
- {{- if .Values.sentinel.service.sessionAffinity }}
135
- sessionAffinity : {{ .Values.sentinel.service.sessionAffinity }}
132
+ {{- if and (eq $masterServiceConfig.type "ClusterIP") (not (empty ($masterServiceConfig.clusterIP))) }}
133
+ clusterIP : {{ $masterServiceConfig.clusterIP }}
136
134
{{- end }}
137
- {{- if .Values.sentinel.service.sessionAffinityConfig }}
138
- sessionAffinityConfig : {{- include "common.tplvalues.render" (dict "value" .Values.sentinel.service.sessionAffinityConfig "context" $) | nindent 4 }}
135
+ sessionAffinity : {{ $masterServiceConfig.sessionAffinity }}
136
+ {{- if $masterServiceConfig.sessionAffinityConfig }}
137
+ sessionAffinityConfig : {{- include "common.tplvalues.render" (dict "value" ($masterServiceConfig.sessionAffinityConfig) "context" $) | nindent 4 }}
139
138
{{- end }}
140
139
ports :
141
140
- name : tcp-redis
142
- {{- if and (or (eq .Values.sentinel.service. type "NodePort") (eq .Values.sentinel.service. type "LoadBalancer")) .Values.sentinel.service. nodePorts.redis }}
143
- port : {{ .Values.sentinel.service .nodePorts.redis }}
144
- {{- else if eq .Values.sentinel.service .type "NodePort" }}
141
+ {{- if and (or (eq $masterServiceConfig. type "NodePort") (eq $masterServiceConfig. type "LoadBalancer")) ($masterServiceConfig. nodePorts.redis) }}
142
+ port : {{ $masterServiceConfig .nodePorts.redis }}
143
+ {{- else if eq $masterServiceConfig .type "NodePort" }}
145
144
port : {{ $redisport }}
146
- {{- else}}
147
- port : {{ .Values.sentinel.service .ports.redis }}
145
+ {{- else }}
146
+ port : {{ $masterServiceConfig .ports.redis }}
148
147
{{- end }}
149
148
targetPort : {{ .Values.replica.containerPorts.redis }}
150
- {{- if and (or (eq .Values.sentinel.service. type "NodePort") (eq .Values.sentinel.service. type "LoadBalancer")) .Values.sentinel.service. nodePorts.redis }}
151
- nodePort : {{ .Values.sentinel.service .nodePorts.redis }}
152
- {{- else if eq .Values.sentinel.service .type "ClusterIP" }}
149
+ {{- if and (or (eq $masterServiceConfig. type "NodePort") (eq $masterServiceConfig. type "LoadBalancer")) ($masterServiceConfig. nodePorts.redis) }}
150
+ nodePort : {{ $masterServiceConfig .nodePorts.redis }}
151
+ {{- else if eq $masterServiceConfig .type "ClusterIP" }}
153
152
nodePort : null
154
- {{- else if eq .Values.sentinel.service .type "NodePort" }}
153
+ {{- else if eq $masterServiceConfig .type "NodePort" }}
155
154
nodePort : {{ $redisport }}
156
155
{{- end }}
157
156
selector : {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }}
0 commit comments