diff options
Diffstat (limited to 'kubernetes/msb/charts')
5 files changed, 6 insertions, 11 deletions
diff --git a/kubernetes/msb/charts/kube2msb/templates/deployment.yaml b/kubernetes/msb/charts/kube2msb/templates/deployment.yaml index 94b25a19bf..ad38750a8d 100644 --- a/kubernetes/msb/charts/kube2msb/templates/deployment.yaml +++ b/kubernetes/msb/charts/kube2msb/templates/deployment.yaml @@ -33,11 +33,6 @@ spec: name: {{ include "common.name" . }}-readiness containers: - name: {{ include "common.name" . }} - # TODO: Temporary command: - command: - - /bin/sh - - -c - - export AUTH_TOKEN=$(cat /var/run/secrets/kubernetes.io/serviceaccount/token); /bin/kube2msb --kube_master_url=${KUBE_MASTER_URL} --msb_url=${MSB_URL} image: "{{ .Values.global.repository | default .Values.repository }}/{{ .Values.image }}" imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} env: diff --git a/kubernetes/msb/charts/kube2msb/values.yaml b/kubernetes/msb/charts/kube2msb/values.yaml index 43810a9781..8c494c0ee8 100644 --- a/kubernetes/msb/charts/kube2msb/values.yaml +++ b/kubernetes/msb/charts/kube2msb/values.yaml @@ -19,7 +19,7 @@ pullPolicy: Always config: routeLabels: "visualRange:1" kubeMasterUrl: https://kubernetes.default:443 - discoveryUrl: http://{{.Release.Name}}-msb-discovery.{{include "common.namespace" .}}:10081 + discoveryUrl: http://msb-discovery.{{include "common.namespace" .}}:10081 # default number of instances replicaCount: 1 diff --git a/kubernetes/msb/charts/msb-discovery/templates/deployment.yaml b/kubernetes/msb/charts/msb-discovery/templates/deployment.yaml index f32a5d1544..0fb2cc6604 100644 --- a/kubernetes/msb/charts/msb-discovery/templates/deployment.yaml +++ b/kubernetes/msb/charts/msb-discovery/templates/deployment.yaml @@ -53,7 +53,7 @@ spec: periodSeconds: {{ .Values.readiness.periodSeconds }} env: - name: CONSUL_IP - value: {{.Release.Name}}-msb-consul.{{ include "common.namespace" . }} + value: msb-consul.{{ include "common.namespace" . }} volumeMounts: - mountPath: /etc/localtime name: localtime diff --git a/kubernetes/msb/charts/msb-eag/templates/deployment.yaml b/kubernetes/msb/charts/msb-eag/templates/deployment.yaml index d41518d662..2df82aca59 100644 --- a/kubernetes/msb/charts/msb-eag/templates/deployment.yaml +++ b/kubernetes/msb/charts/msb-eag/templates/deployment.yaml @@ -56,9 +56,9 @@ spec: periodSeconds: {{ .Values.readiness.periodSeconds }} env: - name: CONSUL_IP - value: {{.Release.Name}}-msb-consul.{{ include "common.namespace" . }} + value: msb-consul.{{ include "common.namespace" . }} - name: SDCLIENT_IP - value: {{.Release.Name}}-msb-discovery.{{ include "common.namespace" . }} + value: msb-discovery.{{ include "common.namespace" . }} - name: ROUTE_LABELS value: {{ .Values.config.routeLabels }} volumeMounts: diff --git a/kubernetes/msb/charts/msb-iag/templates/deployment.yaml b/kubernetes/msb/charts/msb-iag/templates/deployment.yaml index d41518d662..2df82aca59 100644 --- a/kubernetes/msb/charts/msb-iag/templates/deployment.yaml +++ b/kubernetes/msb/charts/msb-iag/templates/deployment.yaml @@ -56,9 +56,9 @@ spec: periodSeconds: {{ .Values.readiness.periodSeconds }} env: - name: CONSUL_IP - value: {{.Release.Name}}-msb-consul.{{ include "common.namespace" . }} + value: msb-consul.{{ include "common.namespace" . }} - name: SDCLIENT_IP - value: {{.Release.Name}}-msb-discovery.{{ include "common.namespace" . }} + value: msb-discovery.{{ include "common.namespace" . }} - name: ROUTE_LABELS value: {{ .Values.config.routeLabels }} volumeMounts: |