diff options
| author |   Guangrong Fu <fu.guangrong@zte.com.cn> | 2023-03-15 11:09:49 +0800 |
|---|---|---|
| committer | Guangrong Fu <fu.guangrong@zte.com.cn> | 2023-03-27 08:46:51 +0800 |
| commit | 2d51104671ae198c8e711b64463a37a0e7f9bba3 (patch) | |
| tree | 22936b1128da2e2eb3d4fd0df137a7026bd67c1a /kubernetes/holmes/components/holmes-rule-mgmt | |
| parent | 8a626708ed05ca337586695b2056441fc6405fec (diff) | |
[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
Diffstat (limited to 'kubernetes/holmes/components/holmes-rule-mgmt')
| -rw-r--r-- | kubernetes/holmes/components/holmes-rule-mgmt/templates/deployment.yaml | 2 | ||||
| -rw-r--r-- | kubernetes/holmes/components/holmes-rule-mgmt/values.yaml | 32 |
2 files changed, 27 insertions, 7 deletions
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: |