parameterize docker image
Issue-Id: OOM-113
Change-Id: I36641bbb2c973f3df9a9d1a24e7197c21552e61b
Signed-off-by: HuabingZhao <zhao.huabing@zte.com.cn>
diff --git a/kubernetes/msb/templates/msb-consul-deployment.yaml b/kubernetes/msb/templates/msb-consul-deployment.yaml
index 1dbbe8f..de33961 100644
--- a/kubernetes/msb/templates/msb-consul-deployment.yaml
+++ b/kubernetes/msb/templates/msb-consul-deployment.yaml
@@ -16,8 +16,8 @@
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 @@
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 0fcd2f9..b54f3d1 100644
--- a/kubernetes/msb/templates/msb-discovery-deployment.yaml
+++ b/kubernetes/msb/templates/msb-discovery-deployment.yaml
@@ -16,7 +16,7 @@
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 @@
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 eb75cd9..c4697ba 100644
--- a/kubernetes/msb/templates/msb-eag-deployment.yaml
+++ b/kubernetes/msb/templates/msb-eag-deployment.yaml
@@ -16,7 +16,7 @@
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 @@
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 38059e1..6927f1d 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 @@
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