From 0e8f8899ca6fdc589316c59f90f8f7283bbfad49 Mon Sep 17 00:00:00 2001 From: Mandeep Khinda Date: Fri, 25 Aug 2017 03:31:17 +0000 Subject: 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 --- kubernetes/aai/templates/aai-deployment.yaml | 12 ++++++------ kubernetes/aai/templates/all-services.yaml | 6 +++--- kubernetes/aai/templates/hbase-deployment.yaml | 4 ++-- kubernetes/aai/templates/modelloader-deployment.yaml | 10 +++++----- kubernetes/aai/values.yaml | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) (limited to 'kubernetes/aai') diff --git a/kubernetes/aai/templates/aai-deployment.yaml b/kubernetes/aai/templates/aai-deployment.yaml index 286a9aca53..162fb99bf9 100644 --- a/kubernetes/aai/templates/aai-deployment.yaml +++ b/kubernetes/aai/templates/aai-deployment.yaml @@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: aai-service - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-aai" spec: selector: matchLabels: @@ -76,16 +76,16 @@ spec: volumes: - name: aai-service-certs hostPath: - path: /dockerdata-nfs/onap/aai/etc/ssl/certs/ + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/aai/etc/ssl/certs/ - name: aai-service-logroot hostPath: - path: /dockerdata-nfs/onap/aai/opt/aai/logroot/ + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/aai/opt/aai/logroot/ - name: aai-config hostPath: - path: /dockerdata-nfs/onap/aai/aai-config/ + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/aai/aai-config/ - name: aai-data hostPath: - path: /dockerdata-nfs/onap/aai/aai-data/ + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/aai/aai-data/ restartPolicy: Always imagePullSecrets: - - name: onap-docker-registry-key + - name: "{{ .Values.nsPrefix }}-docker-registry-key" diff --git a/kubernetes/aai/templates/all-services.yaml b/kubernetes/aai/templates/all-services.yaml index 4a016f47b5..2c0fbc4a5b 100644 --- a/kubernetes/aai/templates/all-services.yaml +++ b/kubernetes/aai/templates/all-services.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: name: hbase - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-aai" labels: app: hbase spec: @@ -17,7 +17,7 @@ apiVersion: v1 kind: Service metadata: name: aai-service - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-aai" labels: app: aai-service spec: @@ -38,7 +38,7 @@ apiVersion: v1 kind: Service metadata: name: model-loader-service - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-aai" labels: app: model-loader-service spec: diff --git a/kubernetes/aai/templates/hbase-deployment.yaml b/kubernetes/aai/templates/hbase-deployment.yaml index 598fc0f02c..79983eba08 100644 --- a/kubernetes/aai/templates/hbase-deployment.yaml +++ b/kubernetes/aai/templates/hbase-deployment.yaml @@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: hbase - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-aai" spec: selector: matchLabels: @@ -26,4 +26,4 @@ spec: initialDelaySeconds: 5 periodSeconds: 10 imagePullSecrets: - - name: onap-docker-registry-key + - name: "{{ .Values.nsPrefix }}-docker-registry-key" diff --git a/kubernetes/aai/templates/modelloader-deployment.yaml b/kubernetes/aai/templates/modelloader-deployment.yaml index 96c9ee1990..f7d855bbf9 100644 --- a/kubernetes/aai/templates/modelloader-deployment.yaml +++ b/kubernetes/aai/templates/modelloader-deployment.yaml @@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: model-loader-service - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-aai" spec: selector: matchLabels: @@ -56,7 +56,7 @@ spec: "env": [ { "name": "NAMESPACE", - "value": "onap-sdc" + "value": "{{ .Values.nsPrefix }}-sdc" } ], "image": "{{ .Values.image.readiness }}", @@ -68,7 +68,7 @@ spec: containers: - env: - name: DISTR_CLIENT_ASDC_ADDRESS - value: sdc-be.onap-sdc:8443 + value: sdc-be.{{ .Values.nsPrefix }}-sdc:8443 - name: DISTR_CLIENT_ENVIRONMENT_NAME value: AUTO - name: DISTR_CLIENT_USER @@ -76,7 +76,7 @@ spec: - name: DISTR_CLIENT_PASSWORD value: OBF:1ks51l8d1o3i1pcc1r2r1e211r391kls1pyj1z7u1njf1lx51go21hnj1y0k1mli1sop1k8o1j651vu91mxw1vun1mze1vv11j8x1k5i1sp11mjc1y161hlr1gm41m111nkj1z781pw31kku1r4p1e391r571pbm1o741l4x1ksp - name: APP_SERVER_BASE_URL - value: https://aai-service.onap-aai:8443 + value: https://aai-service.{{ .Values.nsPrefix }}-aai:8443 - name: APP_SERVER_KEYSTORE_PASSWORD value: OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o - name: APP_SERVER_AUTH_USER @@ -96,4 +96,4 @@ spec: periodSeconds: 10 restartPolicy: Always imagePullSecrets: - - name: onap-docker-registry-key + - name: "{{ .Values.nsPrefix }}-docker-registry-key" diff --git a/kubernetes/aai/values.yaml b/kubernetes/aai/values.yaml index 12b8b3b244..3c6894c638 100644 --- a/kubernetes/aai/values.yaml +++ b/kubernetes/aai/values.yaml @@ -1,4 +1,4 @@ -NS: onap-aai +nsPrefix: onap pullPolicy: Always image: readiness: oomk8s/readiness-check:1.0.0 -- cgit 1.2.3-korg