summaryrefslogtreecommitdiffstats
path: root/kubernetes/msb
diff options
context:
space:
mode:
Diffstat (limited to 'kubernetes/msb')
-rw-r--r--kubernetes/msb/templates/all-services.yaml22
-rw-r--r--kubernetes/msb/templates/kube2msb-registrator-deployment.yaml48
-rw-r--r--kubernetes/msb/templates/msb-consul-deployment.yaml6
-rw-r--r--kubernetes/msb/templates/msb-discovery-deployment.yaml21
-rw-r--r--kubernetes/msb/templates/msb-eag-deployment.yaml23
-rw-r--r--kubernetes/msb/templates/msb-iag-deployment.yaml23
-rw-r--r--kubernetes/msb/values.yaml14
7 files changed, 134 insertions, 23 deletions
diff --git a/kubernetes/msb/templates/all-services.yaml b/kubernetes/msb/templates/all-services.yaml
index 487347393d..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,13 +38,17 @@ apiVersion: v1
kind: Service
metadata:
name: msb-iag
- namespace: "{{ .Values.nsPrefix }}-msb"
+ namespace: "{{ .Values.nsPrefix }}"
labels:
app: msb-iag
spec:
ports:
- - port: {{ .Values.iagPort }}
+ - name: http
+ port: {{ .Values.iagPort }}
nodePort: {{ .Values.iagNodePort }}
+ - name: https
+ port: {{ .Values.iagPort_https }}
+ nodePort: {{ .Values.iagNodePort_https }}
selector:
app: msb-iag
type: NodePort
@@ -55,14 +59,18 @@ apiVersion: v1
kind: Service
metadata:
name: msb-eag
- namespace: "{{ .Values.nsPrefix }}-msb"
+ namespace: "{{ .Values.nsPrefix }}"
labels:
app: msb-eag
spec:
ports:
- - port: {{ .Values.eagPort }}
+ - name: http
+ port: {{ .Values.eagPort }}
nodePort: {{ .Values.eagNodePort }}
+ - name: https
+ port: {{ .Values.eagPort_https }}
+ nodePort: {{ .Values.eagNodePort_https }}
selector:
app: msb-eag
type: NodePort
-#{{ end }} \ No newline at end of file
+#{{ end }}
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 5f8db61ac5..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:
@@ -16,13 +16,28 @@ spec:
name: msb-discovery
spec:
hostname: msb-discovery
+ initContainers:
+ - command:
+ - /root/ready.py
+ args:
+ - --container-name
+ - msb-consul
+ env:
+ - name: NAMESPACE
+ valueFrom:
+ fieldRef:
+ apiVersion: v1
+ fieldPath: metadata.namespace
+ image: {{ .Values.image.readiness }}
+ imagePullPolicy: {{ .Values.pullPolicy }}
+ name: msb-discovery-readiness
containers:
- args:
image: {{ .Values.image.discovery }}
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
@@ -34,4 +49,4 @@ spec:
imagePullPolicy: {{ .Values.pullPolicy }}
imagePullSecrets:
- name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }} \ No newline at end of file
+#{{ end }}
diff --git a/kubernetes/msb/templates/msb-eag-deployment.yaml b/kubernetes/msb/templates/msb-eag-deployment.yaml
index 714f19b1a5..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:
@@ -16,15 +16,30 @@ spec:
name: msb-eag
spec:
hostname: msb-eag
+ 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: msb-eag-readiness
containers:
- args:
image: {{ .Values.image.apigateway }}
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:
@@ -38,4 +53,4 @@ spec:
imagePullPolicy: {{ .Values.pullPolicy}}
imagePullSecrets:
- name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }} \ No newline at end of file
+#{{ end }}
diff --git a/kubernetes/msb/templates/msb-iag-deployment.yaml b/kubernetes/msb/templates/msb-iag-deployment.yaml
index ca4d5a033f..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:
@@ -16,15 +16,30 @@ spec:
name: msb-iag
spec:
hostname: msb-iag
+ 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: msb-iag-readiness
containers:
- args:
image: {{ .Values.image.apigateway }}
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:
@@ -38,4 +53,4 @@ spec:
imagePullPolicy: "{{ .Values.pullPolicy}}"
imagePullSecrets:
- name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }} \ No newline at end of file
+#{{ end }}
diff --git a/kubernetes/msb/values.yaml b/kubernetes/msb/values.yaml
index 7c1b16b8dc..10e3be4230 100644
--- a/kubernetes/msb/values.yaml
+++ b/kubernetes/msb/values.yaml
@@ -1,21 +1,31 @@
nsPrefix: onap
pullPolicy: IfNotPresent
image:
+ readiness: oomk8s/readiness-check:1.1.0
consul: consul:0.9.3
- discovery: nexus3.onap.org:10001/onap/msb/msb_discovery:1.0.0
- apigateway: nexus3.onap.org:10001/onap/msb/msb_apigateway:1.0.0
+ 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
+msbConsulReplicas: 1
discoveryPort: 10081
discoveryNodePort: 30081
discoveryReplicas: 1
iagPort: 80
+iagPort_https: 443
iagNodePort: 30080
+iagNodePort_https: 30443
iagReplicas: 1
eagPort: 80
+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