From a71a8bc53a03609fa79e5853e1ac38c09cd11778 Mon Sep 17 00:00:00 2001
From: Alexis de Talhouët <adetalhouet89@gmail.com>
Date: Wed, 24 Jan 2018 10:03:01 -0500
Subject: Deploy loadbalancer service opening UEB port
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

With the support of DCAE added lately, some change was done
to accomadate the resolution of some ONAP service for DCAE.
Among other things, UEB configuration in SDC is now using
external resolution, no longer the internal K8S one. Hence
for deployement not deploying DCAEGEN2, we still have to deploy
the loadblancer service.

Change-Id: I93d0c01920755beed3eeb05d158530c05c255383
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
Issue-ID: OOM-608
---
 kubernetes/config/docker/init/config-init.sh     | 8 ++++----
 kubernetes/config/values.yaml                    | 2 +-
 kubernetes/dcaegen2/templates/nginx-dep.yaml     | 4 +---
 kubernetes/dcaegen2/templates/nginx-service.yaml | 4 +---
 4 files changed, 7 insertions(+), 11 deletions(-)

(limited to 'kubernetes')

diff --git a/kubernetes/config/docker/init/config-init.sh b/kubernetes/config/docker/init/config-init.sh
index 3ce194272c..8eebab1755 100755
--- a/kubernetes/config/docker/init/config-init.sh
+++ b/kubernetes/config/docker/init/config-init.sh
@@ -255,12 +255,12 @@ then
     else
         find /config-init/$NAMESPACE/dcaegen2/heat/ -type f -exec sed -i -e "s,DCAE_FINAL_KEYSTONE_URL_HERE,$DCAE_OS_KEYSTONE_URL/$DCAE_OS_API_VERSION,g" {} \;
     fi
-
-    # Install kube-dns ip in the nginx conf
-    KUBE_DNS_IP=`kubectl get service -n kube-system kube-dns -o jsonpath='{.spec.clusterIP}'`
-    find /config-init/$NAMESPACE/dcaegen2/nginx/ -type f -exec sed -i -e "s/KUBE_DNS_IP_HERE/$KUBE_DNS_IP/g" {} \;
 fi
 
+# Install kube-dns ip in the nginx conf
+KUBE_DNS_IP=`kubectl get service -n kube-system kube-dns -o jsonpath='{.spec.clusterIP}'`
+find /config-init/$NAMESPACE/dcaegen2/nginx/ -type f -exec sed -i -e "s/KUBE_DNS_IP_HERE/$KUBE_DNS_IP/g" {} \;
+
 # Inject node ip for UEB config
 # There is actually two places where we need to inject this list, and one required to list to be comma seperated and quote separated,
 # and one requires to be only quote seperated.
diff --git a/kubernetes/config/values.yaml b/kubernetes/config/values.yaml
index 6d0352f5a9..7c76260eed 100644
--- a/kubernetes/config/values.yaml
+++ b/kubernetes/config/values.yaml
@@ -3,5 +3,5 @@ nsPrefix: onap
 dockerSharePath: /dockerdata-nfs
 image:
   repository: oomk8s/config-init
-  tag: 1.1.6
+  tag: 1.1.7
   pullPolicy: Always
diff --git a/kubernetes/dcaegen2/templates/nginx-dep.yaml b/kubernetes/dcaegen2/templates/nginx-dep.yaml
index 7d8832cbc3..1809285578 100644
--- a/kubernetes/dcaegen2/templates/nginx-dep.yaml
+++ b/kubernetes/dcaegen2/templates/nginx-dep.yaml
@@ -1,4 +1,3 @@
-#{{ if not .Values.disableDcae }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -49,5 +48,4 @@ spec:
           hostPath:
             path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcaegen2/nginx/certs
       imagePullSecrets:
-      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }}
+      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
\ No newline at end of file
diff --git a/kubernetes/dcaegen2/templates/nginx-service.yaml b/kubernetes/dcaegen2/templates/nginx-service.yaml
index 21dbb04b14..ce1600159c 100644
--- a/kubernetes/dcaegen2/templates/nginx-service.yaml
+++ b/kubernetes/dcaegen2/templates/nginx-service.yaml
@@ -1,4 +1,3 @@
-#{{ if not .Values.disableDcae }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -35,5 +34,4 @@ spec:
   selector:
     app: nginx
   type: LoadBalancer
-  externalTrafficPolicy: Local
-#{{ end }}
\ No newline at end of file
+  externalTrafficPolicy: Local
\ No newline at end of file
-- 
cgit 1.2.3-korg