aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/msb/templates
diff options
context:
space:
mode:
authorHuabingZhao <zhao.huabing@zte.com.cn>2017-09-09 15:59:00 +0800
committerrui hu <hu.rui2@zte.com.cn>2017-09-11 09:35:31 +0000
commitaac1c9286ad6ac099099a77d67bfe312b715c24c (patch)
tree5b94ab679b26e6b485b04620732b5983f8074635 /kubernetes/msb/templates
parent8182ba93519a1466951fc0f980322391c50b2108 (diff)
Use domain name instead of IP for consul
Issue-Id: OOM-113 Change-Id: I41e6f72337a15c1d07b444b09171204d8eb378ec Signed-off-by: HuabingZhao <zhao.huabing@zte.com.cn>
Diffstat (limited to 'kubernetes/msb/templates')
-rw-r--r--kubernetes/msb/templates/all-services.yaml51
-rw-r--r--kubernetes/msb/templates/msb-discovery-deployment.yaml2
-rw-r--r--kubernetes/msb/templates/msb-eag-deployment.yaml2
-rw-r--r--kubernetes/msb/templates/msb-iag-deployment.yaml2
4 files changed, 27 insertions, 30 deletions
diff --git a/kubernetes/msb/templates/all-services.yaml b/kubernetes/msb/templates/all-services.yaml
index 4ec4656896..aeb4f5e9b0 100644
--- a/kubernetes/msb/templates/all-services.yaml
+++ b/kubernetes/msb/templates/all-services.yaml
@@ -6,7 +6,6 @@ metadata:
labels:
app: msb-consul
spec:
- clusterIP: "{{ .Values.consulClusterIP }}"
ports:
- port: {{ .Values.consulPort }}
nodePort: {{ .Values.consulNodePort }}
@@ -35,29 +34,27 @@ kind: Service
metadata:
name: msb-iag
namespace: "{{ .Values.nsPrefix }}-msb"
- labels:
- app: msb-iag
-spec:
- clusterIP: "{{ .Values.iagClusterIP }}"
- ports:
- - port: {{ .Values.iagPort }}
- nodePort: {{ .Values.iagNodePort }}
- selector:
- app: msb-iag
- type: NodePort
----
-apiVersion: v1
-kind: Service
-metadata:
- name: msb-eag
- namespace: "{{ .Values.nsPrefix }}-msb"
- labels:
- app: msb-eag
-spec:
- clusterIP: "{{ .Values.eagClusterIP }}"
- ports:
- - port: {{ .Values.eagPort }}
- nodePort: {{ .Values.eagNodePort }}
- selector:
- app: msb-eag
- type: NodePort \ No newline at end of file
+ labels:
+ app: msb-iag
+ spec:
+ ports:
+ - port: {{ .Values.iagPort }}
+ nodePort: {{ .Values.iagNodePort }}
+ selector:
+ app: msb-iag
+ type: NodePort
+ ---
+ apiVersion: v1
+ kind: Service
+ metadata:
+ name: msb-eag
+ namespace: "{{ .Values.nsPrefix }}-msb"
+ labels:
+ app: msb-eag
+ spec:
+ ports:
+ - port: {{ .Values.eagPort }}
+ nodePort: {{ .Values.eagNodePort }}
+ selector:
+ app: msb-eag
+ type: NodePort \ 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 24cb3a5f8c..3af9e8f858 100644
--- a/kubernetes/msb/templates/msb-discovery-deployment.yaml
+++ b/kubernetes/msb/templates/msb-discovery-deployment.yaml
@@ -21,7 +21,7 @@ spec:
name: "msb-discovery"
env:
- name: CONSUL_IP
- value: "{{ .Values.consulClusterIP }}"
+ value: msb-consul.{{ .Values.nsPrefix }}-msb
ports:
- containerPort: {{ .Values.discoveryPort }}
name: msb-discovery
diff --git a/kubernetes/msb/templates/msb-eag-deployment.yaml b/kubernetes/msb/templates/msb-eag-deployment.yaml
index d1c20ad6dc..db703d9188 100644
--- a/kubernetes/msb/templates/msb-eag-deployment.yaml
+++ b/kubernetes/msb/templates/msb-eag-deployment.yaml
@@ -21,7 +21,7 @@ spec:
name: "msb-eag"
env:
- name: CONSUL_IP
- value: "{{ .Values.consulClusterIP}}"
+ value: msb-consul.{{ .Values.nsPrefix }}-msb
- name: SDCLIENT_IP
value: "{{ .Values.discoveryClusterIP}}"
- name: ROUTE_LABELS
diff --git a/kubernetes/msb/templates/msb-iag-deployment.yaml b/kubernetes/msb/templates/msb-iag-deployment.yaml
index 3ab9f9a2b9..3f82e33a72 100644
--- a/kubernetes/msb/templates/msb-iag-deployment.yaml
+++ b/kubernetes/msb/templates/msb-iag-deployment.yaml
@@ -21,7 +21,7 @@ spec:
name: "msb-iag"
env:
- name: CONSUL_IP
- value: "{{ .Values.consulClusterIP}}"
+ value: msb-consul.{{ .Values.nsPrefix }}-msb
- name: SDCLIENT_IP
value: "{{ .Values.discoveryClusterIP}}"
- name: ROUTE_LABELS