From 14391b41d1cea04544e284f502cc4da2eef69d90 Mon Sep 17 00:00:00 2001 From: HuabingZhao Date: Sat, 2 Sep 2017 14:38:07 +0800 Subject: parameterize docker image Issue-Id: OOM-113 Change-Id: I36641bbb2c973f3df9a9d1a24e7197c21552e61b Signed-off-by: HuabingZhao --- kubernetes/msb/templates/msb-consul-deployment.yaml | 6 +++--- kubernetes/msb/templates/msb-discovery-deployment.yaml | 4 ++-- kubernetes/msb/templates/msb-eag-deployment.yaml | 4 ++-- kubernetes/msb/values.yaml | 11 ++++++++--- 4 files changed, 15 insertions(+), 10 deletions(-) (limited to 'kubernetes/msb') 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}} diff --git a/kubernetes/msb/values.yaml b/kubernetes/msb/values.yaml index 38059e1458..6927f1da6e 100644 --- a/kubernetes/msb/values.yaml +++ b/kubernetes/msb/values.yaml @@ -1,3 +1,10 @@ +nsPrefix: onap +pullPolicy: IfNotPresent +image: + consul: consul:latest + discovery: nexus3.onap.org:10001/onap/msb/msb_discovery:latest + apigateway: nexus3.onap.org:10001/onap/msb/msb_discovery:latest + consulClusterIP: 10.43.6.204 consulPort: 8500 consulNodePort: 30500 @@ -15,6 +22,4 @@ iagReplicas: 1 eagClusterIP: 10.43.6.207 eagPort: 80 eagNodePort: 30082 -eagReplicas: 1 - -pullPolicy: IfNotPresent \ No newline at end of file +eagReplicas: 1 \ No newline at end of file -- cgit 1.2.3-korg