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>
diff --git a/kubernetes/policy/templates/all-services.yaml b/kubernetes/policy/templates/all-services.yaml
index e15b129..8236033 100644
--- a/kubernetes/policy/templates/all-services.yaml
+++ b/kubernetes/policy/templates/all-services.yaml
@@ -2,7 +2,7 @@
kind: Service
metadata:
name: mariadb
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-policy"
labels:
app: mariadb
spec:
@@ -19,7 +19,7 @@
labels:
app: nexus
name: nexus
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-policy"
spec:
ports:
- name: nexus-port
@@ -34,7 +34,7 @@
labels:
app: drools
name: drools
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-policy"
spec:
ports:
- name: "drools-port"
@@ -48,7 +48,7 @@
kind: Service
metadata:
name: pap
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-policy"
labels:
app: pap
spec:
@@ -67,7 +67,7 @@
kind: Service
metadata:
name: pdp
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-policy"
labels:
app: pdp
spec:
@@ -83,7 +83,7 @@
kind: Service
metadata:
name: pypdp
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-policy"
labels:
app: pypdp
spec:
@@ -99,7 +99,7 @@
kind: Service
metadata:
name: brmsgw
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-policy"
labels:
app: brmsgw
spec:
diff --git a/kubernetes/policy/templates/dep-brmsgw.yaml b/kubernetes/policy/templates/dep-brmsgw.yaml
index 3f59d21..e535cf2 100644
--- a/kubernetes/policy/templates/dep-brmsgw.yaml
+++ b/kubernetes/policy/templates/dep-brmsgw.yaml
@@ -2,7 +2,7 @@
kind: Deployment
metadata:
name: brmsgw
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-policy"
spec:
replicas: 1
selector:
@@ -62,6 +62,6 @@
volumes:
- name: pe
hostPath:
- path: /dockerdata-nfs/onap/policy/opt/policy/config/pe/
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/policy/opt/policy/config/pe/
imagePullSecrets:
- - name: onap-docker-registry-key
+ - name: "{{ .Values.nsPrefix }}-docker-registry-key"
diff --git a/kubernetes/policy/templates/dep-drools.yaml b/kubernetes/policy/templates/dep-drools.yaml
index 101066f..96eb5f0 100644
--- a/kubernetes/policy/templates/dep-drools.yaml
+++ b/kubernetes/policy/templates/dep-drools.yaml
@@ -2,7 +2,7 @@
kind: Deployment
metadata:
name: drools
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-policy"
spec:
replicas: 1
selector:
@@ -73,9 +73,9 @@
volumes:
- name: drools-settingsxml
hostPath:
- path: /dockerdata-nfs/onap/policy/drools/settings.xml
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/policy/drools/settings.xml
- name: drools
hostPath:
- path: /dockerdata-nfs/onap/policy/opt/policy/config/drools/
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/policy/opt/policy/config/drools/
imagePullSecrets:
- - name: onap-docker-registry-key
+ - name: "{{ .Values.nsPrefix }}-docker-registry-key"
diff --git a/kubernetes/policy/templates/dep-maria.yaml b/kubernetes/policy/templates/dep-maria.yaml
index 63306d4..abbfdd8 100644
--- a/kubernetes/policy/templates/dep-maria.yaml
+++ b/kubernetes/policy/templates/dep-maria.yaml
@@ -2,7 +2,7 @@
kind: Deployment
metadata:
name: mariadb
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-policy"
spec:
replicas: 1
selector:
@@ -30,4 +30,4 @@
initialDelaySeconds: 5
periodSeconds: 10
imagePullSecrets:
- - name: onap-docker-registry-key
+ - name: "{{ .Values.nsPrefix }}-docker-registry-key"
diff --git a/kubernetes/policy/templates/dep-nexus.yaml b/kubernetes/policy/templates/dep-nexus.yaml
index d45d77d..4507508 100644
--- a/kubernetes/policy/templates/dep-nexus.yaml
+++ b/kubernetes/policy/templates/dep-nexus.yaml
@@ -2,7 +2,7 @@
kind: Deployment
metadata:
name: nexus
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-policy"
spec:
selector:
matchLabels:
@@ -48,4 +48,4 @@
imagePullPolicy: {{ .Values.pullPolicy }}
name: nexus
imagePullSecrets:
- - name: onap-docker-registry-key
+ - name: "{{ .Values.nsPrefix }}-docker-registry-key"
diff --git a/kubernetes/policy/templates/dep-pap.yaml b/kubernetes/policy/templates/dep-pap.yaml
index e7fe902..8ee2370 100644
--- a/kubernetes/policy/templates/dep-pap.yaml
+++ b/kubernetes/policy/templates/dep-pap.yaml
@@ -2,7 +2,7 @@
kind: Deployment
metadata:
name: pap
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-policy"
spec:
selector:
matchLabels:
@@ -86,6 +86,6 @@
volumes:
- name: pe
hostPath:
- path: /dockerdata-nfs/onap/policy/opt/policy/config/pe/
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/policy/opt/policy/config/pe/
imagePullSecrets:
- - name: onap-docker-registry-key
+ - name: "{{ .Values.nsPrefix }}-docker-registry-key"
diff --git a/kubernetes/policy/templates/dep-pdp.yaml b/kubernetes/policy/templates/dep-pdp.yaml
index f7d9bf3..c5ea267 100644
--- a/kubernetes/policy/templates/dep-pdp.yaml
+++ b/kubernetes/policy/templates/dep-pdp.yaml
@@ -2,7 +2,7 @@
kind: Deployment
metadata:
name: pdp
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-policy"
spec:
replicas: 1
selector:
@@ -65,6 +65,6 @@
volumes:
- name: pe
hostPath:
- path: /dockerdata-nfs/onap/policy/opt/policy/config/pe/
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/policy/opt/policy/config/pe/
imagePullSecrets:
- - name: onap-docker-registry-key
+ - name: "{{ .Values.nsPrefix }}-docker-registry-key"
diff --git a/kubernetes/policy/templates/dep-pypdp.yaml b/kubernetes/policy/templates/dep-pypdp.yaml
index 8514388..4e2c9b6 100644
--- a/kubernetes/policy/templates/dep-pypdp.yaml
+++ b/kubernetes/policy/templates/dep-pypdp.yaml
@@ -2,7 +2,7 @@
kind: Deployment
metadata:
name: pypdp
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-policy"
spec:
replicas: 1
selector:
@@ -67,6 +67,6 @@
volumes:
- name: pe
hostPath:
- path: /dockerdata-nfs/onap/policy/opt/policy/config/pe/
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/policy/opt/policy/config/pe/
imagePullSecrets:
- - name: onap-docker-registry-key
+ - name: "{{ .Values.nsPrefix }}-docker-registry-key"