VOL-569: Create kubernetes deployment configuration for each voltha service
This update:
- organizes all Voltha components under their own namespace, "voltha". If
you have a script for deploying Voltha, then add namespace.yml at the top.
- adds host volume mounts for Consul's data and config directories
- fixes a bug in Envoy where it was aborting because it couldn't find Consul
even though it was getting the Voltha assignments from Etcd.
Change-Id: I45eaf2d65428c0184df06971ce3797b9122d3055
diff --git a/k8s/ingress/10-default-backend.yml b/k8s/ingress/10-default-backend.yml
index 64f6f58..38987aa 100644
--- a/k8s/ingress/10-default-backend.yml
+++ b/k8s/ingress/10-default-backend.yml
@@ -4,7 +4,7 @@
name: default-http-backend
labels:
app: default-http-backend
- namespace: ingress-nginx
+ namespace: voltha
spec:
replicas: 1
template:
@@ -41,7 +41,7 @@
kind: Service
metadata:
name: default-http-backend
- namespace: ingress-nginx
+ namespace: voltha
labels:
app: default-http-backend
spec:
diff --git a/k8s/ingress/20-configmap.yml b/k8s/ingress/20-configmap.yml
index 08e9101..28ff19b 100644
--- a/k8s/ingress/20-configmap.yml
+++ b/k8s/ingress/20-configmap.yml
@@ -2,6 +2,6 @@
apiVersion: v1
metadata:
name: nginx-configuration
- namespace: ingress-nginx
+ namespace: voltha
labels:
app: ingress-nginx
diff --git a/k8s/ingress/30-tcp-services-configmap.yml b/k8s/ingress/30-tcp-services-configmap.yml
index a963085..ffa28df 100644
--- a/k8s/ingress/30-tcp-services-configmap.yml
+++ b/k8s/ingress/30-tcp-services-configmap.yml
@@ -2,4 +2,4 @@
apiVersion: v1
metadata:
name: tcp-services
- namespace: ingress-nginx
+ namespace: voltha
diff --git a/k8s/ingress/40-udp-services-configmap.yml b/k8s/ingress/40-udp-services-configmap.yml
index 1870931..8b84b5e 100644
--- a/k8s/ingress/40-udp-services-configmap.yml
+++ b/k8s/ingress/40-udp-services-configmap.yml
@@ -2,4 +2,4 @@
apiVersion: v1
metadata:
name: udp-services
- namespace: ingress-nginx
+ namespace: voltha
diff --git a/k8s/ingress/50-rbac.yml b/k8s/ingress/50-rbac.yml
index 3018532..2ee80e1 100644
--- a/k8s/ingress/50-rbac.yml
+++ b/k8s/ingress/50-rbac.yml
@@ -2,7 +2,7 @@
kind: ServiceAccount
metadata:
name: nginx-ingress-serviceaccount
- namespace: ingress-nginx
+ namespace: voltha
---
@@ -64,7 +64,7 @@
kind: Role
metadata:
name: nginx-ingress-role
- namespace: ingress-nginx
+ namespace: voltha
rules:
- apiGroups:
- ""
@@ -107,7 +107,7 @@
kind: RoleBinding
metadata:
name: nginx-ingress-role-nisa-binding
- namespace: ingress-nginx
+ namespace: voltha
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
@@ -115,7 +115,7 @@
subjects:
- kind: ServiceAccount
name: nginx-ingress-serviceaccount
- namespace: ingress-nginx
+ namespace: voltha
---
@@ -130,4 +130,4 @@
subjects:
- kind: ServiceAccount
name: nginx-ingress-serviceaccount
- namespace: ingress-nginx
+ namespace: voltha
diff --git a/k8s/ingress/60-cluster-ingress-nginx.yml b/k8s/ingress/60-cluster-ingress-nginx.yml
index a70a7fa..5b86979 100644
--- a/k8s/ingress/60-cluster-ingress-nginx.yml
+++ b/k8s/ingress/60-cluster-ingress-nginx.yml
@@ -2,7 +2,7 @@
kind: Deployment
metadata:
name: nginx-ingress-controller
- namespace: ingress-nginx
+ namespace: voltha
spec:
replicas: 1
selector:
diff --git a/k8s/ingress/70-service-ingress-nginx.yml b/k8s/ingress/70-service-ingress-nginx.yml
index 9a1cfa9..da11d04 100644
--- a/k8s/ingress/70-service-ingress-nginx.yml
+++ b/k8s/ingress/70-service-ingress-nginx.yml
@@ -2,7 +2,7 @@
kind: Service
metadata:
name: ingress-nginx
- namespace: ingress-nginx
+ namespace: voltha
spec:
type: NodePort
selector:
diff --git a/k8s/ingress/80-ingress.yml b/k8s/ingress/80-ingress.yml
index c665801..c2129c1 100644
--- a/k8s/ingress/80-ingress.yml
+++ b/k8s/ingress/80-ingress.yml
@@ -2,6 +2,7 @@
kind: Ingress
metadata:
name: voltha-ingress
+ namespace: voltha
annotations:
kubernetes.io/ingress.class: "nginx"
ingress.kubernetes.io/rewrite-target: /