From e6b9eca33f1fd27bcb2fc69569ee2602c144a198 Mon Sep 17 00:00:00 2001
From: "Petti, Ken" <kpetti@constantcontact.com>
Date: Thu, 26 Mar 2020 22:56:17 -0400
Subject: [PATCH] removing namespaces

---
 helm-guestbook/templates/deployment.yaml      |  9 +---
 .../templates/front-end-dep.yaml              |  1 -
 .../templates/front-end-svc.yaml              |  1 -
 sock-shop/base/front-end-dep.yaml             | 51 -------------------
 sock-shop/base/front-end-svc.yaml             | 15 ------
 5 files changed, 2 insertions(+), 75 deletions(-)
 delete mode 100644 sock-shop/base/front-end-dep.yaml
 delete mode 100644 sock-shop/base/front-end-svc.yaml

diff --git a/helm-guestbook/templates/deployment.yaml b/helm-guestbook/templates/deployment.yaml
index b99a6df..980df25 100644
--- a/helm-guestbook/templates/deployment.yaml
+++ b/helm-guestbook/templates/deployment.yaml
@@ -1,5 +1,5 @@
-apiVersion: argoproj.io/v1alpha1
-kind: Rollout
+apiVersion: apps/v1
+kind: Deployment
 metadata:
   name: {{ template "helm-guestbook.fullname" . }}
   labels:
@@ -50,8 +50,3 @@ spec:
       tolerations:
 {{ toYaml . | indent 8 }}
     {{- end }}
-  strategy:
-    canary: # A new field that used to provide configurable options for a Canary strategy
-      steps:
-      - setWeight: 20
-      - pause: {}
diff --git a/helm-socks-frontend/templates/front-end-dep.yaml b/helm-socks-frontend/templates/front-end-dep.yaml
index 39b752f..b2f75ad 100644
--- a/helm-socks-frontend/templates/front-end-dep.yaml
+++ b/helm-socks-frontend/templates/front-end-dep.yaml
@@ -3,7 +3,6 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "helm-socks-frontend.fullname" . }}
-  namespace: {{ include "helm-socks-frontend.fullname" . }}
   labels:
     {{- include "helm-socks-frontend.labels" . | nindent 4 }}
 spec:
diff --git a/helm-socks-frontend/templates/front-end-svc.yaml b/helm-socks-frontend/templates/front-end-svc.yaml
index f5f8f6c..47d575a 100644
--- a/helm-socks-frontend/templates/front-end-svc.yaml
+++ b/helm-socks-frontend/templates/front-end-svc.yaml
@@ -3,7 +3,6 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "helm-socks-frontend.fullname" . }}
-  namespace: {{ include "helm-socks-frontend.fullname" . }}
   labels:
     {{- include "helm-socks-frontend.labels" . | nindent 4 }}
   annotations:
diff --git a/sock-shop/base/front-end-dep.yaml b/sock-shop/base/front-end-dep.yaml
deleted file mode 100644
index 069c5ef..0000000
--- a/sock-shop/base/front-end-dep.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: front-end
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      name: front-end
-  template:
-    metadata:
-      labels:
-        name: front-end
-    spec:
-      containers:
-      - name: front-end
-        image: weaveworksdemos/front-end:0.3.12
-        resources:
-          limits:
-            cpu: 300m
-            memory: 1000Mi
-          requests:
-            cpu: 100m
-            memory: 300Mi
-        ports:
-        - containerPort: 8079
-        env:
-        - name: SESSION_REDIS
-          value: "true"
-        securityContext:
-          runAsNonRoot: true
-          runAsUser: 10001
-          capabilities:
-            drop:
-              - all
-          readOnlyRootFilesystem: true
-        livenessProbe:
-          httpGet:
-            path: /
-            port: 8079
-          initialDelaySeconds: 300
-          periodSeconds: 3
-        readinessProbe:
-          httpGet:
-            path: /
-            port: 8079
-          initialDelaySeconds: 30
-          periodSeconds: 3
-      nodeSelector:
-        beta.kubernetes.io/os: linux
diff --git a/sock-shop/base/front-end-svc.yaml b/sock-shop/base/front-end-svc.yaml
deleted file mode 100644
index 5249bb4..0000000
--- a/sock-shop/base/front-end-svc.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: front-end
-  labels:
-    name: front-end
-spec:
-  type: LoadBalancer
-  ports:
-  - port: 80
-    targetPort: 8079
-    nodePort: 30001
-  selector:
-    name: front-end