diff options
Diffstat (limited to 'kubernetes/appc')
| -rw-r--r-- | kubernetes/appc/templates/appc-deployment.yaml | 43 | ||||
| -rw-r--r-- | kubernetes/appc/templates/dgbuilder-deployment.yaml | 51 | ||||
| -rw-r--r-- | kubernetes/appc/values.yaml | 4 |
3 files changed, 37 insertions, 61 deletions
diff --git a/kubernetes/appc/templates/appc-deployment.yaml b/kubernetes/appc/templates/appc-deployment.yaml index e379c167d7..f4593b0d73 100644 --- a/kubernetes/appc/templates/appc-deployment.yaml +++ b/kubernetes/appc/templates/appc-deployment.yaml @@ -13,33 +13,22 @@ spec: labels: app: appc name: appc - annotations: - pod.beta.kubernetes.io/init-containers: '[ - { - "args": [ - "--container-name", - "appc-db-container" - ], - "command": [ - "/root/ready.py" - ], - "env": [ - { - "name": "NAMESPACE", - "valueFrom": { - "fieldRef": { - "apiVersion": "v1", - "fieldPath": "metadata.namespace" - } - } - } - ], - "image": "{{ .Values.image.readiness }}", - "imagePullPolicy": "{{ .Values.pullPolicy }}", - "name": "appc-readiness" - } - ]' spec: + initContainers: + - command: + - /root/ready.py + args: + - --container-name + - appc-db-container + env: + - name: NAMESPACE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.namespace + image: {{ .Values.image.readiness }} + imagePullPolicy: {{ .Values.pullPolicy }} + name: appc-readiness containers: - command: - /opt/openecomp/appc/bin/startODL.sh @@ -112,4 +101,4 @@ spec: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdnc/conf/aaiclient.properties imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" -#{{ end }}
\ No newline at end of file +#{{ end }} diff --git a/kubernetes/appc/templates/dgbuilder-deployment.yaml b/kubernetes/appc/templates/dgbuilder-deployment.yaml index b9495a740b..ed69c05f38 100644 --- a/kubernetes/appc/templates/dgbuilder-deployment.yaml +++ b/kubernetes/appc/templates/dgbuilder-deployment.yaml @@ -13,35 +13,24 @@ spec: labels: app: appc-dgbuilder name: appc-dgbuilder - annotations: - pod.beta.kubernetes.io/init-containers: '[ - { - "args": [ - "--container-name", - "appc-db-container", - "--container-name", - "appc-controller-container" - ], - "command": [ - "/root/ready.py" - ], - "env": [ - { - "name": "NAMESPACE", - "valueFrom": { - "fieldRef": { - "apiVersion": "v1", - "fieldPath": "metadata.namespace" - } - } - } - ], - "image": "{{ .Values.image.readiness }}", - "imagePullPolicy": "{{ .Values.pullPolicy }}", - "name": "appc-dgbuilder-readiness" - } - ]' spec: + initContainers: + - command: + - /root/ready.py + args: + - --container-name + - appc-db-container + - --container-name + - appc-controller-container + env: + - name: NAMESPACE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.namespace + image: {{ .Values.image.readiness }} + imagePullPolicy: {{ .Values.pullPolicy }} + name: appc-dgbuilder-readiness containers: - command: - /bin/bash @@ -51,9 +40,7 @@ spec: - name: MYSQL_ROOT_PASSWORD value: openECOMP1.0 - name: SDNC_CONFIG_DIR - value: /opt/openecomp/sdnc/data/properties - - name: APPC_CONFIG_DIR - value: /opt/openecomp/appc/data/properties + value: /opt/onap/sdnc/data/properties image: {{ .Values.image.dgbuilderSdnc }} imagePullPolicy: {{ .Values.pullPolicy }} name: appc-dgbuilder-container @@ -75,4 +62,4 @@ spec: restartPolicy: Always imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" -#{{ end }}
\ No newline at end of file +#{{ end }} diff --git a/kubernetes/appc/values.yaml b/kubernetes/appc/values.yaml index 624c6421d2..882267c41d 100644 --- a/kubernetes/appc/values.yaml +++ b/kubernetes/appc/values.yaml @@ -3,7 +3,7 @@ pullPolicy: Always nodePortPrefix: 302 image: readiness: oomk8s/readiness-check:1.0.0 - appc: nexus3.onap.org:10001/openecomp/appc-image:1.1-STAGING-latest + appc: nexus3.onap.org:10001/openecomp/appc-image:v1.2.0 mysqlServer: mysql/mysql-server:5.6 - dgbuilderSdnc: nexus3.onap.org:10001/onap/ccsdk-dgbuilder-image:0.1-STAGING-latest + dgbuilderSdnc: nexus3.onap.org:10001/onap/ccsdk-dgbuilder-image:v0.1.0 filebeat: docker.elastic.co/beats/filebeat:5.5.0
\ No newline at end of file |