Skip to content

Commit 0c3ac14

Browse files
committed
Using release.name in yaml
1 parent ecc346e commit 0c3ac14

File tree

4 files changed

+18
-2
lines changed

4 files changed

+18
-2
lines changed

installer/chart/volcano/templates/admission-config.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ webhooks:
99
caBundle: ""
1010
service:
1111
name: {{ .Release.Name }}-admission-service
12+
namespace: {{ .Release.Namespace }}
1213
path: /jobs
1314
failurePolicy: Ignore
1415
name: validatejob.volcano.sh
@@ -35,6 +36,7 @@ webhooks:
3536
caBundle: ""
3637
service:
3738
name: {{ .Release.Name }}-admission-service
39+
namespace: {{ .Release.Namespace }}
3840
path: /mutating-jobs
3941
failurePolicy: Ignore
4042
name: mutatejob.volcano.sh

installer/chart/volcano/templates/admission.yaml

+6-1
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@ apiVersion: v1
22
kind: ServiceAccount
33
metadata:
44
name: {{ .Release.Name }}-admission
5-
5+
namespace: {{ .Release.Namespace }}
66
---
77
kind: ClusterRole
88
apiVersion: rbac.authorization.k8s.io/v1
99
metadata:
1010
name: {{ .Release.Name }}-admission
11+
namespace: {{ .Release.Namespace }}
1112
rules:
1213
- apiGroups: [""]
1314
resources: ["configmaps"]
@@ -24,9 +25,11 @@ kind: ClusterRoleBinding
2425
apiVersion: rbac.authorization.k8s.io/v1
2526
metadata:
2627
name: {{ .Release.Name }}-admission-role
28+
namespace: {{ .Release.Namespace }}
2729
subjects:
2830
- kind: ServiceAccount
2931
name: {{ .Release.Name }}-admission
32+
namespace: {{ .Release.Namespace }}
3033
roleRef:
3134
kind: ClusterRole
3235
name: {{ .Release.Name }}-admission
@@ -40,6 +43,7 @@ metadata:
4043
app: admission
4144
admission: "true"
4245
name: {{ .Release.Name }}-admission
46+
namespace: {{ .Release.Namespace }}
4347
spec:
4448
replicas: 1
4549
selector:
@@ -84,6 +88,7 @@ metadata:
8488
labels:
8589
test: admission
8690
name: {{ .Release.Name }}-admission-service
91+
namespace: {{ .Release.Namespace }}
8792
spec:
8893
ports:
8994
- port: 443

installer/chart/volcano/templates/controllers.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@ apiVersion: v1
22
kind: ServiceAccount
33
metadata:
44
name: {{ .Release.Name }}-controllers
5+
namespace: {{ .Release.Namespace }}
56

67
---
78
kind: ClusterRole
89
apiVersion: rbac.authorization.k8s.io/v1
910
metadata:
1011
name: {{ .Release.Name }}-controllers
12+
namespace: {{ .Release.Namespace }}
1113
rules:
1214
- apiGroups: ["apiextensions.k8s.io"]
1315
resources: ["customresourcedefinitions"]
@@ -45,9 +47,11 @@ kind: ClusterRoleBinding
4547
apiVersion: rbac.authorization.k8s.io/v1
4648
metadata:
4749
name: {{ .Release.Name }}-controllers-role
50+
namespace: {{ .Release.Namespace }}
4851
subjects:
4952
- kind: ServiceAccount
5053
name: {{ .Release.Name }}-controllers
54+
namespace: {{ .Release.Namespace }}
5155
roleRef:
5256
kind: ClusterRole
5357
name: {{ .Release.Name }}-controllers
@@ -58,6 +62,7 @@ kind: Deployment
5862
apiVersion: apps/v1
5963
metadata:
6064
name: {{ .Release.Name }}-controllers
65+
namespace: {{ .Release.Namespace }}
6166
spec:
6267
replicas: 1
6368
selector:

installer/chart/volcano/templates/scheduler.yaml

+5-1
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@ apiVersion: v1
22
kind: ServiceAccount
33
metadata:
44
name: {{ .Release.Name }}-scheduler
5-
5+
namespace: {{ .Release.Namespace }}
66
---
77
kind: ClusterRole
88
apiVersion: rbac.authorization.k8s.io/v1
99
metadata:
1010
name: {{ .Release.Name }}-scheduler
11+
namespace: {{ .Release.Namespace }}
1112
rules:
1213
- apiGroups: ["apiextensions.k8s.io"]
1314
resources: ["customresourcedefinitions"]
@@ -54,9 +55,11 @@ kind: ClusterRoleBinding
5455
apiVersion: rbac.authorization.k8s.io/v1
5556
metadata:
5657
name: {{ .Release.Name }}-scheduler-role
58+
namespace: {{ .Release.Namespace }}
5759
subjects:
5860
- kind: ServiceAccount
5961
name: {{ .Release.Name }}-scheduler
62+
namespace: {{ .Release.Namespace }}
6063
roleRef:
6164
kind: ClusterRole
6265
name: {{ .Release.Name }}-scheduler
@@ -67,6 +70,7 @@ kind: Deployment
6770
apiVersion: apps/v1
6871
metadata:
6972
name: {{ .Release.Name }}-scheduler
73+
namespace: {{ .Release.Namespace }}
7074
spec:
7175
replicas: 1
7276
selector:

0 commit comments

Comments
 (0)