revert namespace changes

davidcheung · davidcheung · commit fdf81a3602f7 · 2020-11-17T16:16:59.000-05:00
diff --git a/templates/.circleci/config.yml b/templates/.circleci/config.yml
@@ -252,7 +252,7 @@ jobs:
             cd kubernetes/overlays/<< parameters.config-environment >>
             IMAGE=<< parameters.account-id >>.dkr.ecr.<< parameters.region >>.amazonaws.com/<< parameters.repo >>
             kustomize edit set image fake-image=${IMAGE}:${VERSION_TAG}
-            kustomize build . | kubectl apply -f -
+            kustomize build . | kubectl apply -f - -n $NAMESPACE
             if ! kubectl -n $NAMESPACE rollout status deployment/$DEPLOYMENT -w --timeout=180s ; then
               echo "$DEPLOYMENT rollout check failed:"
               echo "$DEPLOYMENT deployment:"
diff --git a/templates/kubernetes/base/kustomization.yml b/templates/kubernetes/base/kustomization.yml
@@ -1,8 +1,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
-namespace: <% .Name %>
-
 resources:
 - deployment.yml
 - service.yml
diff --git a/templates/kubernetes/overlays/production/ingress.yml b/templates/kubernetes/overlays/production/ingress.yml
@@ -2,7 +2,6 @@ apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   name: <% .Name %>
-  namespace: <% .Name %>
   annotations:
     # nginx ingress
     kubernetes.io/ingress.class: nginx
diff --git a/templates/kubernetes/overlays/production/kustomization.yml b/templates/kubernetes/overlays/production/kustomization.yml
@@ -8,6 +8,7 @@ patchesStrategicMerge:
 resources:
 - ../../base
 <%if eq (index .Params `userAuth`) "yes" %>#<% end %>- ingress.yml
+- pdb.yml
 <%if eq (index .Params `userAuth`) "yes" %>- auth.yml
 <% end %>
 
diff --git a/templates/kubernetes/overlays/production/pdb.yml b/templates/kubernetes/overlays/production/pdb.yml
@@ -3,7 +3,6 @@ apiVersion: policy/v1beta1
 kind: PodDisruptionBudget
 metadata:
   name: <% .Name %>
-  namespace: <% .Name %>
 spec:
   minAvailable: 2
   selector:
diff --git a/templates/kubernetes/overlays/staging/ingress.yml b/templates/kubernetes/overlays/staging/ingress.yml
@@ -2,7 +2,6 @@ apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   name: <% .Name %>
-  namespace: <% .Name %>
   annotations:
     # nginx ingress
     kubernetes.io/ingress.class: nginx
