diff options
| author |   rui hu <hu.rui2@zte.com.cn> | 2017-09-02 06:40:48 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-09-02 06:40:48 +0000 |
| commit | 79134e2bb47f3d53447ffe88f92dff80de524be4 (patch) | |
| tree | 0bbd475f0e05f04a41fe04a21104b61ddc42bef2 /kubernetes/msb/templates | |
| parent | e4fa91b5fc6f3cf77a0a7faf2abe5b472386c369 (diff) | |
| parent | 14391b41d1cea04544e284f502cc4da2eef69d90 (diff) | |
Merge changes I36641bbb,Ia8568265
* changes:
parameterize docker image
add service endpoint annotation for aai
Diffstat (limited to 'kubernetes/msb/templates')
| -rw-r--r-- | kubernetes/msb/templates/msb-consul-deployment.yaml | 6 | ||||
| -rw-r--r-- | kubernetes/msb/templates/msb-discovery-deployment.yaml | 4 | ||||
| -rw-r--r-- | kubernetes/msb/templates/msb-eag-deployment.yaml | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/kubernetes/msb/templates/msb-consul-deployment.yaml b/kubernetes/msb/templates/msb-consul-deployment.yaml index 1dbbe8fb1b..de33961f8a 100644 --- a/kubernetes/msb/templates/msb-consul-deployment.yaml +++ b/kubernetes/msb/templates/msb-consul-deployment.yaml @@ -16,8 +16,8 @@ spec: hostname: msb-consul containers: - args: - image: consul - name: "msb-consul" + image: {{ .Values.image.consul }} + name: msb-consul ports: - containerPort: {{ .Values.consulPort }} name: msb-consul @@ -26,4 +26,4 @@ spec: port: {{ .Values.consulPort }} initialDelaySeconds: 5 periodSeconds: 10 - imagePullPolicy: "{{ .Values.pullPolicy }}"
\ No newline at end of file + imagePullPolicy: {{ .Values.pullPolicy }}
\ No newline at end of file diff --git a/kubernetes/msb/templates/msb-discovery-deployment.yaml b/kubernetes/msb/templates/msb-discovery-deployment.yaml index 0fcd2f9ba9..b54f3d1d20 100644 --- a/kubernetes/msb/templates/msb-discovery-deployment.yaml +++ b/kubernetes/msb/templates/msb-discovery-deployment.yaml @@ -16,7 +16,7 @@ spec: hostname: msb-discovery containers: - args: - image: nexus3.onap.org:10001/onap/msb/msb_discovery + image: {{ .Values.image.discovery }} name: "msb-discovery" env: - name: CONSUL_IP @@ -29,6 +29,6 @@ spec: port: {{ .Values.discoveryPort }} initialDelaySeconds: 5 periodSeconds: 10 - imagePullPolicy: "{{ .Values.pullPolicy }}" + imagePullPolicy: {{ .Values.pullPolicy }} diff --git a/kubernetes/msb/templates/msb-eag-deployment.yaml b/kubernetes/msb/templates/msb-eag-deployment.yaml index eb75cd9e42..c4697baeed 100644 --- a/kubernetes/msb/templates/msb-eag-deployment.yaml +++ b/kubernetes/msb/templates/msb-eag-deployment.yaml @@ -16,7 +16,7 @@ spec: hostname: msb-eag containers: - args: - image: nexus3.onap.org:10001/onap/msb/msb_apigateway + image: {{ .Values.image.apigateway }} name: "msb-eag" env: - name: CONSUL_IP @@ -33,6 +33,6 @@ spec: port: {{ .Values.eagPort }} initialDelaySeconds: 5 periodSeconds: 10 - imagePullPolicy: "{{ .Values.pullPolicy}}" + imagePullPolicy: {{ .Values.pullPolicy}} |