summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2022-03-22 08:35:10 +0000
committerGerrit Code Review <gerrit@onap.org>2022-03-22 08:35:10 +0000
commitf91c26bb28e7ee59ccc941647190c18257f23a01 (patch)
tree1e672cad3d870348c788a61290eab6559b8968a2
parent2d9b7845a42feea8474d6d26950d953a7e15f8df (diff)
parentb4d92128b6966bbf6f87d36efb09f0580615672f (diff)
Merge "[HOLMES] Fixed the healthcheck failure"
-rw-r--r--kubernetes/holmes/components/holmes-engine-mgmt/templates/deployment.yaml8
-rw-r--r--kubernetes/holmes/components/holmes-engine-mgmt/values.yaml5
-rw-r--r--kubernetes/holmes/components/holmes-rule-mgmt/templates/deployment.yaml8
-rw-r--r--kubernetes/holmes/components/holmes-rule-mgmt/values.yaml5
4 files changed, 20 insertions, 6 deletions
diff --git a/kubernetes/holmes/components/holmes-engine-mgmt/templates/deployment.yaml b/kubernetes/holmes/components/holmes-engine-mgmt/templates/deployment.yaml
index aef0c8c22a..dd7bb4552e 100644
--- a/kubernetes/holmes/components/holmes-engine-mgmt/templates/deployment.yaml
+++ b/kubernetes/holmes/components/holmes-engine-mgmt/templates/deployment.yaml
@@ -95,8 +95,12 @@ spec:
value: consul-server.{{ include "common.namespace" . }}
- name: CONFIG_BINDING_SERVICE
value: config-binding-service
- - name: msb_hostname
- value: "msb-iag.onap"
+ - name: MSB_IAG_SERVICE_PROTOCOL
+ value: {{ .Values.global.msbProtocol }}
+ - name: MSB_IAG_SERVICE_HOST
+ value: {{ .Values.global.msbServiceName }}.{{ include "common.namespace" . }}
+ - name: MSB_IAG_SERVICE_PORT
+ value: {{ .Values.global.msbPort | quote }}
- name: POD_IP
valueFrom:
fieldRef:
diff --git a/kubernetes/holmes/components/holmes-engine-mgmt/values.yaml b/kubernetes/holmes/components/holmes-engine-mgmt/values.yaml
index d9dfa2d96e..c8ec225545 100644
--- a/kubernetes/holmes/components/holmes-engine-mgmt/values.yaml
+++ b/kubernetes/holmes/components/holmes-engine-mgmt/values.yaml
@@ -20,12 +20,15 @@
#################################################################
global:
nodePortPrefixExt: 302
+ msbProtocol: https
+ msbServiceName: msb-iag
+ msbPort: 443
#################################################################
# Application configuration defaults.
#################################################################
# application image
-image: onap/holmes/engine-management:10.0.0
+image: onap/holmes/engine-management:10.0.2
consulLoaderImage: onap/org.onap.dcaegen2.deployments.consul-loader-container:1.0.0
#################################################################
diff --git a/kubernetes/holmes/components/holmes-rule-mgmt/templates/deployment.yaml b/kubernetes/holmes/components/holmes-rule-mgmt/templates/deployment.yaml
index f3e9ce5dde..21a96568cb 100644
--- a/kubernetes/holmes/components/holmes-rule-mgmt/templates/deployment.yaml
+++ b/kubernetes/holmes/components/holmes-rule-mgmt/templates/deployment.yaml
@@ -93,8 +93,12 @@ spec:
value: consul-server.{{ include "common.namespace" . }}
- name: CONFIG_BINDING_SERVICE
value: config-binding-service
- - name: msb_hostname
- value: "msb-iag.onap"
+ - name: MSB_IAG_SERVICE_PROTOCOL
+ value: {{ .Values.global.msbProtocol }}
+ - name: MSB_IAG_SERVICE_HOST
+ value: {{ .Values.global.msbServiceName }}.{{ include "common.namespace" . }}
+ - name: MSB_IAG_SERVICE_PORT
+ value: {{ .Values.global.msbPort | quote}}
- name: POD_IP
valueFrom:
fieldRef:
diff --git a/kubernetes/holmes/components/holmes-rule-mgmt/values.yaml b/kubernetes/holmes/components/holmes-rule-mgmt/values.yaml
index d26e88d193..94076194e0 100644
--- a/kubernetes/holmes/components/holmes-rule-mgmt/values.yaml
+++ b/kubernetes/holmes/components/holmes-rule-mgmt/values.yaml
@@ -20,12 +20,15 @@
#################################################################
global:
nodePortPrefixExt: 302
+ msbProtocol: https
+ msbServiceName: msb-iag
+ msbPort: 443
#################################################################
# Application configuration defaults.
#################################################################
# application image
-image: onap/holmes/rule-management:10.0.0
+image: onap/holmes/rule-management:10.0.2
consulLoaderImage: onap/org.onap.dcaegen2.deployments.consul-loader-container:1.0.0
#################################################################