diff options
| author |   Huabing Zhao <zhao.huabing@zte.com.cn> | 2018-02-09 08:21:38 +0000 |
|---|---|---|
| committer |   Alexis de Talhouët <alexis.de_talhouet@bell.ca> | 2018-02-09 13:01:32 +0000 |
| commit | 097f681552ea5cd932f672fd5e80fee712ff2083 (patch) | |
| tree | c2052e7f7982da3a6edd6bd55841c28471516217 /kubernetes/msb | |
| parent | ce7844b207021251ec76a5aa5d7b8c1de3555a12 (diff) | |
Enforce MSB dockers dependencies
Change-Id: Ib8bef822ea3b27e3a7eb9e99cf7f8748bfc6f422
Issue-ID: OOM-678
Signed-off-by: HuabingZhao <zhao.huabing@zte.com.cn>
Diffstat (limited to 'kubernetes/msb')
| -rw-r--r-- | kubernetes/msb/templates/msb-discovery-deployment.yaml | 17 | ||||
| -rw-r--r-- | kubernetes/msb/templates/msb-eag-deployment.yaml | 17 | ||||
| -rw-r--r-- | kubernetes/msb/templates/msb-iag-deployment.yaml | 17 | ||||
| -rw-r--r-- | kubernetes/msb/values.yaml | 1 |
4 files changed, 49 insertions, 3 deletions
diff --git a/kubernetes/msb/templates/msb-discovery-deployment.yaml b/kubernetes/msb/templates/msb-discovery-deployment.yaml index 5f8db61ac5..5c01febd1e 100644 --- a/kubernetes/msb/templates/msb-discovery-deployment.yaml +++ b/kubernetes/msb/templates/msb-discovery-deployment.yaml @@ -16,6 +16,21 @@ spec: name: msb-discovery spec: hostname: msb-discovery + initContainers: + - command: + - /root/ready.py + args: + - --container-name + - msb-consul + env: + - name: NAMESPACE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.namespace + image: {{ .Values.image.readiness }} + imagePullPolicy: {{ .Values.pullPolicy }} + name: msb-discovery-readiness containers: - args: image: {{ .Values.image.discovery }} @@ -34,4 +49,4 @@ spec: imagePullPolicy: {{ .Values.pullPolicy }} imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" -#{{ end }}
\ No newline at end of file +#{{ end }} diff --git a/kubernetes/msb/templates/msb-eag-deployment.yaml b/kubernetes/msb/templates/msb-eag-deployment.yaml index 714f19b1a5..10cbbe115d 100644 --- a/kubernetes/msb/templates/msb-eag-deployment.yaml +++ b/kubernetes/msb/templates/msb-eag-deployment.yaml @@ -16,6 +16,21 @@ spec: name: msb-eag spec: hostname: msb-eag + initContainers: + - command: + - /root/ready.py + args: + - --container-name + - msb-discovery + env: + - name: NAMESPACE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.namespace + image: {{ .Values.image.readiness }} + imagePullPolicy: {{ .Values.pullPolicy }} + name: msb-eag-readiness containers: - args: image: {{ .Values.image.apigateway }} @@ -38,4 +53,4 @@ spec: imagePullPolicy: {{ .Values.pullPolicy}} imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" -#{{ end }}
\ No newline at end of file +#{{ end }} diff --git a/kubernetes/msb/templates/msb-iag-deployment.yaml b/kubernetes/msb/templates/msb-iag-deployment.yaml index ca4d5a033f..18dbc67f86 100644 --- a/kubernetes/msb/templates/msb-iag-deployment.yaml +++ b/kubernetes/msb/templates/msb-iag-deployment.yaml @@ -16,6 +16,21 @@ spec: name: msb-iag spec: hostname: msb-iag + initContainers: + - command: + - /root/ready.py + args: + - --container-name + - msb-discovery + env: + - name: NAMESPACE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.namespace + image: {{ .Values.image.readiness }} + imagePullPolicy: {{ .Values.pullPolicy }} + name: msb-iag-readiness containers: - args: image: {{ .Values.image.apigateway }} @@ -38,4 +53,4 @@ spec: imagePullPolicy: "{{ .Values.pullPolicy}}" imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" -#{{ end }}
\ No newline at end of file +#{{ end }} diff --git a/kubernetes/msb/values.yaml b/kubernetes/msb/values.yaml index 7c1b16b8dc..9bbdb929db 100644 --- a/kubernetes/msb/values.yaml +++ b/kubernetes/msb/values.yaml @@ -1,6 +1,7 @@ nsPrefix: onap pullPolicy: IfNotPresent image: + readiness: oomk8s/readiness-check:1.0.0 consul: consul:0.9.3 discovery: nexus3.onap.org:10001/onap/msb/msb_discovery:1.0.0 apigateway: nexus3.onap.org:10001/onap/msb/msb_apigateway:1.0.0 |