From fa7855a99d57d77cea73261abbc159ed4b0c530f Mon Sep 17 00:00:00 2001
From: Evgeni Gordeev <egordeev@conserviscorp.com>
Date: Tue, 16 Jun 2020 16:59:56 -0500
Subject: [PATCH] get rid of test-connection pods for hello-world and httpbin

---
 .../local-environment/kubernetes/Chart.lock   |  8 +--
 .../local-environment/kubernetes/Chart.yaml   |  4 +-
 contrib/local-environment/kubernetes/Makefile |  2 +-
 .../kubernetes/oauth2-proxy-example-full.yaml | 58 +++----------------
 4 files changed, 15 insertions(+), 57 deletions(-)

diff --git a/contrib/local-environment/kubernetes/Chart.lock b/contrib/local-environment/kubernetes/Chart.lock
index c637ff5f..d174dc7e 100644
--- a/contrib/local-environment/kubernetes/Chart.lock
+++ b/contrib/local-environment/kubernetes/Chart.lock
@@ -7,9 +7,9 @@ dependencies:
   version: 3.1.0
 - name: httpbin
   repository: https://conservis.github.io/helm-charts
-  version: 1.0.0
+  version: 1.0.1
 - name: hello-world
   repository: https://conservis.github.io/helm-charts
-  version: 1.0.0
-digest: sha256:2791284a47750de56455cbe41b8587b2ef953111663ea9a99ef58aab4ae9734b
-generated: "2020-06-16T16:39:06.668252-05:00"
+  version: 1.0.1
+digest: sha256:ce64f06102abb551ee23b6de7b4cec3537f4900de89412458e53760781005aac
+generated: "2020-06-16T16:59:19.126187-05:00"
diff --git a/contrib/local-environment/kubernetes/Chart.yaml b/contrib/local-environment/kubernetes/Chart.yaml
index 7e7bd69d..7fafe4fb 100644
--- a/contrib/local-environment/kubernetes/Chart.yaml
+++ b/contrib/local-environment/kubernetes/Chart.yaml
@@ -12,8 +12,8 @@ dependencies:
     repository: https://kubernetes-charts.storage.googleapis.com
   # https://github.com/postmanlabs/httpbin/issues/549 is still in progress, for now using a non-official chart
   - name: httpbin
-    version: 1.0.0
+    version: 1.0.1
     repository: https://conservis.github.io/helm-charts
   - name: hello-world
-    version: 1.0.0
+    version: 1.0.1
     repository: https://conservis.github.io/helm-charts
diff --git a/contrib/local-environment/kubernetes/Makefile b/contrib/local-environment/kubernetes/Makefile
index 2e70af3d..917207ac 100644
--- a/contrib/local-environment/kubernetes/Makefile
+++ b/contrib/local-environment/kubernetes/Makefile
@@ -62,5 +62,5 @@ helm-undeploy:
 
 # creates K8S manifest from helm chart
 .PHONY: helm-create-manifest
-helm-create-manifest:
+helm-create-manifest: helm-init
 	helm template --namespace default oauth2-proxy-example . > oauth2-proxy-example-full.yaml
diff --git a/contrib/local-environment/kubernetes/oauth2-proxy-example-full.yaml b/contrib/local-environment/kubernetes/oauth2-proxy-example-full.yaml
index a0a6af4c..5bf137c6 100644
--- a/contrib/local-environment/kubernetes/oauth2-proxy-example-full.yaml
+++ b/contrib/local-environment/kubernetes/oauth2-proxy-example-full.yaml
@@ -17,7 +17,7 @@ kind: ServiceAccount
 metadata:
   name: oauth2-proxy-example-hello-world
   labels:
-    helm.sh/chart: hello-world-1.0.0
+    helm.sh/chart: hello-world-1.0.1
     app.kubernetes.io/name: hello-world
     app.kubernetes.io/instance: oauth2-proxy-example
     app.kubernetes.io/version: "1.0.0"
@@ -29,7 +29,7 @@ kind: ServiceAccount
 metadata:
   name: oauth2-proxy-example-httpbin
   labels:
