X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fholmes%2Fcomponents%2Fholmes-rule-mgmt%2Fvalues.yaml;h=bebd411ecb3b871a9502584665a46f6a0ab0605f;hb=c8ef023537910038ef05ce84337a35e429bfc931;hp=232009565281f42c73d95b3d597e4fdeb2c272b2;hpb=1ca95eead50a3b8994751b013d7b39dc1e5e3562;p=oom.git

diff --git a/kubernetes/holmes/components/holmes-rule-mgmt/values.yaml b/kubernetes/holmes/components/holmes-rule-mgmt/values.yaml
index 2320095652..bebd411ecb 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
 
 #################################################################
@@ -69,18 +69,36 @@ service:
     port: &svc_port 9101
     nodePort: 92
   - name: http-ui
-    port: 9104
+    port: &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"
+      port: *svc_port
+    - baseaddr: "holmes-rule-mgmt-ui"
+      name: "holmes-rule-mgmt"
+      path: "/iui/holmes"
+      port: *ui_port
+  config:
+    ssl: "redirect"
 
 # probe configuration parameters
 liveness:
@@ -102,24 +120,26 @@ readiness:
 resources:
   small:
     limits:
-      cpu: 250m
-      memory: 1024Mi
+      cpu: 1
+      memory: 1Gi
     requests:
-      cpu: 250m
-      memory: 256Mi
+      cpu: 0.5
+      memory: 1Gi
   large:
     limits:
-      cpu: 500m
+      cpu: 2
       memory: 2Gi
     requests:
-      cpu: 500m
-      memory: 512Mi
+      cpu: 1
+      memory: 1Gi
   unlimited: {}
 
 readinessCheck:
-  wait_for:
+  wait_for_global:
     jobs:
       - '{{ include "common.release" . }}-holmes-postgres-init-config-job'
+  wait_for_local:
+    - '{{ .Values.global.postgres.container.name }}'
 
 #Pods Service Account
 serviceAccount: