aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/policy
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/policy
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/policy')
-rw-r--r--kubernetes/policy/templates/all-services.yaml14
-rw-r--r--kubernetes/policy/templates/dep-brmsgw.yaml6
-rw-r--r--kubernetes/policy/templates/dep-drools.yaml8
-rw-r--r--kubernetes/policy/templates/dep-maria.yaml4
-rw-r--r--kubernetes/policy/templates/dep-nexus.yaml4
-rw-r--r--kubernetes/policy/templates/dep-pap.yaml6
-rw-r--r--kubernetes/policy/templates/dep-pdp.yaml6
-rw-r--r--kubernetes/policy/templates/dep-pypdp.yaml6
-rw-r--r--kubernetes/policy/values.yaml10
9 files changed, 32 insertions, 32 deletions
diff --git a/kubernetes/policy/templates/all-services.yaml b/kubernetes/policy/templates/all-services.yaml
index e15b1298d7..82360334ac 100644
--- a/kubernetes/policy/templates/all-services.yaml
+++ b/kubernetes/policy/templates/all-services.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
kind: Service
metadata:
name: mariadb
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-policy"
labels:
app: mariadb
spec:
@@ -19,7 +19,7 @@ metadata:
labels:
app: nexus
name: nexus
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-policy"
spec:
ports:
- name: nexus-port
@@ -34,7 +34,7 @@ metadata:
labels:
app: drools
name: drools
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-policy"
spec:
ports:
- name: "drools-port"
@@ -48,7 +48,7 @@ apiVersion: v1
kind: Service
metadata:
name: pap
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-policy"
labels:
app: pap
spec:
@@ -67,7 +67,7 @@ apiVersion: v1
kind: Service
metadata:
name: pdp
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-policy"
labels:
app: pdp
spec:
@@ -83,7 +83,7 @@ apiVersion: v1
kind: Service
metadata:
name: pypdp
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-policy"
labels:
app: pypdp
spec:
@@ -99,7 +99,7 @@ apiVersion: v1
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 3f59d218da..e535cf2306 100644
--- a/kubernetes/policy/templates/dep-brmsgw.yaml
+++ b/kubernetes/policy/templates/dep-brmsgw.yaml
@@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: brmsgw
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-policy"
spec:
replicas: 1
selector:
@@ -62,6 +62,6 @@ spec:
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 101066fb40..96eb5f08e7 100644
--- a/kubernetes/policy/templates/dep-drools.yaml
+++ b/kubernetes/policy/templates/dep-drools.yaml
@@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: drools
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-policy"
spec:
replicas: 1
selector:
@@ -73,9 +73,9 @@ spec:
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 63306d4f40..abbfdd8f4b 100644
--- a/kubernetes/policy/templates/dep-maria.yaml
+++ b/kubernetes/policy/templates/dep-maria.yaml
@@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: mariadb
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-policy"
spec:
replicas: 1
selector:
@@ -30,4 +30,4 @@ spec:
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 d45d77dcfb..4507508935 100644
--- a/kubernetes/policy/templates/dep-nexus.yaml
+++ b/kubernetes/policy/templates/dep-nexus.yaml
@@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: nexus
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-policy"
spec:
selector:
matchLabels:
@@ -48,4 +48,4 @@ spec:
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 e7fe90297f..8ee2370c4a 100644
--- a/kubernetes/policy/templates/dep-pap.yaml
+++ b/kubernetes/policy/templates/dep-pap.yaml
@@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: pap
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-policy"
spec:
selector:
matchLabels:
@@ -86,6 +86,6 @@ spec:
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 f7d9bf345a..c5ea267ba5 100644
--- a/kubernetes/policy/templates/dep-pdp.yaml
+++ b/kubernetes/policy/templates/dep-pdp.yaml
@@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: pdp
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-policy"
spec:
replicas: 1
selector:
@@ -65,6 +65,6 @@ spec:
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 851438878c..4e2c9b62a1 100644
--- a/kubernetes/policy/templates/dep-pypdp.yaml
+++ b/kubernetes/policy/templates/dep-pypdp.yaml
@@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: pypdp
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-policy"
spec:
replicas: 1
selector:
@@ -67,6 +67,6 @@ spec:
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/values.yaml b/kubernetes/policy/values.yaml
index 19ff66c34a..0f990c94ff 100644
--- a/kubernetes/policy/values.yaml
+++ b/kubernetes/policy/values.yaml
@@ -1,9 +1,9 @@
-NS: onap-policy
+nsPrefix: onap
pullPolicy: Always
image:
readiness: oomk8s/readiness-check:1.0.0
- policyPe: nexus3.onap.org:10001/openecomp/policy/policy-pe:1.1-STAGING-latest
- policyDrools: nexus3.onap.org:10001/openecomp/policy/policy-drools:1.1-STAGING-latest
- policyDb: nexus3.onap.org:10001/openecomp/policy/policy-db:1.1-STAGING-latest
- policyNexus: nexus3.onap.org:10001/openecomp/policy/policy-nexus:1.1-STAGING-latest
+ policyPe: nexus3.onap.org:10001/openecomp/policy/policy-pe:1.0-STAGING-latest
+ policyDrools: nexus3.onap.org:10001/openecomp/policy/policy-drools:1.0-STAGING-latest
+ policyDb: nexus3.onap.org:10001/openecomp/policy/policy-db:1.0-STAGING-latest
+ policyNexus: nexus3.onap.org:10001/openecomp/policy/policy-nexus:1.0-STAGING-latest
ubuntu: ubuntu:16.04