diff options
Diffstat (limited to 'kubernetes/vid')
-rw-r--r-- | kubernetes/vid/templates/vid-server-deployment.yaml | 45 | ||||
-rw-r--r-- | kubernetes/vid/values.yaml | 2 |
2 files changed, 18 insertions, 29 deletions
diff --git a/kubernetes/vid/templates/vid-server-deployment.yaml b/kubernetes/vid/templates/vid-server-deployment.yaml index d015135567..832fdeb93c 100644 --- a/kubernetes/vid/templates/vid-server-deployment.yaml +++ b/kubernetes/vid/templates/vid-server-deployment.yaml @@ -15,33 +15,22 @@ spec: labels: app: vid-server name: vid-server - annotations: - pod.beta.kubernetes.io/init-containers: '[ - { - "args": [ - "--container-name", - "vid-mariadb" - ], - "command": [ - "/root/ready.py" - ], - "env": [ - { - "name": "NAMESPACE", - "valueFrom": { - "fieldRef": { - "apiVersion": "v1", - "fieldPath": "metadata.namespace" - } - } - } - ], - "image": "{{ .Values.image.readiness }}", - "imagePullPolicy": "{{ .Values.pullPolicy }}", - "name": "vid-server-readiness" - } - ]' spec: + initContainers: + - command: + - /root/ready.py + args: + - --container-name + - vid-mariadb + env: + - name: NAMESPACE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.namespace + image: {{ .Values.image.readiness }} + imagePullPolicy: {{ .Values.pullPolicy }} + name: vid-server-readiness containers: - env: - name: ASDC_CLIENT_REST_HOST @@ -59,7 +48,7 @@ spec: - name: VID_MSO_SERVER_URL value: http://mso.{{ .Values.nsPrefix }}-mso:8080 - name: VID_MSO_PASS - value: 51515201a8d4c5c08d533db9bd1e1a9b + value: OBF:1ih71i271vny1yf41ymf1ylz1yf21vn41hzj1icz - name: MSO_DME2_SERVER_URL value: http://localhost:8081 - name: MSO_DME2_ENABLED @@ -132,4 +121,4 @@ spec: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/vid/logback.xml imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" -#{{ end }}
\ No newline at end of file +#{{ end }} diff --git a/kubernetes/vid/values.yaml b/kubernetes/vid/values.yaml index 5d24d347d8..9b1748f507 100644 --- a/kubernetes/vid/values.yaml +++ b/kubernetes/vid/values.yaml @@ -4,5 +4,5 @@ nodePortPrefix: 302 image: readiness: oomk8s/readiness-check:1.0.0 mariadb: nexus3.onap.org:10001/library/mariadb:10 - vid: nexus3.onap.org:10001/openecomp/vid:1.1-STAGING-latest + vid: nexus3.onap.org:10001/openecomp/vid:v1.1.1 filebeat: docker.elastic.co/beats/filebeat:5.5.0
\ No newline at end of file |