Using release.name in yaml

volcano-sh · Mar 19, 2019 · 0c3ac14 · 0c3ac14
1 parent ecc346e
commit 0c3ac14
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 2 deletions.
diff --git a/installer/chart/volcano/templates/admission-config.yaml b/installer/chart/volcano/templates/admission-config.yaml
@@ -9,6 +9,7 @@ webhooks:
       caBundle: ""
       service:
         name: {{ .Release.Name }}-admission-service
+        namespace: {{ .Release.Namespace }}
         path: /jobs
     failurePolicy: Ignore
     name: validatejob.volcano.sh
@@ -35,6 +36,7 @@ webhooks:
       caBundle: ""
       service:
         name: {{ .Release.Name }}-admission-service
+        namespace: {{ .Release.Namespace }}
         path: /mutating-jobs
     failurePolicy: Ignore
     name: mutatejob.volcano.sh

diff --git a/installer/chart/volcano/templates/admission.yaml b/installer/chart/volcano/templates/admission.yaml
@@ -2,12 +2,13 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ .Release.Name }}-admission
-
+  namespace: {{ .Release.Namespace }}
 ---
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: {{ .Release.Name }}-admission
+  namespace: {{ .Release.Namespace }}
 rules:
   - apiGroups: [""]
     resources: ["configmaps"]
@@ -24,9 +25,11 @@ kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: {{ .Release.Name }}-admission-role
+  namespace: {{ .Release.Namespace }}
 subjects:
   - kind: ServiceAccount
     name: {{ .Release.Name }}-admission
+    namespace: {{ .Release.Namespace }}
 roleRef:
   kind: ClusterRole
   name: {{ .Release.Name }}-admission
@@ -40,6 +43,7 @@ metadata:
     app: admission
     admission: "true"
   name: {{ .Release.Name }}-admission
+  namespace: {{ .Release.Namespace }}
 spec:
   replicas: 1
   selector:
@@ -84,6 +88,7 @@ metadata:
   labels:
     test: admission
   name: {{ .Release.Name }}-admission-service
+  namespace: {{ .Release.Namespace }}
 spec:
   ports:
     - port: 443

diff --git a/installer/chart/volcano/templates/controllers.yaml b/installer/chart/volcano/templates/controllers.yaml
@@ -2,12 +2,14 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ .Release.Name }}-controllers
+  namespace: {{ .Release.Namespace }}
 
 ---
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: {{ .Release.Name }}-controllers
+  namespace: {{ .Release.Namespace }}
 rules:
   - apiGroups: ["apiextensions.k8s.io"]
     resources: ["customresourcedefinitions"]
@@ -45,9 +47,11 @@ kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: {{ .Release.Name }}-controllers-role
+  namespace: {{ .Release.Namespace }}
 subjects:
   - kind: ServiceAccount
     name: {{ .Release.Name }}-controllers
+    namespace: {{ .Release.Namespace }}
 roleRef:
   kind: ClusterRole
   name: {{ .Release.Name }}-controllers
@@ -58,6 +62,7 @@ kind: Deployment
 apiVersion: apps/v1
 metadata:
   name: {{ .Release.Name }}-controllers
+  namespace: {{ .Release.Namespace }}
 spec:
   replicas: 1
   selector:

diff --git a/installer/chart/volcano/templates/scheduler.yaml b/installer/chart/volcano/templates/scheduler.yaml
@@ -2,12 +2,13 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ .Release.Name }}-scheduler
-
+  namespace: {{ .Release.Namespace }}
 ---
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: {{ .Release.Name }}-scheduler
+  namespace: {{ .Release.Namespace }}
 rules:
   - apiGroups: ["apiextensions.k8s.io"]
     resources: ["customresourcedefinitions"]
@@ -54,9 +55,11 @@ kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: {{ .Release.Name }}-scheduler-role
+  namespace: {{ .Release.Namespace }}
 subjects:
   - kind: ServiceAccount
     name: {{ .Release.Name }}-scheduler
+    namespace: {{ .Release.Namespace }}
 roleRef:
   kind: ClusterRole
   name: {{ .Release.Name }}-scheduler
@@ -67,6 +70,7 @@ kind: Deployment
 apiVersion: apps/v1
 metadata:
   name: {{ .Release.Name }}-scheduler
+  namespace: {{ .Release.Namespace }}
 spec:
   replicas: 1
   selector: