summaryrefslogtreecommitdiffstats
path: root/kubernetes/cps/components
diff options
context:
space:
mode:
Diffstat (limited to 'kubernetes/cps/components')
-rw-r--r--kubernetes/cps/components/cps-core/values.yaml7
-rw-r--r--kubernetes/cps/components/cps-temporal/values.yaml7
-rw-r--r--kubernetes/cps/components/ncmp-dmi-plugin/resources/config/application-helm.yml2
-rw-r--r--kubernetes/cps/components/ncmp-dmi-plugin/values.yaml11
4 files changed, 12 insertions, 15 deletions
diff --git a/kubernetes/cps/components/cps-core/values.yaml b/kubernetes/cps/components/cps-core/values.yaml
index d41c44ddbc..a482152582 100644
--- a/kubernetes/cps/components/cps-core/values.yaml
+++ b/kubernetes/cps/components/cps-core/values.yaml
@@ -73,17 +73,16 @@ service:
ports:
- name: &port http
port: *svc_port
- - name: management
+ - name: http-management
port: *mgt_port
targetPort: *mgt_port
prometheus:
- enabled: true
+ enabled: false
metrics:
serviceMonitor:
- enabled: true
- port: management
+ port: http-management
## specify target port if name is not given to the port in the service definition
##
# targetPort: 8080
diff --git a/kubernetes/cps/components/cps-temporal/values.yaml b/kubernetes/cps/components/cps-temporal/values.yaml
index da055d0242..8b3f16b64c 100644
--- a/kubernetes/cps/components/cps-temporal/values.yaml
+++ b/kubernetes/cps/components/cps-temporal/values.yaml
@@ -45,7 +45,7 @@ containerPort: &svc_port 8080
managementPort: &mgt_port 8081
prometheus:
- enabled: true
+ enabled: false
service:
type: ClusterIP
@@ -54,14 +54,13 @@ service:
- name: http
port: *svc_port
targetPort: *svc_port
- - name: management
+ - name: http-management
port: *mgt_port
targetPort: *mgt_port
metrics:
serviceMonitor:
- enabled: true
- port: management
+ port: http-management
## specify target port if name is not given to the port in the service definition
##
# targetPort: 8080
diff --git a/kubernetes/cps/components/ncmp-dmi-plugin/resources/config/application-helm.yml b/kubernetes/cps/components/ncmp-dmi-plugin/resources/config/application-helm.yml
index 2e5018807c..8e71114c8c 100644
--- a/kubernetes/cps/components/ncmp-dmi-plugin/resources/config/application-helm.yml
+++ b/kubernetes/cps/components/ncmp-dmi-plugin/resources/config/application-helm.yml
@@ -20,7 +20,7 @@
dmi:
service:
- name: {{ .Values.config.dmiServiceName }}
+ url: {{ .Values.config.dmiServiceUrl }}
cps-core:
baseUrl: {{ .Values.config.cpsCore.url }}
diff --git a/kubernetes/cps/components/ncmp-dmi-plugin/values.yaml b/kubernetes/cps/components/ncmp-dmi-plugin/values.yaml
index 3f40a79b84..753b8baaff 100644
--- a/kubernetes/cps/components/ncmp-dmi-plugin/values.yaml
+++ b/kubernetes/cps/components/ncmp-dmi-plugin/values.yaml
@@ -47,12 +47,12 @@ global:
virtualhost:
baseurl: "simpledemo.onap.org"
-image: onap/ncmp-dmi-plugin:1.0.0
+image: onap/ncmp-dmi-plugin:1.0.1
containerPort: &svc_port 8080
managementPort: &mgt_port 8081
prometheus:
- enabled: true
+ enabled: false
service:
type: ClusterIP
@@ -60,14 +60,13 @@ service:
ports:
- name: &port http
port: *svc_port
- - name: management
+ - name: http-management
port: *mgt_port
targetPort: *mgt_port
metrics:
serviceMonitor:
- enabled: true
- port: management
+ port: http-management
## specify target port if name is not given to the port in the service definition
##
# targetPort: 8080
@@ -147,7 +146,7 @@ config:
spring:
profile: helm
- dmiServiceName: http://*svc_name:*svc_port
+ dmiServiceUrl: http://*svc_name:*svc_port
sdnc:
url: http://sdnc:8181
username: admin