Use Helm's built-in support for namespaces

Remove our non-standard namespace variable and use .Release.Namespace
to put fission deployments and services into.

(We still need the functionNamespace parameter, to customize what
namespace fission puts functions into.)
This commit is contained in:
Soam Vasani
2017-02-16 12:01:26 -08:00
parent 41baa7b6bf
commit d4dc166039
4 changed files with 16 additions and 18 deletions
+8 -8
View File
@@ -1,7 +1,7 @@
apiVersion: v1
kind: Namespace
metadata:
name: {{ .Values.namespace }}
name: {{ .Release.Namespace }}
labels:
name: fission
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
@@ -20,7 +20,7 @@ apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: controller
namespace: {{ .Values.namespace }}
namespace: {{ .Release.Namespace }}
labels:
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
spec:
@@ -41,7 +41,7 @@ apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: router
namespace: {{ .Values.namespace }}
namespace: {{ .Release.Namespace }}
labels:
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
spec:
@@ -62,7 +62,7 @@ apiVersion: v1
kind: Service
metadata:
name: poolmgr
namespace: {{ .Values.namespace }}
namespace: {{ .Release.Namespace }}
labels:
svc: poolmgr
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
@@ -78,7 +78,7 @@ apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: poolmgr
namespace: {{ .Values.namespace }}
namespace: {{ .Release.Namespace }}
labels:
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
spec:
@@ -99,7 +99,7 @@ apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: kubewatcher
namespace: {{ .Values.namespace }}
namespace: {{ .Release.Namespace }}
labels:
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
spec:
@@ -120,7 +120,7 @@ apiVersion: v1
kind: Service
metadata:
name: etcd
namespace: {{ .Values.namespace }}
namespace: {{ .Release.Namespace }}
labels:
svc: etcd
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
@@ -136,7 +136,7 @@ apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: etcd
namespace: {{ .Values.namespace }}
namespace: {{ .Release.Namespace }}
labels:
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
spec:
+2 -2
View File
@@ -2,7 +2,7 @@ apiVersion: v1
kind: Service
metadata:
name: router
namespace: {{ .Values.namespace }}
namespace: {{ .Release.Namespace }}
labels:
svc: router
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
@@ -20,7 +20,7 @@ apiVersion: v1
kind: Service
metadata:
name: controller
namespace: {{ .Values.namespace }}
namespace: {{ .Release.Namespace }}
labels:
svc: controller
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"