[CPS] Fix issues in the ncmp-dmi-plugin charts

- added serviceMonitor and removed annotation for prometheus scraping
- changed readiness dependency from core-db to core app
- removed unused environment variables
- make cps-core and sdnc url configurable
- Added rolling restart in ncmp-dmi-plugin

Issue-ID: CPS-669
Signed-off-by: Renu Kumari <renu.kumari@bell.ca>
Change-Id: Ia4c3ccdac32a97d75b98ce4cbadaf74c5493f06c

1 files changed, 38 insertions, 15 deletions

diff --git a/kubernetes/cps/components/ncmp-dmi-plugin/values.yaml b/kubernetes/cps/components/ncmp-dmi-plugin/values.yaml
index d616195fbc..3f40a79b84 100644
--- a/kubernetes/cps/components/ncmp-dmi-plugin/values.yaml
+++ b/kubernetes/cps/components/ncmp-dmi-plugin/values.yaml
@@ -20,7 +20,7 @@
 # Secrets.
 #################################################################
 secrets:
-  - uid: user-creds
+  - uid: app-user-creds
     type: basicAuth
     externalSecret: '{{ tpl (default "" .Values.config.appUserExternalSecret) . }}'
     login: '{{ .Values.config.appUserName }}'
@@ -29,14 +29,14 @@ secrets:
   - uid: sdnc-creds
     type: basicAuth
     externalSecret: '{{ tpl (default "" .Values.config.odlCredsExternalSecret) . }}'
-    login: '{{ .Values.config.sdncUser }}'
-    password: '{{ .Values.config.sdncPassword }}'
+    login: '{{ .Values.config.sdnc.username }}'
+    password: '{{ .Values.config.sdnc.password }}'
     passwordPolicy: required
-  - uid: core-creds
+  - uid: cps-core-creds
     type: basicAuth
-    externalSecret: '{{ tpl (default "" .Values.config.coreCredsExternalSecret) . }}'
-    login: '{{ .Values.config.coreUser }}'
-    password: '{{ .Values.config.corePassword }}'
+    externalSecret: '{{ tpl (default "" .Values.config.cpsCore.credsExternalSecret) . }}'
+    login: '{{ .Values.config.cpsCore.username }}'
+    password: '{{ .Values.config.cpsCore.password }}'
     passwordPolicy: generate
 
 #################################################################
@@ -53,11 +53,10 @@ managementPort: &mgt_port 8081
 
 prometheus:
   enabled: true
-  interval: 60s
 
 service:
   type: ClusterIP
-  name: ncmp-dmi-plugin
+  name: &svc_name ncmp-dmi-plugin
   ports:
     - name: &port http
       port: *svc_port
@@ -65,6 +64,18 @@ service:
       port: *mgt_port
       targetPort: *mgt_port
 
+metrics:
+  serviceMonitor:
+    enabled: true
+    port: management
+      ## specify target port if name is not given to the port in the service definition
+      ##
+    # targetPort: 8080
+    path: /manage/prometheus
+    interval: 60s
+    basicAuth:
+      enabled: false
+
 pullPolicy: IfNotPresent
 # flag to enable debugging - application support required
 debugEnabled: false
@@ -112,7 +123,7 @@ ingress:
   service:
     - baseaddr: "ncmp-dmi-plugin"
       path: "/"
-      name: "ncmp-dmi-plugin"
+      name: *svc_name
       port: *svc_port
 
 serviceAccount:
@@ -132,14 +143,20 @@ config:
 
   # REST API basic authentication credentials (passsword is generated if not provided)
   appUserName: ncmpuser
+  #appUserPassword:
   spring:
     profile: helm
-  #appUserPassword:
 
-  sdncUser: admin
-  sdncPassword: Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
-
-  coreUser: cpsuser
+  dmiServiceName: http://*svc_name:*svc_port
+  sdnc:
+    url: http://sdnc:8181
+    username: admin
+    password: Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
+    topologyId: topology-netconf
+  cpsCore:
+    url: http://cps-core:8080
+    username: cpsuser
+    #password:
 
 # Any new property can be added in the env by setting in overrides in the format mentioned below
 # All the added properties must be in "key: value" format insead of yaml.
@@ -155,3 +172,9 @@ logging:
 readinessCheck:
   wait_for:
     - cps-core
+
+minReadySeconds: 10
+updateStrategy:
+  type: RollingUpdate
+  maxUnavailable: 0
+  maxSurge: 1