Remove namespace

k8s-study · May 14, 2018 · d31aaae · d31aaae
1 parent d9b91f0
commit d31aaae
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 23 deletions.
diff --git a/k8s/kong-apigw/00_namespace__kong-apigw.yml b/k8s/kong-apigw/00_namespace__kong-apigw.yml
diff --git a/k8s/kong-apigw/01_service__kong-database.yml b/k8s/kong-apigw/01_service__kong-database.yml
@@ -3,7 +3,6 @@ apiVersion: v1
 kind: Service
 metadata:
   name: kong-database
-  namespace: kong-apigw
 spec:
   selector:
     name: kong-database
@@ -17,7 +16,6 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: kong-database-claim
-  namespace: kong-apigw
 spec:
   accessModes:
     - ReadWriteOnce
@@ -30,7 +28,6 @@ apiVersion: v1
 kind: Pod
 metadata:
   name: kong-database
-  namespace: kong-apigw
   labels:
     name: kong-database
 spec:

diff --git a/k8s/kong-apigw/02_job__kong-migration.yml b/k8s/kong-apigw/02_job__kong-migration.yml
@@ -3,13 +3,11 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: kong-migration
-  namespace: kong-apigw
 spec:
   backoffLimit: 5
   template:
     metadata:
       name: kong-migration
-      namespace: kong-apigw
     spec:
       restartPolicy: Never
       containers:

diff --git a/k8s/kong-apigw/03_deployment__kong-apigw.yml b/k8s/kong-apigw/03_deployment__kong-apigw.yml
@@ -3,15 +3,13 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: kong-apigw
-  namespace: kong-apigw
 spec:
   replicas: 2
   selector:
     matchLabels:
       name: kong-apigw
   template:
     metadata:
-      namespace: kong-apigw
       labels:
         name: kong-apigw
     spec:

diff --git a/k8s/kong-apigw/04_service__kong-apigw.yml b/k8s/kong-apigw/04_service__kong-apigw.yml
@@ -3,7 +3,6 @@ apiVersion: v1
 kind: Service
 metadata:
   name: kong-apigw
-  namespace: kong-apigw
 spec:
   selector:
     name: kong-apigw

diff --git a/k8s/kong-apigw/05_ingress__kong-apigw.yml b/k8s/kong-apigw/05_ingress__kong-apigw.yml
@@ -3,7 +3,6 @@ apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   name: kong-apigw
-  namespace: kong-apigw
   annotations:
     ingress.kubernetes.io/ssl-redirect: "false"
 spec:

diff --git a/tutorial/00_deploy_apigw.sh b/tutorial/00_deploy_apigw.sh
@@ -1,17 +1,14 @@
 #!/bin/bash
 
-echo "-- create kong-apigw namespace"
-kubectl create -f k8s/kong-apigw/00_namespace__kong-apigw.yml
-
 echo "-- create kong-apigw database"
-kubectl create -f k8s/kong-apigw/01_service__kong-database.yml
+kubectl create -f k8s/kong-apigw/00_service__kong-database.yml
 
 echo "-- create kong database migration job"
 sleep 5
-kubectl create -f k8s/kong-apigw/02_job__kong-migration.yml
+kubectl create -f k8s/kong-apigw/01_job__kong-migration.yml
 
 echo "-- deploy apigw services"
 sleep 5
-kubectl create -f k8s/kong-apigw/03_deployment__kong-apigw.yml
-kubectl create -f k8s/kong-apigw/04_service__kong-apigw.yml
-kubectl create -f k8s/kong-apigw/05_ingress__kong-apigw.yml
+kubectl create -f k8s/kong-apigw/02_deployment__kong-apigw.yml
+kubectl create -f k8s/kong-apigw/03_service__kong-apigw.yml
+kubectl create -f k8s/kong-apigw/04_ingress__kong-apigw.yml
diff --git a/tutorial/02_register_testapi.sh b/tutorial/02_register_testapi.sh
@@ -28,7 +28,7 @@ echo '-- get api list'
 inv api-list | jq
 
 apigw_host=$(
-  kubectl get ing -n kong-apigw -o json | \
+  kubectl get ing -o json | \
   jq -r '.items[0].spec.rules[0].host')
 
 sleep 3