summaryrefslogtreecommitdiffstats
path: root/kubernetes/kube2msb
diff options
context:
space:
mode:
authorBorislavG <Borislav.Glozman@amdocs.com>2018-02-27 15:04:26 +0000
committerAlexis de Talhouƫt <alexis.de_talhouet@bell.ca>2018-03-01 18:10:31 +0000
commit8bfc6cf8c3d338c84c48201f7a4f274958e721a9 (patch)
tree2e0e1a969afc6ae38f0a2f62cc1a36e184cb48e1 /kubernetes/kube2msb
parentf0a34e22011b4323bbd6a51ad313d6e547808101 (diff)
Run all components in one namespace
Change-Id: I5fcd4d577c1fda4de27842807c7cf7a5d372756e Issue-ID: OOM-722 Signed-off-by: BorislavG <Borislav.Glozman@amdocs.com>
Diffstat (limited to 'kubernetes/kube2msb')
-rw-r--r--kubernetes/kube2msb/templates/kube2msb-registrator-deployment.yaml6
-rw-r--r--kubernetes/kube2msb/values.yaml2
2 files changed, 4 insertions, 4 deletions
diff --git a/kubernetes/kube2msb/templates/kube2msb-registrator-deployment.yaml b/kubernetes/kube2msb/templates/kube2msb-registrator-deployment.yaml
index 9df3aa8fa5..d6b194008b 100644
--- a/kubernetes/kube2msb/templates/kube2msb-registrator-deployment.yaml
+++ b/kubernetes/kube2msb/templates/kube2msb-registrator-deployment.yaml
@@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: kube2msb-registrator
- namespace: "{{ .Values.nsPrefix }}-kube2msb"
+ namespace: "{{ .Values.nsPrefix }}"
spec:
replicas: 1
selector:
@@ -26,8 +26,8 @@ spec:
- name: AUTH_TOKEN
value: {{ .Values.kubeMasterAuthToken }}
- name: MSB_URL
- value: {{ .Values.discoveryUrl }}
+ value: {{tpl $.Values.discoveryUrl .}}
imagePullPolicy: {{ .Values.pullPolicy }}
imagePullSecrets:
- name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }} \ No newline at end of file
+#{{ end }}
diff --git a/kubernetes/kube2msb/values.yaml b/kubernetes/kube2msb/values.yaml
index 2daccee4ae..92694482e8 100644
--- a/kubernetes/kube2msb/values.yaml
+++ b/kubernetes/kube2msb/values.yaml
@@ -3,4 +3,4 @@ pullPolicy: IfNotPresent
image:
kube2msb: nexus3.onap.org:10001/onap/oom/kube2msb
kubeMasterUrl: https://kubernetes.default.svc.cluster.local:443
-discoveryUrl: http://msb-discovery.onap-msb:10081
+discoveryUrl: http://msb-discovery.{{ .Values.nsPrefix }}:10081