diff options
Diffstat (limited to 'kubernetes/msb')
| -rw-r--r-- | kubernetes/msb/templates/all-services.yaml | 4 | ||||
| -rw-r--r-- | kubernetes/msb/templates/msb-consul-deployment.yaml | 7 | ||||
| -rw-r--r-- | kubernetes/msb/templates/msb-discovery-deployment.yaml | 5 | ||||
| -rw-r--r-- | kubernetes/msb/templates/msb-eag-deployment.yaml | 5 | ||||
| -rw-r--r-- | kubernetes/msb/templates/msb-iag-deployment.yaml | 1 | ||||
| -rw-r--r-- | kubernetes/msb/values.yaml | 11 |
6 files changed, 23 insertions, 10 deletions
diff --git a/kubernetes/msb/templates/all-services.yaml b/kubernetes/msb/templates/all-services.yaml index b67808d2da..4ec4656896 100644 --- a/kubernetes/msb/templates/all-services.yaml +++ b/kubernetes/msb/templates/all-services.yaml @@ -2,6 +2,7 @@ apiVersion: v1 kind: Service metadata: name: msb-consul + namespace: "{{ .Values.nsPrefix }}-msb" labels: app: msb-consul spec: @@ -17,6 +18,7 @@ apiVersion: v1 kind: Service metadata: name: msb-discovery + namespace: "{{ .Values.nsPrefix }}-msb" labels: app: msb-discovery spec: @@ -32,6 +34,7 @@ apiVersion: v1 kind: Service metadata: name: msb-iag + namespace: "{{ .Values.nsPrefix }}-msb" labels: app: msb-iag spec: @@ -47,6 +50,7 @@ apiVersion: v1 kind: Service metadata: name: msb-eag + namespace: "{{ .Values.nsPrefix }}-msb" labels: app: msb-eag spec: diff --git a/kubernetes/msb/templates/msb-consul-deployment.yaml b/kubernetes/msb/templates/msb-consul-deployment.yaml index 1dbbe8fb1b..fc8a95a838 100644 --- a/kubernetes/msb/templates/msb-consul-deployment.yaml +++ b/kubernetes/msb/templates/msb-consul-deployment.yaml @@ -2,6 +2,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: msb-consul + namespace: "{{ .Values.nsPrefix }}-msb" spec: replicas: 1 selector: @@ -16,8 +17,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 +27,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..535eab9a1d 100644 --- a/kubernetes/msb/templates/msb-discovery-deployment.yaml +++ b/kubernetes/msb/templates/msb-discovery-deployment.yaml @@ -2,6 +2,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: msb-discovery + namespace: "{{ .Values.nsPrefix }}-msb" spec: replicas: {{ .Values.discoveryReplicas }} selector: @@ -16,7 +17,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 +30,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..eb60fe22ec 100644 --- a/kubernetes/msb/templates/msb-eag-deployment.yaml +++ b/kubernetes/msb/templates/msb-eag-deployment.yaml @@ -2,6 +2,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: msb-eag + namespace: "{{ .Values.nsPrefix }}-msb" spec: replicas: {{ .Values.eagReplicas }} selector: @@ -16,7 +17,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 +34,6 @@ spec: port: {{ .Values.eagPort }} initialDelaySeconds: 5 periodSeconds: 10 - imagePullPolicy: "{{ .Values.pullPolicy}}" + imagePullPolicy: {{ .Values.pullPolicy}} diff --git a/kubernetes/msb/templates/msb-iag-deployment.yaml b/kubernetes/msb/templates/msb-iag-deployment.yaml index d83951a415..180c3155a6 100644 --- a/kubernetes/msb/templates/msb-iag-deployment.yaml +++ b/kubernetes/msb/templates/msb-iag-deployment.yaml @@ -2,6 +2,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: msb-iag + namespace: "{{ .Values.nsPrefix }}-msb" spec: replicas: {{ .Values.iagReplicas }} selector: 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 |