Skip to content

Commit 3e94a4e

Browse files
cuisongliucuisongliu
committed
fix(templates): update resource names and configurations to use fullname template function
1 parent dbd91f5 commit 3e94a4e

7 files changed

Lines changed: 97 additions & 24 deletions

File tree

‎controllers/user/deploy/charts/user/templates/cert.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: cert-manager.io/v1
22
kind: Issuer
33
metadata:
4-
name: user-selfsigned-issuer
4+
name: {{ include "user.fullname" . }}-selfsigned-issuer
55
labels:
66
control-plane: controller-manager
77
{{- include "user.labels" . | nindent 4 }}
@@ -11,15 +11,15 @@ spec:
1111
apiVersion: cert-manager.io/v1
1212
kind: Certificate
1313
metadata:
14-
name: user-serving-cert
14+
name: {{ include "user.fullname" . }}-serving-cert
1515
labels:
1616
control-plane: controller-manager
1717
{{- include "user.labels" . | nindent 4 }}
1818
spec:
1919
dnsNames:
20-
- user-webhook-service.{{ .Release.Namespace }}.svc
21-
- user-webhook-service.{{ .Release.Namespace }}.svc.cluster.local
20+
- {{ include "user.fullname" . }}-webhook-service.{{ .Release.Namespace }}.svc
21+
- {{ include "user.fullname" . }}-webhook-service.{{ .Release.Namespace }}.svc.cluster.local
2222
issuerRef:
2323
kind: Issuer
24-
name: user-selfsigned-issuer
25-
secretName: user-server-cert
24+
name: {{ include "user.fullname" . }}-selfsigned-issuer
25+
secretName: webhook-server-cert

‎controllers/user/deploy/charts/user/templates/configmap.yaml‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,23 @@
11
apiVersion: v1
22
kind: ConfigMap
33
metadata:
4-
name: {{ include "user.fullname" . }}
4+
name: {{ include "user.fullname" . }}-manager-config
55
labels:
6+
control-plane: controller-manager
67
{{- include "user.labels" . | nindent 4 }}
78
data:
9+
controller_manager_config.yaml: |
10+
apiVersion: controller-runtime.sigs.k8s.io/v1alpha1
11+
kind: ControllerManagerConfig
12+
health:
13+
healthProbeBindAddress: :8081
14+
metrics:
15+
bindAddress: 127.0.0.1:8080
16+
webhook:
17+
port: 9443
18+
leaderElection:
19+
leaderElect: true
20+
resourceName: 785548a1.sealos.io
821
config.yaml: |
922
global:
1023
cloudAPIServerDomain: {{ .Values.cloudAPIServerDomain }}

‎controllers/user/deploy/charts/user/templates/deployment.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: apps/v1
22
kind: Deployment
33
metadata:
4-
name: user-controller-manager
4+
name: {{ include "user.fullname" . }}-controller-manager
55
labels:
66
control-plane: controller-manager
77
{{- include "user.labels" . | nindent 4 }}
@@ -10,6 +10,7 @@ spec:
1010
selector:
1111
matchLabels:
1212
control-plane: controller-manager
13+
{{- include "user.selectorLabels" . | nindent 6 }}
1314
template:
1415
metadata:
1516
annotations:
@@ -116,4 +117,4 @@ spec:
116117
secretName: webhook-server-cert
117118
- name: user-manager-volume
118119
configMap:
119-
name: user-manager-config
120+
name: {{ include "user.fullname" . }}-manager-config

‎controllers/user/deploy/charts/user/templates/rbac.yaml‎

Lines changed: 60 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,48 @@
1+
apiVersion: rbac.authorization.k8s.io/v1
2+
kind: Role
3+
metadata:
4+
name: {{ include "user.fullname" . }}-leader-election-role
5+
namespace: {{ .Release.Namespace }}
6+
labels:
7+
control-plane: controller-manager
8+
{{- include "user.labels" . | nindent 4 }}
9+
rules:
10+
- apiGroups:
11+
- ""
12+
resources:
13+
- configmaps
14+
verbs:
15+
- get
16+
- list
17+
- watch
18+
- create
19+
- update
20+
- patch
21+
- delete
22+
- apiGroups:
23+
- coordination.k8s.io
24+
resources:
25+
- leases
26+
verbs:
27+
- get
28+
- list
29+
- watch
30+
- create
31+
- update
32+
- patch
33+
- delete
34+
- apiGroups:
35+
- ""
36+
resources:
37+
- events
38+
verbs:
39+
- create
40+
- patch
141
---
242
apiVersion: rbac.authorization.k8s.io/v1
343
kind: ClusterRole
444
metadata:
5-
name: user-manager-role
45+
name: {{ include "user.fullname" . }}-manager-role
646
rules:
747
- apiGroups:
848
- "*"
@@ -12,13 +52,30 @@ rules:
1252
- "*"
1353
---
1454
apiVersion: rbac.authorization.k8s.io/v1
55+
kind: RoleBinding
56+
metadata:
57+
name: {{ include "user.fullname" . }}-leader-election-rolebinding
58+
namespace: {{ .Release.Namespace }}
59+
labels:
60+
control-plane: controller-manager
61+
{{- include "user.labels" . | nindent 4 }}
62+
roleRef:
63+
apiGroup: rbac.authorization.k8s.io
64+
kind: Role
65+
name: {{ include "user.fullname" . }}-leader-election-role
66+
subjects:
67+
- kind: ServiceAccount
68+
name: {{ include "user.serviceAccountName" . }}
69+
namespace: {{ .Release.Namespace }}
70+
---
71+
apiVersion: rbac.authorization.k8s.io/v1
1572
kind: ClusterRoleBinding
1673
metadata:
17-
name: user-manager-rolebinding
74+
name: {{ include "user.fullname" . }}-manager-rolebinding
1875
roleRef:
1976
apiGroup: rbac.authorization.k8s.io
2077
kind: ClusterRole
21-
name: user-manager-role
78+
name: {{ include "user.fullname" . }}-manager-role
2279
subjects:
2380
- kind: ServiceAccount
2481
name: {{ include "user.serviceAccountName" . }}

