summaryrefslogtreecommitdiffstats
path: root/kubernetes/msb
diff options
context:
space:
mode:
authorrui hu <hu.rui2@zte.com.cn>2018-03-13 02:39:06 +0000
committerGerrit Code Review <gerrit@onap.org>2018-03-13 02:39:06 +0000
commit78dfe70911a4da15280adb9cc8a583fb1e09331d (patch)
tree2381d52af44fc7dc20d896f65eb4d79b25cd6c14 /kubernetes/msb
parent420dc067b7b4608fc840b3062d5369adff7deadd (diff)
parented957a4fd4dc7edaf0a980f6f7e8f6a974b6dbca (diff)
Merge "Deploy kube2msb along with msb containers"
Diffstat (limited to 'kubernetes/msb')
-rw-r--r--kubernetes/msb/templates/kube2msb-registrator-deployment.yaml48
-rw-r--r--kubernetes/msb/values.yaml4
2 files changed, 52 insertions, 0 deletions
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/values.yaml b/kubernetes/msb/values.yaml
index 8c50e37e2b..10e3be4230 100644
--- a/kubernetes/msb/values.yaml
+++ b/kubernetes/msb/values.yaml
@@ -5,6 +5,7 @@ image:
consul: consul:0.9.3
discovery: nexus3.onap.org:10001/onap/msb/msb_discovery:1.1.0-SNAPSHOT-latest
apigateway: nexus3.onap.org:10001/onap/msb/msb_apigateway:1.1.0-SNAPSHOT-latest
+ kube2msb: nexus3.onap.org:10001/onap/oom/kube2msb
consulPort: 8500
consulNodePort: 30500
@@ -25,3 +26,6 @@ eagPort_https: 443
eagNodePort: 30082
eagNodePort_https: 30446
eagReplicas: 1
+
+kubeMasterUrl: https://kubernetes.default.svc.cluster.local:443
+discoveryUrl: http://msb-discovery.{{ .Values.nsPrefix }}:10081