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
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
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" {} \;
+# 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.
# 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.
dockerSharePath: /dockerdata-nfs
image:
repository: oomk8s/config-init
dockerSharePath: /dockerdata-nfs
image:
repository: oomk8s/config-init
-#{{ if not .Values.disableDcae }}
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
hostPath:
path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcaegen2/nginx/certs
imagePullSecrets:
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
-#{{ if not .Values.disableDcae }}
apiVersion: v1
kind: Service
metadata:
apiVersion: v1
kind: Service
metadata:
selector:
app: nginx
type: LoadBalancer
selector:
app: nginx
type: LoadBalancer
- externalTrafficPolicy: Local
-#{{ end }}
\ No newline at end of file
+ externalTrafficPolicy: Local
\ No newline at end of file