aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/sdc/templates
diff options
context:
space:
mode:
authorMandeep Khinda <mandeep.khinda@amdocs.com>2017-08-25 03:31:17 +0000
committerMandeep Khinda <mandeep.khinda@amdocs.com>2017-08-25 03:41:20 +0000
commit0e8f8899ca6fdc589316c59f90f8f7283bbfad49 (patch)
tree7c3ed2c2b519b365572ca4a3539320164511c4bd /kubernetes/sdc/templates
parentdeab10d15301b12eee943d7c6151c4300ba2ac2a (diff)
refactor helm files to use namespace prefix
-removed the full namespace from each template. better lets us reuse variables. -made secret end up in a configurable namespace -fixed some bugs where secrets were missing -updated createAll and delete to make use of namespace prefix removing the need for seds to replace the word onap. *** all containers at this point come up in my env. except for aai model loader which is failing cause its still at 1.0 and its trying to talk to a 1.1 sdc and it doesnt auth properly. *** Issue-ID:OOM-215 Change-Id: I15815a01469786a391e272fde4bdaa53ff48091c Signed-off-by: Mandeep Khinda <mandeep.khinda@amdocs.com>
Diffstat (limited to 'kubernetes/sdc/templates')
-rw-r--r--kubernetes/sdc/templates/all-services.yaml10
-rw-r--r--kubernetes/sdc/templates/sdc-be.yaml14
-rw-r--r--kubernetes/sdc/templates/sdc-cs.yaml10
-rw-r--r--kubernetes/sdc/templates/sdc-es.yaml10
-rw-r--r--kubernetes/sdc/templates/sdc-fe.yaml14
-rw-r--r--kubernetes/sdc/templates/sdc-kb.yaml8
6 files changed, 33 insertions, 33 deletions
diff --git a/kubernetes/sdc/templates/all-services.yaml b/kubernetes/sdc/templates/all-services.yaml
index 25ca65e0da..93febccbed 100644
--- a/kubernetes/sdc/templates/all-services.yaml
+++ b/kubernetes/sdc/templates/all-services.yaml
@@ -4,7 +4,7 @@ metadata:
labels:
app: sdc-es
name: sdc-es
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-sdc"
spec:
ports:
- name: sdc-es-port-9200
@@ -21,7 +21,7 @@ metadata:
labels:
app: sdc-cs
name: sdc-cs
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-sdc"
spec:
ports:
- name: sdc-cs-port-9042
@@ -38,7 +38,7 @@ metadata:
labels:
app: sdc-kb
name: sdc-kb
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-sdc"
spec:
ports:
- name: sdc-kb-port-5601
@@ -53,7 +53,7 @@ metadata:
labels:
app: sdc-be
name: sdc-be
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-sdc"
spec:
ports:
- name: sdc-be-port-8443
@@ -72,7 +72,7 @@ metadata:
labels:
app: sdc-fe
name: sdc-fe
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-sdc"
spec:
ports:
- name: sdc-fe-port-9443
diff --git a/kubernetes/sdc/templates/sdc-be.yaml b/kubernetes/sdc/templates/sdc-be.yaml
index 96fee818da..38a239e714 100644
--- a/kubernetes/sdc/templates/sdc-be.yaml
+++ b/kubernetes/sdc/templates/sdc-be.yaml
@@ -4,7 +4,7 @@ metadata:
labels:
app: sdc-be
name: sdc-be
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-sdc"
spec:
selector:
matchLabels:
@@ -54,7 +54,7 @@ spec:
"env": [
{
"name": "NAMESPACE",
- "value": "onap-message-router"
+ "value": "{{ .Values.nsPrefix }}-message-router"
}
],
"image": "{{ .Values.image.readiness }}",
@@ -96,18 +96,18 @@ spec:
volumes:
- name: sdc-sdc-es-es
hostPath:
- path: /dockerdata-nfs/onap/sdc/sdc-es/ES
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/sdc-es/ES
- name: sdc-environments
hostPath:
- path: /dockerdata-nfs/onap/sdc/environments
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/environments
- name: sdc-jetty-keystore
hostPath:
- path: /dockerdata-nfs/onap/sdc/jetty/keystore
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/jetty/keystore
- name: sdc-localtime
hostPath:
path: /etc/localtime
- name: sdc-logs
hostPath:
- path: /dockerdata-nfs/onap/sdc/logs
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/logs
imagePullSecrets:
- - name: onap-docker-registry-key
+ - name: "{{ .Values.nsPrefix }}-docker-registry-key"
diff --git a/kubernetes/sdc/templates/sdc-cs.yaml b/kubernetes/sdc/templates/sdc-cs.yaml
index 55a5613609..b660c90d64 100644
--- a/kubernetes/sdc/templates/sdc-cs.yaml
+++ b/kubernetes/sdc/templates/sdc-cs.yaml
@@ -4,7 +4,7 @@ metadata:
labels:
app: sdc-cs
name: sdc-cs
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-sdc"
spec:
selector:
matchLabels:
@@ -74,15 +74,15 @@ spec:
volumes:
- name: sdc-sdc-cs-cs
hostPath:
- path: /dockerdata-nfs/onap/sdc/sdc-cs/CS
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/sdc-cs/CS
- name: sdc-environments
hostPath:
- path: /dockerdata-nfs/onap/sdc/environments
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/environments
- name: sdc-localtime
hostPath:
path: /etc/localtime
- name: sdc-logs
hostPath:
- path: /dockerdata-nfs/onap/sdc/logs
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/logs
imagePullSecrets:
- - name: onap-docker-registry-key
+ - name: "{{ .Values.nsPrefix }}-docker-registry-key"
diff --git a/kubernetes/sdc/templates/sdc-es.yaml b/kubernetes/sdc/templates/sdc-es.yaml
index f1dfb43f0b..59e69dbfdc 100644
--- a/kubernetes/sdc/templates/sdc-es.yaml
+++ b/kubernetes/sdc/templates/sdc-es.yaml
@@ -4,7 +4,7 @@ metadata:
labels:
app: sdc-es
name: sdc-es
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-sdc"
spec:
selector:
matchLabels:
@@ -48,15 +48,15 @@ spec:
volumes:
- name: sdc-sdc-es-es
hostPath:
- path: /dockerdata-nfs/onap/sdc/sdc-es/ES
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/sdc-es/ES
- name: sdc-environments
hostPath:
- path: /dockerdata-nfs/onap/sdc/environments
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/environments
- name: sdc-localtime
hostPath:
path: /etc/localtime
- name: sdc-logs
hostPath:
- path: /dockerdata-nfs/onap/sdc/logs
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/logs
imagePullSecrets:
- - name: onap-docker-registry-key
+ - name: "{{ .Values.nsPrefix }}-docker-registry-key"
diff --git a/kubernetes/sdc/templates/sdc-fe.yaml b/kubernetes/sdc/templates/sdc-fe.yaml
index a566b15a02..53759dc685 100644
--- a/kubernetes/sdc/templates/sdc-fe.yaml
+++ b/kubernetes/sdc/templates/sdc-fe.yaml
@@ -4,7 +4,7 @@ metadata:
labels:
app: sdc-fe
name: sdc-fe
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-sdc"
spec:
selector:
matchLabels:
@@ -82,21 +82,21 @@ spec:
volumes:
- name: sdc-sdc-es-es
hostPath:
- path: /dockerdata-nfs/onap/sdc/sdc-es/ES
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/sdc-es/ES
- name: sdc-environments
hostPath:
- path: /dockerdata-nfs/onap/sdc/environments
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/environments
- name: sdc-jetty-keystore
hostPath:
- path: /dockerdata-nfs/onap/sdc/jetty/keystore
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/jetty/keystore
- name: sdc-localtime
hostPath:
path: /etc/localtime
- name: sdc-logs
hostPath:
- path: /dockerdata-nfs/onap/sdc/logs
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/logs
- name: sdc-fe-config
hostPath:
- path: /dockerdata-nfs/onap/sdc/sdc-fe/FE_2_setup_configuration.rb
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/sdc-fe/FE_2_setup_configuration.rb
imagePullSecrets:
- - name: onap-docker-registry-key
+ - name: "{{ .Values.nsPrefix }}-docker-registry-key"
diff --git a/kubernetes/sdc/templates/sdc-kb.yaml b/kubernetes/sdc/templates/sdc-kb.yaml
index 0dca7e45a2..67110f1e8f 100644
--- a/kubernetes/sdc/templates/sdc-kb.yaml
+++ b/kubernetes/sdc/templates/sdc-kb.yaml
@@ -4,7 +4,7 @@ metadata:
labels:
app: sdc-kb
name: sdc-kb
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-sdc"
spec:
selector:
matchLabels:
@@ -69,12 +69,12 @@ spec:
volumes:
- name: sdc-environments
hostPath:
- path: /dockerdata-nfs/onap/sdc/environments
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/environments
- name: sdc-localtime
hostPath:
path: /etc/localtime
- name: sdc-logs
hostPath:
- path: /dockerdata-nfs/onap/sdc/logs
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/logs
imagePullSecrets:
- - name: onap-docker-registry-key
+ - name: "{{ .Values.nsPrefix }}-docker-registry-key"