-    helm.sh/chart: httpbin-1.0.0
+    helm.sh/chart: httpbin-1.0.1
     app.kubernetes.io/name: httpbin
     app.kubernetes.io/instance: oauth2-proxy-example
     app.kubernetes.io/version: "latest"
@@ -167,7 +167,7 @@ kind: Service
 metadata:
   name: oauth2-proxy-example-hello-world
   labels:
-    helm.sh/chart: hello-world-1.0.0
+    helm.sh/chart: hello-world-1.0.1
     app.kubernetes.io/name: hello-world
     app.kubernetes.io/instance: oauth2-proxy-example
     app.kubernetes.io/version: "1.0.0"
@@ -189,7 +189,7 @@ kind: Service
 metadata:
   name: oauth2-proxy-example-httpbin
   labels:
-    helm.sh/chart: httpbin-1.0.0
+    helm.sh/chart: httpbin-1.0.1
     app.kubernetes.io/name: httpbin
     app.kubernetes.io/instance: oauth2-proxy-example
     app.kubernetes.io/version: "latest"
@@ -312,7 +312,7 @@ kind: Deployment
 metadata:
   name: oauth2-proxy-example-hello-world
   labels:
-    helm.sh/chart: hello-world-1.0.0
+    helm.sh/chart: hello-world-1.0.1
     app.kubernetes.io/name: hello-world
     app.kubernetes.io/instance: oauth2-proxy-example
     app.kubernetes.io/version: "1.0.0"
@@ -359,7 +359,7 @@ kind: Deployment
 metadata:
   name: oauth2-proxy-example-httpbin
   labels:
-    helm.sh/chart: httpbin-1.0.0
+    helm.sh/chart: httpbin-1.0.1
     app.kubernetes.io/name: httpbin
     app.kubernetes.io/instance: oauth2-proxy-example
     app.kubernetes.io/version: "latest"
@@ -495,7 +495,7 @@ kind: Ingress
 metadata:
   name: oauth2-proxy-example-hello-world
   labels:
-    helm.sh/chart: hello-world-1.0.0
+    helm.sh/chart: hello-world-1.0.1
     app.kubernetes.io/name: hello-world
     app.kubernetes.io/instance: oauth2-proxy-example
     app.kubernetes.io/version: "1.0.0"
@@ -520,7 +520,7 @@ kind: Ingress
 metadata:
   name: oauth2-proxy-example-httpbin
   labels:
-    helm.sh/chart: httpbin-1.0.0
+    helm.sh/chart: httpbin-1.0.1
     app.kubernetes.io/name: httpbin
     app.kubernetes.io/instance: oauth2-proxy-example
     app.kubernetes.io/version: "latest"
@@ -561,45 +561,3 @@ spec:
             backend:
               serviceName: oauth2-proxy-example-oauth2-proxy-sample
               servicePort: 80
----
-# Source: kubernetes/charts/hello-world/templates/tests/test-connection.yaml
-apiVersion: v1
-kind: Pod
-metadata:
-  name: "oauth2-proxy-example-hello-world-test-connection"
-  labels:
-    helm.sh/chart: hello-world-1.0.0
-    app.kubernetes.io/name: hello-world
-    app.kubernetes.io/instance: oauth2-proxy-example
-    app.kubernetes.io/version: "1.0.0"
-    app.kubernetes.io/managed-by: Helm
-  annotations:
-    "helm.sh/hook": test-success
-spec:
-  containers:
-    - name: wget
-      image: busybox
-      command: ['wget']
-      args: ['oauth2-proxy-example-hello-world:9080']
-  restartPolicy: Never
----
-# Source: kubernetes/charts/httpbin/templates/tests/test-connection.yaml
-apiVersion: v1
-kind: Pod
-metadata:
-  name: "oauth2-proxy-example-httpbin-test-connection"
-  labels:
-    helm.sh/chart: httpbin-1.0.0
-    app.kubernetes.io/name: httpbin
-    app.kubernetes.io/instance: oauth2-proxy-example
-    app.kubernetes.io/version: "latest"
-    app.kubernetes.io/managed-by: Helm
-  annotations:
-    "helm.sh/hook": test-success
-spec:
-  containers:
-    - name: wget
-      image: busybox
-      command: ['wget']
-      args: ['oauth2-proxy-example-httpbin:80']
-  restartPolicy: Never