summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPiotr Darosz <piotr.darosz@nokia.com>2018-09-10 10:40:26 +0200
committerPiotr Darosz <piotr.darosz@nokia.com>2018-09-17 14:17:34 +0200
commitd9dc219850312c0c682cd5979a9e844cb7850b05 (patch)
tree71e8fae2c48b90cea5da40822c98ca316b65ef0e
parent3d8b63bc8475e3a1485fc247e7cc2cf9f9cf6fba (diff)
Open http port and use correct logback.
Open http port and use correct logback, adjust VID image version Change-Id: Id408d9cb7a5f5cbc41ff49d901d435393d7dac13 Issue-ID: OOM-1382 Signed-off-by: Piotr Darosz <piotr.darosz@nokia.com>
-rw-r--r--kubernetes/vid/templates/deployment.yaml4
-rw-r--r--kubernetes/vid/templates/service.yaml6
-rw-r--r--kubernetes/vid/values.yaml10
3 files changed, 13 insertions, 7 deletions
diff --git a/kubernetes/vid/templates/deployment.yaml b/kubernetes/vid/templates/deployment.yaml
index 3a7bdcaa43..5c98b04ae8 100644
--- a/kubernetes/vid/templates/deployment.yaml
+++ b/kubernetes/vid/templates/deployment.yaml
@@ -59,10 +59,6 @@ spec:
- name: {{ include "common.name" . }}
image: "{{ include "common.repository" . }}/{{ .Values.image }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
- lifecycle:
- postStart:
- exec:
- command: ["/bin/sh", "-c", "export LOG=wait_logback.log; touch $LOG; export SRC=/tmp/logback.xml; export DST=/usr/local/tomcat/webapps/vid/WEB-INF/classes/; while [ ! -e $DST ]; do echo 'Waiting for $DST...' >> $LOG; sleep 5; done; sleep 2; /bin/cp -f $SRC $DST; echo 'Done' >> $LOG"]
ports:
- containerPort: {{ .Values.service.internalPort }}
# disable liveness probe when breakpoints set in debugger
diff --git a/kubernetes/vid/templates/service.yaml b/kubernetes/vid/templates/service.yaml
index 3d1097f7ff..36b35e40da 100644
--- a/kubernetes/vid/templates/service.yaml
+++ b/kubernetes/vid/templates/service.yaml
@@ -29,10 +29,16 @@ spec:
- port: {{ .Values.service.internalPort }}
nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
name: {{ .Values.service.portName }}
+ - port: {{ .Values.service.internalPort2 }}
+ nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort2 }}
+ name: {{ .Values.service.portName2 }}
{{- else -}}
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
name: {{ .Values.service.portName }}
+ - port: {{ .Values.service.externalPort2 }}
+ targetPort: {{ .Values.service.internalPort2 }}
+ name: {{ .Values.service.portName2 }}
{{- end}}
selector:
app: {{ include "common.name" . }}
diff --git a/kubernetes/vid/values.yaml b/kubernetes/vid/values.yaml
index 812f74e1ce..4e5f403391 100644
--- a/kubernetes/vid/values.yaml
+++ b/kubernetes/vid/values.yaml
@@ -28,7 +28,7 @@ subChartsOnly:
# application image
repository: nexus3.onap.org:10001
-image: onap/vid:2.0.0
+image: onap/vid:3.0.0
pullPolicy: Always
# mariadb image for initializing
@@ -80,9 +80,13 @@ service:
type: NodePort
name: vid
portName: vid
- externalPort: "00"
- nodePort: "00"
+ externalPort: 8443
internalPort: 8443
+ nodePort: "00"
+ portName2: vid-http
+ externalPort2: 8080
+ internalPort2: 8080
+ nodePort2: "38"
ingress:
enabled: false