diff options
author | HuabingZhao <zhao.huabing@zte.com.cn> | 2017-08-29 15:30:10 +0800 |
---|---|---|
committer | HuabingZhao <zhao.huabing@zte.com.cn> | 2017-08-29 15:35:36 +0800 |
commit | 4ea06553753981bc663fd5fa7961628d03385564 (patch) | |
tree | 069b17f65c40bfb1141b09c88420428443bb442f | |
parent | fe67ad72d562465145bbfafaa71319a70c535272 (diff) |
MSB external api gateway service k8s deployment
Issue-Id: OOM-113, MSB-26
Change-Id: If365e75c7ccf7de902f771ffdd2db3b1566b98b6
Signed-off-by: HuabingZhao <zhao.huabing@zte.com.cn>
-rw-r--r-- | kubernetes/msb/templates/all-services.yaml | 2 | ||||
-rw-r--r-- | kubernetes/msb/templates/msb-consul-deployment.yaml | 4 | ||||
-rw-r--r-- | kubernetes/msb/templates/msb-discovery-deployment.yaml | 4 | ||||
-rw-r--r-- | kubernetes/msb/templates/msb-eag-deployment.yaml | 38 | ||||
-rw-r--r-- | kubernetes/msb/values.yaml | 6 |
5 files changed, 49 insertions, 5 deletions
diff --git a/kubernetes/msb/templates/all-services.yaml b/kubernetes/msb/templates/all-services.yaml index ea66c31350..80892fe728 100644 --- a/kubernetes/msb/templates/all-services.yaml +++ b/kubernetes/msb/templates/all-services.yaml @@ -7,7 +7,7 @@ metadata: spec: clusterIP: "{{ .Values.consulClusterIP }}" ports: - - port: 8500 + - port: {{ .Values.consulPort }} nodePort: "{{ .Values.consulNodePort }}" selector: app: msb-consul diff --git a/kubernetes/msb/templates/msb-consul-deployment.yaml b/kubernetes/msb/templates/msb-consul-deployment.yaml index 0d98896529..1dbbe8fb1b 100644 --- a/kubernetes/msb/templates/msb-consul-deployment.yaml +++ b/kubernetes/msb/templates/msb-consul-deployment.yaml @@ -19,11 +19,11 @@ spec: image: consul name: "msb-consul" ports: - - containerPort: 8500 + - containerPort: {{ .Values.consulPort }} name: msb-consul readinessProbe: tcpSocket: - port: 8500 + port: {{ .Values.consulPort }} initialDelaySeconds: 5 periodSeconds: 10 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 e4736b5a7a..a5d014aae4 100644 --- a/kubernetes/msb/templates/msb-discovery-deployment.yaml +++ b/kubernetes/msb/templates/msb-discovery-deployment.yaml @@ -22,11 +22,11 @@ spec: - name: CONSUL_IP value: "{{ .Values.consulClusterIP }}" ports: - - containerPort: 10081 + - containerPort: {{ .Values.discoveryPort }} name: msb-discovery readinessProbe: tcpSocket: - port: 10081 + port: {{ .Values.discoveryPort }} initialDelaySeconds: 5 periodSeconds: 10 imagePullPolicy: "{{ .Values.pullPolicy }}" diff --git a/kubernetes/msb/templates/msb-eag-deployment.yaml b/kubernetes/msb/templates/msb-eag-deployment.yaml new file mode 100644 index 0000000000..45b8879bb3 --- /dev/null +++ b/kubernetes/msb/templates/msb-eag-deployment.yaml @@ -0,0 +1,38 @@ +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + name: msb-eag +spec: + replicas: 2 + selector: + matchLabels: + app: msb-eag + template: + metadata: + labels: + app: msb-eag + name: msb-eag + spec: + hostname: msb-eag + containers: + - args: + image: nexus3.onap.org:10001/onap/msb/msb_apigateway + name: "msb-eag" + env: + - name: CONSUL_IP + value: "{{ .Values.consulClusterIP}}" + - name: SDCLIENT_IP + value: "{{ .Values.discoveryClusterIP}}" + - name: ROUTE_LABELS + value: "visualRange:0" + ports: + - containerPort: {{ .Values.eagPort }} + name: msb-eag + readinessProbe: + tcpSocket: + port: {{ .Values.eagPort }} + initialDelaySeconds: 5 + periodSeconds: 10 + imagePullPolicy: "{{ .Values.pullPolicy}}" + + diff --git a/kubernetes/msb/values.yaml b/kubernetes/msb/values.yaml index eba6612689..8877000c91 100644 --- a/kubernetes/msb/values.yaml +++ b/kubernetes/msb/values.yaml @@ -1,5 +1,11 @@ consulClusterIP: 10.43.6.204 discoveryClusterIP: 10.43.6.205 +consulPort: 8500 consulNodePort: 30500 +discoveryPort: 10081 discoveryNodePort: 30081 +iagPort: 80 +iagNodePort: 30080 +eagPort: 80 +eagNodePort: 30082 pullPolicy: IfNotPresent
\ No newline at end of file |