summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kubernetes/clamp/charts/clamp-dash-kibana/templates/deployment.yaml2
-rw-r--r--kubernetes/clamp/charts/clamp-dash-kibana/values.yaml2
-rw-r--r--kubernetes/clamp/charts/clamp-dash-logstash/templates/deployment.yaml2
-rw-r--r--kubernetes/clamp/charts/clamp-dash-logstash/values.yaml2
-rw-r--r--kubernetes/policy/charts/policy-distribution/templates/deployment.yaml2
-rw-r--r--kubernetes/so/charts/so-monitoring/resources/config/overrides/override.yaml4
-rw-r--r--kubernetes/so/charts/so-monitoring/values.yaml3
-rw-r--r--kubernetes/vfc/charts/vfc-nokia-v2vnfm-driver/templates/deployment.yaml2
8 files changed, 10 insertions, 9 deletions
diff --git a/kubernetes/clamp/charts/clamp-dash-kibana/templates/deployment.yaml b/kubernetes/clamp/charts/clamp-dash-kibana/templates/deployment.yaml
index 0f5a93347a..d29148fe71 100644
--- a/kubernetes/clamp/charts/clamp-dash-kibana/templates/deployment.yaml
+++ b/kubernetes/clamp/charts/clamp-dash-kibana/templates/deployment.yaml
@@ -48,7 +48,7 @@ spec:
name: {{ include "common.name" . }}-readiness
containers:
- name: {{ include "common.name" . }}
- image: "{{ .Values.global.imageRepository | default .Values.imageRepository }}/{{ .Values.image }}"
+ image: "{{ include "common.repository" . }}/{{ .Values.image }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
ports:
- containerPort: {{ .Values.service.internalPort }}
diff --git a/kubernetes/clamp/charts/clamp-dash-kibana/values.yaml b/kubernetes/clamp/charts/clamp-dash-kibana/values.yaml
index 1d6e60f745..950029c7a6 100644
--- a/kubernetes/clamp/charts/clamp-dash-kibana/values.yaml
+++ b/kubernetes/clamp/charts/clamp-dash-kibana/values.yaml
@@ -32,7 +32,7 @@ busyboxRepository: registry.hub.docker.com
busyboxImage: library/busybox:latest
# application image
-imageRepository: nexus3.onap.org:10001
+repository: nexus3.onap.org:10001
image: onap/clamp-dashboard-kibana:3.0.0
pullPolicy: Always
diff --git a/kubernetes/clamp/charts/clamp-dash-logstash/templates/deployment.yaml b/kubernetes/clamp/charts/clamp-dash-logstash/templates/deployment.yaml
index aff9a0de71..6c6331a9c2 100644
--- a/kubernetes/clamp/charts/clamp-dash-logstash/templates/deployment.yaml
+++ b/kubernetes/clamp/charts/clamp-dash-logstash/templates/deployment.yaml
@@ -48,7 +48,7 @@ spec:
name: {{ include "common.name" . }}-readiness
containers:
- name: {{ include "common.name" . }}
- image: "{{ .Values.global.imageRepository| default .Values.imageRepository }}/{{ .Values.image }}"
+ image: "{{ include "common.repository" . }}/{{ .Values.image }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
env:
- name: dmaap_consumer_group
diff --git a/kubernetes/clamp/charts/clamp-dash-logstash/values.yaml b/kubernetes/clamp/charts/clamp-dash-logstash/values.yaml
index 41b93c46df..586132de15 100644
--- a/kubernetes/clamp/charts/clamp-dash-logstash/values.yaml
+++ b/kubernetes/clamp/charts/clamp-dash-logstash/values.yaml
@@ -28,7 +28,7 @@ global:
#################################################################
# application image
-imageRepository: nexus3.onap.org:10001
+repository: nexus3.onap.org:10001
image: onap/clamp-dashboard-logstash:3.0.0
pullPolicy: Always
diff --git a/kubernetes/policy/charts/policy-distribution/templates/deployment.yaml b/kubernetes/policy/charts/policy-distribution/templates/deployment.yaml
index 8722e03ad4..d6a6d2110a 100644
--- a/kubernetes/policy/charts/policy-distribution/templates/deployment.yaml
+++ b/kubernetes/policy/charts/policy-distribution/templates/deployment.yaml
@@ -18,7 +18,7 @@ spec:
spec:
containers:
- name: {{ include "common.name" . }}
- image: "{{ .Values.repository }}/{{ .Values.image }}"
+ image: "{{ include "common.repository" . }}/{{ .Values.image }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command: ["/opt/app/policy/distribution/bin/policy-dist.sh"]
args: ["/opt/app/policy/distribution/etc/mounted/config.json"]
diff --git a/kubernetes/so/charts/so-monitoring/resources/config/overrides/override.yaml b/kubernetes/so/charts/so-monitoring/resources/config/overrides/override.yaml
index 7434b14da2..c2e6ad06f3 100644
--- a/kubernetes/so/charts/so-monitoring/resources/config/overrides/override.yaml
+++ b/kubernetes/so/charts/so-monitoring/resources/config/overrides/override.yaml
@@ -6,9 +6,9 @@ ssl-enable: false
camunda:
rest:
api:
- url: http://bpmn-infra.{{ include "common.namespace" . }}:8081/engine-rest/engine/
+ url: http://so-bpmn-infra.{{ include "common.namespace" . }}:8081/sobpmnengine/engine/
engine: default
- auth: Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ==
+ auth: Basic YXBpaEJwbW46cGFzc3dvcmQxJA==
mso:
database:
rest:
diff --git a/kubernetes/so/charts/so-monitoring/values.yaml b/kubernetes/so/charts/so-monitoring/values.yaml
index a0915a1223..53d634571f 100644
--- a/kubernetes/so/charts/so-monitoring/values.yaml
+++ b/kubernetes/so/charts/so-monitoring/values.yaml
@@ -41,7 +41,8 @@ containerPort: 9091
logPath: app/logs/
app: so-monitoring
service:
- type: ClusterIP
+ type: NodePort
+ nodePort: 24
internalPort: 9091
externalPort: 9091
portName: so-monitor-port
diff --git a/kubernetes/vfc/charts/vfc-nokia-v2vnfm-driver/templates/deployment.yaml b/kubernetes/vfc/charts/vfc-nokia-v2vnfm-driver/templates/deployment.yaml
index 639e8cdfae..85dc17d9b0 100644
--- a/kubernetes/vfc/charts/vfc-nokia-v2vnfm-driver/templates/deployment.yaml
+++ b/kubernetes/vfc/charts/vfc-nokia-v2vnfm-driver/templates/deployment.yaml
@@ -70,7 +70,7 @@ spec:
periodSeconds: {{ .Values.readiness.periodSeconds }}
env:
- name: EXTERNAL_PORT
- value: 8089
+ value: "8089"
- name: MSB_ADDR
value: "{{ .Values.global.config.msbServiceName }}:{{ .Values.global.config.msbPort }}"
resources: