summaryrefslogtreecommitdiffstats
path: root/kubernetes
diff options
context:
space:
mode:
authorHuabingZhao <zhao.huabing@zte.com.cn>2017-09-02 14:38:07 +0800
committerHuabingZhao <zhao.huabing@zte.com.cn>2017-09-02 14:39:16 +0800
commit14391b41d1cea04544e284f502cc4da2eef69d90 (patch)
tree4cdfe47381e60571943de9c86e9c42ae4dcf4008 /kubernetes
parentd510144fff4875aab873c32de0a103d17d00d37e (diff)
parameterize docker image
Issue-Id: OOM-113 Change-Id: I36641bbb2c973f3df9a9d1a24e7197c21552e61b Signed-off-by: HuabingZhao <zhao.huabing@zte.com.cn>
Diffstat (limited to 'kubernetes')
-rw-r--r--kubernetes/msb/templates/msb-consul-deployment.yaml6
-rw-r--r--kubernetes/msb/templates/msb-discovery-deployment.yaml4
-rw-r--r--kubernetes/msb/templates/msb-eag-deployment.yaml4
-rw-r--r--kubernetes/msb/values.yaml11
4 files changed, 15 insertions, 10 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}}
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