Skip to content

Commit 59dc37e

Browse files
mfordjodymfordjody
authored
[charts] Refactoring the register package (#655)
1 parent a017a09 commit 59dc37e

File tree

11 files changed

+186
-609
lines changed

11 files changed

+186
-609
lines changed

‎manifests/charts/dubbo-control/register-discovery/nacos/templates/_helpers.tpl

Lines changed: 0 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +0,0 @@
1-
{{/*
2-
Return the appropriate apiVersion for deployment or statefulset.
3-
*/}}
4-
{{- define "apiVersion" -}}
5-
{{- if and ($.Capabilities.APIVersions.Has "apps/v1") (semverCompare ">= 1.14-0" .Capabilities.KubeVersion.Version) }}
6-
{{- print "apps/v1" }}
7-
{{- else }}
8-
{{- print "extensions/v1beta1" }}
9-
{{- end }}
10-
{{- end }}
11-
12-
{{/*
13-
Return Nacos Name to use.
14-
*/}}
15-
{{- define "nacos.name" -}}
16-
{{- printf "nacos" -}}
17-
{{- end -}}
18-
19-
{{/*
20-
Return Nacos Labels to use.
21-
*/}}
22-
{{- define "nacos.labels" -}}
23-
app: {{ template "nacos.name" . }}
24-
app.kubernetes.io/name: {{ template "nacos.name" . }}
25-
app.kubernetes.io/instance: {{ template "nacos.name" . }}
26-
app.kubernetes.io/component: {{ template "nacos.name" . }}
27-
app.kubernetes.io/managed-by: {{ .Release.Service }}
28-
{{- end -}}
29-
30-
{{/*
31-
Return Nacos matchLabels to use.
32-
*/}}
33-
{{- define "nacos.matchLabels" -}}
34-
app.kubernetes.io/name: {{ template "nacos.name" . }}
35-
app.kubernetes.io/instance: {{ template "nacos.name" . }}
36-
app.kubernetes.io/component: {{ template "nacos.name" . }}
37-
app.kubernetes.io/managed-by: {{ .Release.Service }}
38-
{{- end -}}
39-
40-
{{/*
41-
Return Nacos Service Selector to use.
42-
*/}}
43-
{{- define "nacos.selector" -}}
44-
{{ include "nacos.name" . }}
45-
{{- end -}}
46-
47-
{{/*
48-
Return Nacos Port to use.
49-
*/}}
50-
{{- define "nacos.port" -}}
51-
{{- printf "8848" -}}
52-
{{- end -}}
53-

‎manifests/charts/dubbo-control/register-discovery/nacos/templates/configmap.yaml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,16 @@
44
apiVersion: v1
55
kind: ConfigMap
66
metadata:
7-
name: {{ template "nacos.name" . }}-db-config
7+
name: nacos-db-config
88
namespace: {{ .Release.Namespace }}
99
labels:
10-
{{- include "nacos.labels" . | nindent 4 }}
11-
{{- with $nacos.labels }}
12-
{{- toYaml . | nindent 4 }}
13-
{{- end }}
14-
annotations:
15-
{{- with $nacos.annotations }}
16-
{{- toYaml . | nindent 4 }}
17-
{{- end }}
10+
app: nacos
11+
dubbo.io/rev: {{ default "default" | quote }}
12+
install.operator.dubbo.io/owning-resource: {{ default "unknown" }}
13+
operator.dubbo.io/component: "Nacos"
14+
dubbo: nacos
15+
release: {{ .Release.Name }}
16+
app.kubernetes.io/name: "register"
1817
data:
1918
{{- with $nacos.storage | default $ncs.storage }}
2019
mysql.db.host: {{ .db.host | default $ncs.db.host }}

‎manifests/charts/dubbo-control/register-discovery/nacos/templates/service.yaml

Lines changed: 23 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,106 +1,63 @@
11
{{- $nacos := .Values -}}
22
{{- $ncs := .Values.nacos }}
3-
{{- $service := $nacos.service -}}
43
apiVersion: v1
54
kind: Service
65
metadata:
7-
name: {{ template "nacos.name" . }}
6+
name: nacos
87
namespace: {{ .Release.Namespace }}
98
labels:
10-
{{- include "nacos.labels" . | nindent 4 }}
11-
{{- with $nacos.labels }}
12-
{{- toYaml . | nindent 4 }}
13-
{{- end }}
14-
annotations:
15-
{{- with $nacos.annotations }}
16-
{{- toYaml . | nindent 4 }}
17-
{{- end }}
9+
app: nacos
10+
dubbo.io/rev: {{ default "default" | quote }}
11+
install.operator.dubbo.io/owning-resource: {{ default "unknown" }}
12+
operator.dubbo.io/component: "Nacos"
13+
dubbo: nacos
14+
release: {{ .Release.Name }}
15+
app.kubernetes.io/name: "register"
1816
spec:
19-
{{- if $service.type }}
20-
type: {{ $service.type }}
21-
{{- end }}
22-
{{- if $service.clusterIP }}
23-
clusterIP: {{ $service.clusterIP }}
24-
{{- end }}
25-
{{- if $service.externalIPs }}
26-
externalIPs: {{ $service.externalIPs }}
27-
{{- end }}
28-
{{- if $service.loadBalancerIP }}
29-
loadBalancerIP: {{ $service.loadBalancerIP }}
30-
{{- end }}
31-
{{- if $service.loadBalancerSourceRanges }}
32-
loadBalancerSourceRanges: {{ $service.loadBalancerSourceRanges }}
33-
{{- end }}
34-
{{- if $service.loadBalancerClass }}
35-
loadBalancerClass: {{ $service.loadBalancerClass }}
36-
{{- end }}
3717
ports:
3818
- name: http
39-
port: {{ template "nacos.port" }}
19+
port: 8848
4020
targetPort: http
4121
protocol: TCP
4222
- name: clientgen-rpc
43-
port: {{ add $nacos.serverPort 1000 }}
23+
port: {{ add 8848 1000 }}
4424
targetPort: clientgen-rpc
4525
protocol: TCP
4626
- name: raft-rpc
47-
port: {{ add $nacos.serverPort 1001 }}
27+
port: {{ add 8848 1001 }}
4828
targetPort: raft-rpc
4929
protocol: TCP
5030
selector:
51-
app: {{ template "nacos.selector" . }}
31+
app: nacos
5232
---
53-
{{- if and (eq $nacos.mode "cluster"|default $ncs.mode) }}
33+
{{- if and (eq $nacos.mode "cluster" | default $ncs.mode) }}
5434
apiVersion: v1
5535
kind: Service
5636
metadata:
5737
name: {{ template "nacos.name" . }}-headless
5838
namespace: {{ .Release.Namespace }}
5939
labels:
60-
{{- include "nacos.labels" . | nindent 4 }}
61-
{{- with .Values.labels }}
62-
{{- toYaml . | nindent 4 }}
63-
{{- end }}
64-
annotations:
65-
{{- with $nacos.annotations }}
66-
{{- toYaml . | nindent 4 }}
67-
{{- end }}
40+
app: nacos
41+
dubbo.io/rev: {{ default "default" | quote }}
42+
install.operator.dubbo.io/owning-resource: {{ default "unknown" }}
43+
operator.dubbo.io/component: "Nacos"
44+
dubbo: nacos
45+
release: {{ .Release.Name }}
46+
app.kubernetes.io/name: "register"
6847
spec:
69-
{{- if $service.type }}
70-
type: {{ $service.type }}
71-
{{- end }}
72-
clusterIP: None
73-
{{- if $service.externalIPs }}
74-
externalIPs: {{ $service.externalIPs }}
75-
{{- end }}
76-
{{- if $service.loadBalancerIP }}
77-
loadBalancerIP: {{ $service.loadBalancerIP }}
78-
{{- end }}
79-
{{- if $service.loadBalancerSourceRanges }}
80-
loadBalancerSourceRanges: {{ $service.loadBalancerSourceRanges }}
81-
{{- end }}
82-
{{- if $service.loadBalancerClass }}
83-
loadBalancerClass: {{ $service.loadBalancerClass }}
84-
{{- end }}
85-
{{- if $service.sessionAffinity }}
86-
sessionAffinity: {{ $service.sessionAffinity }}
87-
{{- end }}
88-
{{- if $service.publishNotReadyAddresses }}
89-
publishNotReadyAddresses: {{ $service.publishNotReadyAddresses }}
90-
{{- end }}
9148
ports:
9249
- name: http
9350
port: 8848
9451
targetPort: http
9552
protocol: TCP
9653
- name: clientgen-rpc
97-
port: {{ add $nacos.serverPort 1000 }}
54+
port: {{ add 8848 1000 }}
9855
targetPort: clientgen-rpc
9956
protocol: TCP
10057
- name: raft-rpc
101-
port: {{ add $nacos.serverPort 1001 }}
58+
port: {{ add 8848 1001 }}
10259
targetPort: raft-rpc
10360
protocol: TCP
10461
selector:
105-
app: {{ template "nacos.selector" . }}
62+
app: nacos
10663
{{- end -}}

‎manifests/charts/dubbo-control/register-discovery/nacos/templates/statefulset.yaml

Lines changed: 52 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -3,135 +3,123 @@
33
apiVersion: apps/v1
44
kind: StatefulSet
55
metadata:
6-
name: {{ template "nacos.name" . }}
6+
name: nacos
77
namespace: {{ .Release.Namespace }}
88
labels:
9-
{{- include "nacos.labels" . | nindent 4 }}
10-
{{- with $nacos.labels }}
11-
{{- toYaml . | nindent 4 }}
12-
{{- end }}
13-
annotations:
14-
{{- with $nacos.annotations }}
15-
{{- toYaml . | nindent 4 }}
16-
{{- end }}
9+
app: nacos
10+
dubbo.io/rev: {{ default "default" | quote }}
11+
install.operator.dubbo.io/owning-resource: {{ default "unknown" }}
12+
operator.dubbo.io/component: "Nacos"
13+
dubbo: nacos
14+
release: {{ .Release.Name }}
15+
app.kubernetes.io/name: "register"
1716
spec:
1817
replicas: {{ $ncs.replicas }}
1918
{{- if eq $nacos.mode "cluster" }}
20-
serviceName: {{ template "nacos.name" . }}-headless
19+
serviceName: nacos-headless
2120
{{- else }}
22-
serviceName: {{ template "nacos.name" . }}
21+
serviceName: nacos
2322
{{- end }}
2423
selector:
2524
matchLabels:
26-
{{- include "nacos.matchLabels" . | nindent 6 }}
25+
app: nacos
26+
dubbo.io/rev: {{ default "default" | quote }}
27+
dubbo: nacos
2728
template:
2829
metadata:
2930
labels:
30-
{{- include "nacos.labels" . | nindent 8 }}
31+
app: nacos
32+
dubbo.io/rev: {{ default "default" | quote }}
33+
install.operator.dubbo.io/owning-resource: {{ default "unknown" }}
34+
operator.dubbo.io/component: "Nacos"
35+
dubbo: nacos
36+
release: {{ .Release.Name }}
37+
app.kubernetes.io/name: "register"
3138
spec:
32-
securityContext:
33-
{{- if $nacos.securityContext.enabled }}
34-
{{- omit $nacos.securityContext "enabled" | toYaml | nindent 8 }}
35-
{{- end }}
36-
{{- if and (eq $nacos.mode "cluster" |default $ncs.mode) ($nacos.plugin.enabled | default $ncs.plugin.enabled) }}
39+
{{- if and (eq $nacos.mode "cluster" | default $ncs.mode) ($nacos.plugin.enabled | default $ncs.plugin.enabled) }}
3740
initContainers:
38-
- name: peer-finder-plugin-install
39-
image: {{ $nacos.plugin.image.registry }}:{{ $nacos.plugin.image.tag }}
40-
imagePullPolicy: {{ $nacos.plugin.image.pullPolicy }}
41-
volumeMounts:
42-
- name: data
43-
mountPath: /home/nacos/plugins/peer-finder
44-
subPath: peer-finder
41+
- name: peer-finder-plugin-install
42+
image: {{ $nacos.plugin.image.registry }}:{{ $nacos.plugin.image.tag }}
43+
imagePullPolicy: {{ $nacos.plugin.image.pullPolicy }}
44+
volumeMounts:
45+
- name: data
46+
mountPath: /home/nacos/plugins/peer-finder
47+
subPath: peer-finder
4548
{{- end }}
4649
containers:
4750
- name: nacos
4851
image: {{ $nacos.image.registry }}:{{ $nacos.image.tag }}
4952
imagePullPolicy: {{ $nacos.image.pullPolicy }}
50-
securityContext:
51-
{{- if $nacos.containerSecurityContext.enabled }}
52-
{{- omit $nacos.containerSecurityContext "enabled" | toYaml | nindent 10 }}
53-
{{- end }}
54-
startupProbe:
55-
{{- if $nacos.startupProbe }}
56-
{{- toYaml $nacos.startupProbe | nindent 10 }}
57-
{{- end }}
58-
readinessProbe:
59-
{{- if $nacos.readinessProbe }}
60-
{{- toYaml $nacos.readinessProbe | nindent 10 }}
61-
{{- end }}
62-
livenessProbe:
63-
{{- if $nacos.livenessProbe }}
64-
{{- toYaml $nacos.livenessProbe | nindent 10 }}
65-
{{- end }}
6653
ports:
6754
- name: http
6855
containerPort: 8848
6956
- name: clientgen-rpc
70-
containerPort: {{ add $nacos.serverPort 1000 }}
57+
containerPort: {{ add 8848 1000 }}
7158
- name: raft-rpc
72-
containerPort: {{ add $nacos.serverPort 1001 }}
59+
containerPort: {{ add 8848 1001 }}
7360
resources:
74-
{{- if $nacos.resources }}
75-
{{- toYaml $nacos.resources | nindent 10 }}
76-
{{- end }}
61+
{{ toYaml $nacos.resources | trim | indent 10 }}
7762
env:
7863
- name: NACOS_SERVER_PORT
79-
value: {{ $nacos.serverPort | quote }}
64+
value: "8848"
8065
- name: NACOS_APPLICATION_PORT
81-
value: {{ $nacos.serverPort | quote }}
66+
value: "8848"
8267
- name: PREFER_HOST_MODE
83-
value: {{ $nacos.preferhostmode | quote }}
84-
{{- if eq $nacos.mode "standalone" |default $ncs.mode }}
68+
value: {{ $ncs.preferhostmode | quote }}
69+
{{- if eq $nacos.mode "standalone" | default $ncs.mode }}
8570
- name: MODE
8671
value: "standalone"
87-
{{- else if eq $nacos.mode "cluster" |default $ncs.mode }}
72+
{{- else if eq $nacos.mode "cluster" | default $ncs.mode }}
8873
- name: SERVICE_NAME
89-
value: "{{ template "nacos.name" . }}-headless"
74+
value: "nacos-headless"
9075
- name: DOMAIN_NAME
91-
value: {{ $nacos.clusterDomain | quote }}
92-
- name: POD_NAMESPACE
93-
valueFrom:
94-
fieldRef:
95-
apiVersion: v1
96-
fieldPath: metadata.namespace
76+
value: "cluster.local"
9777
{{- end }}
9878
{{- if eq $nacos.storage.type "mysql" }}
9979
- name: SPRING_DATASOURCE_PLATFORM
10080
value: "mysql"
10181
- name: MYSQL_SERVICE_HOST
10282
valueFrom:
10383
configMapKeyRef:
104-
name: {{ template "nacos.name" . }}-db-config
84+
name: nacos-db-config
10585
key: mysql.db.host
10686
- name: MYSQL_SERVICE_DB_NAME
10787
valueFrom:
10888
configMapKeyRef:
109-
name: {{ template "nacos.name" . }}-db-config
89+
name: nacos-db-config
11090
key: mysql.db.name
11191
- name: MYSQL_SERVICE_PORT
11292
valueFrom:
11393
configMapKeyRef:
114-
name: {{ template "nacos.name" . }}-db-config
94+
name: nacos-db-config
11595
key: mysql.port
11696
- name: MYSQL_SERVICE_USER
11797
valueFrom:
11898
configMapKeyRef:
119-
name: {{ template "nacos.name" . }}-db-config
99+
name: nacos-db-config
120100
key: mysql.user
121101
- name: MYSQL_SERVICE_PASSWORD
122102
valueFrom:
123103
configMapKeyRef:
124-
name: {{ template "nacos.name" . }}-db-config
104+
name: nacos-db-config
125105
key: mysql.password
126106
- name: MYSQL_SERVICE_DB_PARAM
127107
valueFrom:
128108
configMapKeyRef:
129-
name: {{ template "nacos.name" . }}-db-config
109+
name: nacos-db-config
130110
key: mysql.param
131111
{{- else }}
132112
- name: EMBEDDED_STORAGE
133113
value: embedded
134114
{{- end }}
115+
readinessProbe:
116+
httpGet:
117+
path: /nacos/v1/console/health/readiness
118+
port: 8848
119+
scheme: HTTP
120+
initialDelaySeconds: 10
121+
periodSeconds: 5
122+
timeoutSeconds: 10
135123
volumeMounts:
136124
- name: data
137125
mountPath: /home/nacos/plugins/peer-finder

0 commit comments

Comments
 (0)