diff options
Diffstat (limited to 'kubernetes/msb/templates')
6 files changed, 63 insertions, 15 deletions
diff --git a/kubernetes/msb/templates/all-services.yaml b/kubernetes/msb/templates/all-services.yaml index 8c6db30420..0ae94fc1bc 100644 --- a/kubernetes/msb/templates/all-services.yaml +++ b/kubernetes/msb/templates/all-services.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Service metadata: name: msb-consul - namespace: "{{ .Values.nsPrefix }}-msb" + namespace: "{{ .Values.nsPrefix }}" labels: app: msb-consul spec: @@ -20,7 +20,7 @@ apiVersion: v1 kind: Service metadata: name: msb-discovery - namespace: "{{ .Values.nsPrefix }}-msb" + namespace: "{{ .Values.nsPrefix }}" labels: app: msb-discovery spec: @@ -38,7 +38,7 @@ apiVersion: v1 kind: Service metadata: name: msb-iag - namespace: "{{ .Values.nsPrefix }}-msb" + namespace: "{{ .Values.nsPrefix }}" labels: app: msb-iag spec: @@ -59,7 +59,7 @@ apiVersion: v1 kind: Service metadata: name: msb-eag - namespace: "{{ .Values.nsPrefix }}-msb" + namespace: "{{ .Values.nsPrefix }}" labels: app: msb-eag spec: diff --git a/kubernetes/msb/templates/kube2msb-registrator-deployment.yaml b/kubernetes/msb/templates/kube2msb-registrator-deployment.yaml new file mode 100644 index 0000000000..f95faf69d0 --- /dev/null +++ b/kubernetes/msb/templates/kube2msb-registrator-deployment.yaml @@ -0,0 +1,48 @@ +#{{ if not .Values.disableKube2MsbKube2MsbRegistrator }} +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + name: kube2msb-registrator + namespace: "{{ .Values.nsPrefix }}" +spec: + replicas: 1 + selector: + matchLabels: + app: kube2msb-registrator + template: + metadata: + labels: + app: kube2msb-registrator + name: kube2msb-registrator + spec: + hostname: kube2msb-registrator + initContainers: + - command: + - /root/ready.py + args: + - --container-name + - msb-discovery + env: + - name: NAMESPACE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.namespace + image: {{ .Values.image.readiness }} + imagePullPolicy: {{ .Values.pullPolicy }} + name: kube2msb-registrator-readiness + containers: + - args: + image: {{ .Values.image.kube2msb }} + name: kube2msb-registrator + env: + - name: KUBE_MASTER_URL + value: {{ .Values.kubeMasterUrl }} + - name: AUTH_TOKEN + value: {{ .Values.kubeMasterAuthToken }} + - name: MSB_URL + value: {{tpl $.Values.discoveryUrl .}} + imagePullPolicy: {{ .Values.pullPolicy }} + imagePullSecrets: + - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }} diff --git a/kubernetes/msb/templates/msb-consul-deployment.yaml b/kubernetes/msb/templates/msb-consul-deployment.yaml index 4d462aa96f..7d7586c5f6 100644 --- a/kubernetes/msb/templates/msb-consul-deployment.yaml +++ b/kubernetes/msb/templates/msb-consul-deployment.yaml @@ -3,9 +3,9 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: msb-consul - namespace: "{{ .Values.nsPrefix }}-msb" + namespace: "{{ .Values.nsPrefix }}" spec: - replicas: 1 + replicas: {{ .Values.msbConsulReplicas }} selector: matchLabels: app: msb-consul @@ -29,4 +29,4 @@ spec: initialDelaySeconds: 5 periodSeconds: 10 imagePullPolicy: {{ .Values.pullPolicy }} -#{{ end }}
\ No newline at end of file +#{{ end }} diff --git a/kubernetes/msb/templates/msb-discovery-deployment.yaml b/kubernetes/msb/templates/msb-discovery-deployment.yaml index 5c01febd1e..280e6c39d0 100644 --- a/kubernetes/msb/templates/msb-discovery-deployment.yaml +++ b/kubernetes/msb/templates/msb-discovery-deployment.yaml @@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: msb-discovery - namespace: "{{ .Values.nsPrefix }}-msb" + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.discoveryReplicas }} selector: @@ -37,7 +37,7 @@ spec: name: "msb-discovery" env: - name: CONSUL_IP - value: msb-consul.{{ .Values.nsPrefix }}-msb + value: msb-consul.{{ .Values.nsPrefix }} 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 10cbbe115d..a24b3b012e 100644 --- a/kubernetes/msb/templates/msb-eag-deployment.yaml +++ b/kubernetes/msb/templates/msb-eag-deployment.yaml @@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: msb-eag - namespace: "{{ .Values.nsPrefix }}-msb" + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.eagReplicas }} selector: @@ -37,9 +37,9 @@ spec: name: "msb-eag" env: - name: CONSUL_IP - value: msb-consul.{{ .Values.nsPrefix }}-msb + value: msb-consul.{{ .Values.nsPrefix }} - name: SDCLIENT_IP - value: msb-discovery.{{ .Values.nsPrefix }}-msb + value: msb-discovery.{{ .Values.nsPrefix }} - name: ROUTE_LABELS value: "visualRange:0" ports: diff --git a/kubernetes/msb/templates/msb-iag-deployment.yaml b/kubernetes/msb/templates/msb-iag-deployment.yaml index 18dbc67f86..8a56a5f420 100644 --- a/kubernetes/msb/templates/msb-iag-deployment.yaml +++ b/kubernetes/msb/templates/msb-iag-deployment.yaml @@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: msb-iag - namespace: "{{ .Values.nsPrefix }}-msb" + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.iagReplicas }} selector: @@ -37,9 +37,9 @@ spec: name: "msb-iag" env: - name: CONSUL_IP - value: msb-consul.{{ .Values.nsPrefix }}-msb + value: msb-consul.{{ .Values.nsPrefix }} - name: SDCLIENT_IP - value: msb-discovery.{{ .Values.nsPrefix }}-msb + value: msb-discovery.{{ .Values.nsPrefix }} - name: ROUTE_LABELS value: "visualRange:1" ports: |