summaryrefslogtreecommitdiffstats
path: root/kubernetes/robot
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/robot
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/robot')
-rw-r--r--kubernetes/robot/templates/all-services.yaml2
-rw-r--r--kubernetes/robot/templates/robot-deployment.yaml14
-rw-r--r--kubernetes/robot/values.yaml2
3 files changed, 9 insertions, 9 deletions
diff --git a/kubernetes/robot/templates/all-services.yaml b/kubernetes/robot/templates/all-services.yaml
index 2b80a29c83..a14dae777c 100644
--- a/kubernetes/robot/templates/all-services.yaml
+++ b/kubernetes/robot/templates/all-services.yaml
@@ -4,7 +4,7 @@ metadata:
labels:
app: robot
name: robot
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-robot"
spec:
ports:
- port: 88
diff --git a/kubernetes/robot/templates/robot-deployment.yaml b/kubernetes/robot/templates/robot-deployment.yaml
index c4bc9544d8..a1b07dc410 100644
--- a/kubernetes/robot/templates/robot-deployment.yaml
+++ b/kubernetes/robot/templates/robot-deployment.yaml
@@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: robot
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-robot"
spec:
selector:
matchLabels:
@@ -38,18 +38,18 @@ spec:
volumes:
- name: robot-eteshare
hostPath:
- path: /dockerdata-nfs/onap/robot/eteshare
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/robot/eteshare
- name: robot-assets
hostPath:
- path: /dockerdata-nfs/onap/robot/robot/assets
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/robot/robot/assets
- name: robot-resources
hostPath:
- path: /dockerdata-nfs/onap/robot/robot/resources
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/robot/robot/resources
- name: robot-testsuites
hostPath:
- path: /dockerdata-nfs/onap/robot/robot/testsuites
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/robot/robot/testsuites
- name: lighttpd-authorization
hostPath:
- path: /dockerdata-nfs/onap/robot/authorization
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/robot/authorization
imagePullSecrets:
- - name: onap-docker-registry-key
+ - name: "{{ .Values.nsPrefix }}-docker-registry-key"
diff --git a/kubernetes/robot/values.yaml b/kubernetes/robot/values.yaml
index f906599dda..90566c4dd8 100644
--- a/kubernetes/robot/values.yaml
+++ b/kubernetes/robot/values.yaml
@@ -1,4 +1,4 @@
-NS: onap-robot
+nsPrefix: onap
pullPolicy: Always
image:
testsuite: nexus3.onap.org:10001/openecomp/testsuite:1.1-STAGING-latest