‎controllers/user/deploy/charts/user/templates/service.yaml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
apiVersion: v1
33
kind: Service
44
metadata:
5-
name: user-controller-manager-metrics-service
5+
name: {{ include "user.fullname" . }}-controller-manager-metrics-service
66
labels:
77
control-plane: controller-manager
88
{{- include "user.labels" . | nindent 4 }}
@@ -14,12 +14,13 @@ spec:
1414
targetPort: https
1515
selector:
1616
control-plane: controller-manager
17+
{{- include "user.selectorLabels" . | nindent 4 }}
1718
{{- end }}
1819
---
1920
apiVersion: v1
2021
kind: Service
2122
metadata:
22-
name: user-webhook-service
23+
name: {{ include "user.fullname" . }}-webhook-service
2324
labels:
2425
control-plane: controller-manager
2526
{{- include "user.labels" . | nindent 4 }}
@@ -30,3 +31,4 @@ spec:
3031
targetPort: 9443
3132
selector:
3233
control-plane: controller-manager
34+
{{- include "user.selectorLabels" . | nindent 4 }}

‎controllers/user/deploy/charts/user/templates/webhook.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
apiVersion: admissionregistration.k8s.io/v1
22
kind: MutatingWebhookConfiguration
33
metadata:
4-
name: user-mutating-webhook-configuration
4+
name: {{ include "user.fullname" . }}-mutating-webhook-configuration
55
annotations:
6-
cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/user-serving-cert
6+
cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "user.fullname" . }}-serving-cert
77
webhooks:
88
- name: moperationrequest.kb.io
99
admissionReviewVersions:
1010
- v1
1111
clientConfig:
1212
service:
13-
name: user-webhook-service
13+
name: {{ include "user.fullname" . }}-webhook-service
1414
namespace: {{ .Release.Namespace }}
1515
path: /mutate-user-sealos-io-v1-operationrequest
1616
failurePolicy: Fail
@@ -30,7 +30,7 @@ webhooks:
3030
- v1
3131
clientConfig:
3232
service:
33-
name: user-webhook-service
33+
name: {{ include "user.fullname" . }}-webhook-service
3434
namespace: {{ .Release.Namespace }}
3535
path: /mutate-user-sealos-io-v1-user
3636
failurePolicy: Fail
@@ -49,16 +49,16 @@ webhooks:
4949
apiVersion: admissionregistration.k8s.io/v1
5050
kind: ValidatingWebhookConfiguration
5151
metadata:
52-
name: user-validating-webhook-configuration
52+
name: {{ include "user.fullname" . }}-validating-webhook-configuration
5353
annotations:
54-
cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/user-serving-cert
54+
cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "user.fullname" . }}-serving-cert
5555
webhooks:
5656
- name: voperationrequest.kb.io
5757
admissionReviewVersions:
5858
- v1
5959
clientConfig:
6060
service:
61-
name: user-webhook-service
61+
name: {{ include "user.fullname" . }}-webhook-service
6262
namespace: {{ .Release.Namespace }}
6363
path: /validate-user-sealos-io-v1-operationrequest
6464
failurePolicy: Fail
@@ -78,7 +78,7 @@ webhooks:
7878
- v1
7979
clientConfig:
8080
service:
81-
name: user-webhook-service
81+
name: {{ include "user.fullname" . }}-webhook-service
8282
namespace: {{ .Release.Namespace }}
8383
path: /validate-user-sealos-io-v1-user
8484
failurePolicy: Fail

‎controllers/user/deploy/charts/user/values.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ image:
99

1010
imagePullSecrets: []
1111
nameOverride: ""
12-
fullnameOverride: ""
12+
fullnameOverride: "user"
1313

1414
serviceAccount:
1515
create: true
1616
automount: true
1717
annotations: {}
18-
name: ""
18+
name: "user-controller-manager"
1919

2020
podAnnotations: {}
2121
podLabels: {}

0 commit comments

Comments
 (0)