[HOLMES] Changed the way for MSB registration

Register Holmes MSB through an annotation in the Helm chart.
Enable/Disable TLS via an env variable.
Added Ingress Configurations

Issue-ID: HOLMES-612
Signed-off-by: Guangrong Fu <fu.guangrong@zte.com.cn>
Change-Id: If1bd8a62ea3840943ccd04cbcc16442f65fd434b

4 files changed, 59 insertions, 8 deletions

diff --git a/kubernetes/holmes/components/holmes-engine-mgmt/templates/deployment.yaml b/kubernetes/holmes/components/holmes-engine-mgmt/templates/deployment.yaml
index 9bf6f39f08..cdf5327eab 100644
--- a/kubernetes/holmes/components/holmes-engine-mgmt/templates/deployment.yaml
+++ b/kubernetes/holmes/components/holmes-engine-mgmt/templates/deployment.yaml
@@ -56,6 +56,16 @@ spec:
           value: {{ .Values.config.pgConfig.dbHost }}
         - name: DB_PORT
           value: "{{ .Values.config.pgConfig.dbPort }}"
+        - name: AAI_ADDR
+          value: aai
+        - name: AAI_PORT
+          value: "{{ .Values.config.aai.aaiPort }}"
+        - name: AAI_USERNAME
+          value: {{ .Values.config.aai.username }}
+        - name: AAI_PASSWORD
+          value: {{ .Values.config.aai.password }}
+        - name: NAMESPACE
+          value: {{ include "common.namespace" . }}
         volumeMounts:
         - mountPath: /hemconfig
           name: {{ include "common.fullname" . }}-config
diff --git a/kubernetes/holmes/components/holmes-engine-mgmt/values.yaml b/kubernetes/holmes/components/holmes-engine-mgmt/values.yaml
index d2ad0d4771..c9c62e78a3 100644
--- a/kubernetes/holmes/components/holmes-engine-mgmt/values.yaml
+++ b/kubernetes/holmes/components/holmes-engine-mgmt/values.yaml
@@ -30,7 +30,7 @@ global:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/holmes/engine-management:11.0.0
+image: onap/holmes/engine-management:12.0.1
 consulLoaderImage: onap/org.onap.dcaegen2.deployments.consul-loader-container:1.0.0
 
 #################################################################
@@ -59,6 +59,13 @@ config:
     dbUser: admin
     dbUserPassword: admin
     # dbUserCredsExternalSecret
+  msb:
+    serviceName: msb-iag
+    port: 80
+  aai:
+    aaiPort: 80
+    username: AAI
+    password: AAI
 
 service:
   type: ClusterIP
@@ -66,6 +73,20 @@ service:
   ports:
   - name: http-rest
     port: &svc_port 9102
+  annotations:
+    msb.onap.org/service-info: |
+      {{ if .Values.global.msbEnabled -}}[
+        {
+          "serviceName": "holmes-engine-mgmt",
+          "version": "v1",
+          "url": "/api/holmes-engine-mgmt/v1",
+          "path":"/api/holmes-engine-mgmt/v1",
+          "protocol": "REST",
+          "visualRange":"0|1",
+          "port": "9102",
+          "enable_ssl": false
+        }
+      ]{{ end }}
 
 # probe configuration parameters
 liveness:
diff --git a/kubernetes/holmes/components/holmes-rule-mgmt/templates/deployment.yaml b/kubernetes/holmes/components/holmes-rule-mgmt/templates/deployment.yaml
index 8b0cd8406a..05def922c4 100644
--- a/kubernetes/holmes/components/holmes-rule-mgmt/templates/deployment.yaml
+++ b/kubernetes/holmes/components/holmes-rule-mgmt/templates/deployment.yaml
@@ -55,6 +55,8 @@ spec:
           value: {{ .Values.config.pgConfig.dbHost }}
         - name: DB_PORT
           value: "{{ .Values.config.pgConfig.dbPort }}"
+        - name: NAMESPACE
+          value: {{ include "common.namespace" . }}
         volumeMounts:
         - mountPath: /hrmconfig
           name: {{ include "common.fullname" . }}-general-config
diff --git a/kubernetes/holmes/components/holmes-rule-mgmt/values.yaml b/kubernetes/holmes/components/holmes-rule-mgmt/values.yaml
index 2320095652..bc6639f7dd 100644
--- a/kubernetes/holmes/components/holmes-rule-mgmt/values.yaml
+++ b/kubernetes/holmes/components/holmes-rule-mgmt/values.yaml
@@ -31,7 +31,7 @@ global:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/holmes/rule-management:11.0.0
+image: onap/holmes/rule-management:12.0.0
 consulLoaderImage: onap/org.onap.dcaegen2.deployments.consul-loader-container:1.0.0
 
 #################################################################
@@ -71,16 +71,34 @@ service:
   - name: http-ui
     port: 9104
     nodePort: 93
+  annotations:
+    msb.onap.org/service-info: |
+      {{ if .Values.global.msbEnabled -}}[
+        {
+          "serviceName": "holmes-rule-mgmt",
+          "version": "v1",
+          "url": "/api/holmes-rule-mgmt/v1",
+          "path":"/api/holmes-rule-mgmt/v1",
+          "protocol": "REST",
+          "visualRange":"0|1",
+          "port": "9101",
+          "enable_ssl": false
+        }
+      ]{{ end }}
 
 ingress:
   enabled: false
   service:
-    - baseaddr: 'holmes-api'
-      name: 'holmes-rule-mgmt'
-      port: 9101
-    - baseaddr: 'holmes-ui'
-      name: 'holmes-rule-mgmt'
-      port: 9104
+    - baseaddr: "holmes-rule-mgmt"
+      name: "holmes-rule-mgmt"
+      path: "/api/holmes-rule-mgmt/v1"
+      plain_port: 9101
+    - baseaddr: "holmes-rule-mgmt-ui"
+      name: "holmes-rule-mgmt-ui"
+      path: "/iui/holmes"
+      plain_port: 9104
+  config:
+    ssl: "redirect"
 
 # probe configuration parameters
 liveness: