Repository: kumahq/kuma
Pull request #1235 (2020-11-30 14:02:26)

fix(kuma-cp) do not replace autogenerated certs (bp #1215)
This is an automated backport of pull request #1215 done by Mergify

Cherry-pick of dc26d880fc4062006ec94e258ffd26c7b0f44fe0 has failed:
```
On branch mergify/bp/release-1.0/pr-1215
Your branch is up to date with 'origin/release-1.0'.

You are currently cherry-picking commit dc26d880.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

	modified:   app/kumactl/cmd/completion/testdata/bash.golden
	modified:   app/kumactl/cmd/completion/testdata/zsh.golden
	modified:   app/kumactl/cmd/install/install_control_plane.go
	modified:   app/kumactl/cmd/install/install_control_plane_test.go
	modified:   app/kumactl/cmd/install/install_dns.go
	modified:   app/kumactl/cmd/install/render_helm_files.go
	new file:   app/kumactl/pkg/install/k8s/client_config.go
	deleted:    app/kumactl/pkg/k8s/client.go
	deleted:    app/kumactl/pkg/k8s/config.go
	deleted:    app/kumactl/pkg/k8s/fake/client.go
	deleted:    app/kumactl/pkg/k8s/fake/config.go
	deleted:    app/kumactl/pkg/k8s/k8s_suite_test.go
	deleted:    app/kumactl/pkg/k8s/kubectl_proxy.go
	deleted:    app/kumactl/pkg/k8s/proxy.go
	deleted:    app/kumactl/pkg/k8s/proxy_test.go
	modified:   deployments/charts/kuma/templates/cp-webhooks-and-secrets.yaml
	modified:   docs/cmd/kumactl/HELP.md
	modified:   mk/e2e.mk
	modified:   test/framework/k8s_controlplane.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   app/kumactl/pkg/install/k8s/control-plane/helmtemplates_vfsdata.go

```

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/
---


<details>
<summary>Mergify commands and options</summary>

<br />

More conditions and actions can be found in the [documentation](https://docs.mergify.io/).

You can also trigger Mergify actions by commenting on this pull request:

- `@Mergifyio refresh` will re-evaluate the rules
- `@Mergifyio rebase` will rebase this PR on its base branch
- `@Mergifyio update` will merge the base branch into this PR
- `@Mergifyio backport <destination>` will backport this PR on `<destination>` branch

Additionally, on Mergify [dashboard](https://dashboard.mergify.io/) you can:

- look at your merge queues
- generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/
</details>



Patch:
diff --git a/app/kumactl/cmd/install/install_control_plane.go b/app/kumactl/cmd/install/install_control_plane.go
index cea009956..14b3666be 100644
--- a/app/kumactl/cmd/install/install_control_plane.go
+++ b/app/kumactl/cmd/install/install_control_plane.go
@@ -3,6 +3,8 @@ package install
 import (
 	"net/url"
 
+	"k8s.io/client-go/rest"
+
 	"github.com/kumahq/kuma/app/kumactl/pkg/install/k8s"
 	kuma_version "github.com/kumahq/kuma/pkg/version"
 
@@ -60,6 +62,7 @@ type InstallControlPlaneArgs struct {
 	Ingress_mesh                                 string            `helm:"ingress.mesh"`
 	Ingress_drainTime                            string            `helm:"ingress.drainTime"`
 	Ingress_service_type                         string            `helm:"ingress.service.type"`
+	WithoutKubernetesConnection                  bool              // there is no HELM equivalent, HELM always require connection to Kubernetes
 }
 
 type ImageEnvSecret struct {
@@ -109,7 +112,8 @@ func newInstallControlPlaneCmd(pctx *kumactl_cmd.RootContext) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "control-plane",
 		Short: "Install Kuma Control Plane on Kubernetes",
-		Long:  `Install Kuma Control Plane on Kubernetes in a 'kuma-system' namespace.`,
+		Long: `Install Kuma Control Plane on Kubernetes in a 'kuma-system' namespace.
+This command requires that the KUBECONFIG environment is set`,
 		RunE: func(cmd *cobra.Command, _ []string) error {
 			if err := validateArgs(args); err != nil {
 				return err
@@ -123,12 +127,21 @@ func newInstallControlPlaneCmd(pctx *kumactl_cmd.RootContext) *cobra.Command {
 				args.Ingress_service_type = "NodePort"
 			}
 
+			var kubeClientConfig *rest.Config
+			if !args.WithoutKubernetesConnection {
+				var err error
+				kubeClientConfig, err = k8s.DefaultClientConfig()
+				if err != nil {
+					return errors.Wrap(err, "could not detect Kubernetes configuration")
+				}
+			}
+
 			templateFiles, err := InstallCpTemplateFilesFn(args)
 			if err != nil {
 				return errors.Wrap(err, "Failed to read template files")
 			}
 
-			renderedFiles, err := renderHelmFiles(templateFiles, args)
+			renderedFiles, err := renderHelmFiles(templateFiles, args, kubeClientConfig)
 			if err != nil {
 				return errors.Wrap(err, "Failed to render helm template files")
 			}
@@ -183,6 +196,7 @@ func newInstallControlPlaneCmd(pctx *kumactl_cmd.RootContext) *cobra.Command {
 	cmd.Flags().BoolVar(&args.Ingress_enabled, "ingress-enabled", args.Cni_enabled, "install Kuma with an Ingress deployment, using the Data Plane image")
 	cmd.Flags().StringVar(&args.Ingress_drainTime, "ingress-drain-time", args.Ingress_drainTime, "drain time for Envoy proxy")
 	cmd.Flags().BoolVar(&ingressUseNodePort, "ingress-use-node-port", false, "use NodePort instead of LoadBalancer for the Ingress Service")
+	cmd.Flags().BoolVar(&args.WithoutKubernetesConnection, "without-kubernetes-connection", false, "install without connection to Kubernetes cluster. This can be used for initial Kuma installation, but not for upgrades")
 	return cmd
 }
 
diff --git a/app/kumactl/cmd/install/install_dns.go b/app/kumactl/cmd/install/install_dns.go
index d2a0bdce5..a4202c601 100644
--- a/app/kumactl/cmd/install/install_dns.go
+++ b/app/kumactl/cmd/install/install_dns.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"os"
 	"regexp"
 	"strings"
 
@@ -16,11 +15,11 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
 	_ "k8s.io/client-go/plugin/pkg/client/auth"
-	"k8s.io/client-go/tools/clientcmd"
+
+	"github.com/kumahq/kuma/app/kumactl/pkg/install/k8s"
 )
 
 const (
-	defaultKubeConfig     = "$HOME/.kube/config"
 	corednsAppendTemplate = `mesh:53 {
         errors
         cache 3
@@ -51,17 +50,12 @@ func newInstallDNS() *cobra.Command {
 		Long: `Install the DNS forwarding to the CoreDNS ConfigMap in the configured Kubernetes Cluster.
 This command requires that the KUBECONFIG environment is set`,
 		RunE: func(cmd *cobra.Command, _ []string) error {
-			kubeconfigPath := os.Getenv("KUBECONFIG")
-			if kubeconfigPath == "" {
-				kubeconfigPath = os.ExpandEnv(defaultKubeConfig)
-			}
-
-			config, err := clientcmd.BuildConfigFromFlags("", kubeconfigPath)
+			kubeClientConfig, err := k8s.DefaultClientConfig()
 			if err != nil {
-				return err
+				return errors.Wrap(err, "could not detect Kubernetes configuration")
 			}
 
-			clientset, err := kubernetes.NewForConfig(config)
+			clientset, err := kubernetes.NewForConfig(kubeClientConfig)
 			if err != nil {
 				return err
 			}
diff --git a/app/kumactl/cmd/install/render_helm_files.go b/app/kumactl/cmd/install/render_helm_files.go
index b756c67bf..afb6ca729 100644
--- a/app/kumactl/cmd/install/render_helm_files.go
+++ b/app/kumactl/cmd/install/render_helm_files.go
@@ -12,6 +12,7 @@ import (
 	"helm.sh/helm/v3/pkg/chart/loader"
 	"helm.sh/helm/v3/pkg/chartutil"
 	"helm.sh/helm/v3/pkg/engine"
+	"k8s.io/client-go/rest"
 
 	"github.com/kumahq/kuma/app/kumactl/pkg/install/data"
 )
@@ -37,7 +38,7 @@ metadata:
 `, namespace)
 }
 
-func renderHelmFiles(templates []data.File, args interface{}) ([]data.File, error) {
+func renderHelmFiles(templates []data.File, args interface{}, kubeClientConfig *rest.Config) ([]data.File, error) {
 	chart, err := loadCharts(templates)
 	if err != nil {
 		return nil, errors.Errorf("Failed to load charts: %s", err)
@@ -56,7 +57,12 @@ func renderHelmFiles(templates []data.File, args interface{}) ([]data.File, erro
 		return nil, errors.Errorf("Failed to render values: %s", err)
 	}
 
-	files, err := engine.Render(chart, valuesToRender)
+	var files map[string]string
+	if kubeClientConfig == nil {
+		files, err = engine.Render(chart, valuesToRender)
+	} else {
+		files, err = engine.RenderWithClient(chart, valuesToRender, kubeClientConfig)
+	}
 	if err != nil {
 		return nil, errors.Errorf("Failed to render templates: %s", err)
 	}
diff --git a/app/kumactl/pkg/install/k8s/client_config.go b/app/kumactl/pkg/install/k8s/client_config.go
new file mode 100644
index 000000000..1fa9ef77a
--- /dev/null
+++ b/app/kumactl/pkg/install/k8s/client_config.go
@@ -0,0 +1,23 @@
+package k8s
+
+import (
+	"errors"
+
+	"k8s.io/client-go/rest"
+	"k8s.io/client-go/tools/clientcmd"
+)
+
+func DefaultClientConfig() (*rest.Config, error) {
+	loadingRules := clientcmd.NewDefaultClientConfigLoadingRules()
+	configOverrides := &clientcmd.ConfigOverrides{}
+	clientConfig := clientcmd.NewNonInteractiveDeferredLoadingClientConfig(loadingRules, configOverrides)
+	config, err := clientConfig.ClientConfig()
+	if err != nil {
+		// translate default error since it's confusing. What user really wants to set is KUBECONFIG, not KUBERNETES_MASTER
+		if err.Error() == ("invalid configuration: " + clientcmd.ErrEmptyConfig.Error()) {
+			return nil, errors.New("make sure you set KUBECONFIG environment variable to a valid Kubernetes config file")
+		}
+		return nil, err
+	}
+	return config, nil
+}
diff --git a/app/kumactl/pkg/install/k8s/control-plane/helmtemplates_vfsdata.go b/app/kumactl/pkg/install/k8s/control-plane/helmtemplates_vfsdata.go
index 4948eb039..f8218e816 100644
--- a/app/kumactl/pkg/install/k8s/control-plane/helmtemplates_vfsdata.go
+++ b/app/kumactl/pkg/install/k8s/control-plane/helmtemplates_vfsdata.go
@@ -21,7 +21,7 @@ var HelmTemplates = func() http.FileSystem {
 	fs := vfsgen۰FS{
 		"/": &vfsgen۰DirInfo{
 			name:    "/",
-			modTime: time.Date(2020, 11, 30, 12, 56, 31, 42206067, time.UTC),
+			modTime: time.Date(2020, 11, 30, 14, 21, 9, 348568783, time.UTC),
 		},
 		"/.helmignore": &vfsgen۰CompressedFileInfo{
 			name:             ".helmignore",
@@ -39,14 +39,14 @@ var HelmTemplates = func() http.FileSystem {
 		},
 		"/README.md": &vfsgen۰CompressedFileInfo{
 			name:             "README.md",
-			modTime:          time.Date(2020, 11, 30, 12, 56, 31, 40624455, time.UTC),
+			modTime:          time.Date(2020, 11, 30, 14, 21, 9, 347561108, time.UTC),
 			uncompressedSize: 13866,
 
 			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x02\xff\xcc\x5b\x5b\x73\xdb\xb6\x12\x7e\xe7\xaf\xd8\x13\x3f\x34\xe9\xb1\xa8\xf4\x3a\x1d\xbf\xb9\xf6\xf4\xd4\xd3\xd4\xa3\x89\xd3\x76\xce\x38\x9e\x10\x22\x56\x14\x22\x10\x60\xb1\xa0\x1c\xb5\xea\x7f\x3f\xb3\xe0\x45\xb6\x75\x97\xa9\x9e\xfa\x25\x8c\x08\x60\xf9\x61\x3f\x2c\xf6\x02\xdc\xfe\xeb\xf6\xee\x76\x52\xe6\xa2\xa7\x6d\x66\xef\xea\xe7\xd2\xe9\xbb\x28\x3a\x01\xfe\x4f\x14\xbd\x1b\x63\x78\x82\x74\x2c\x9c\x07\x2a\x8b\xc2\x3a\x4f\x20\xb4\x06\x3f\x46\x18\xa1\xf0\xa5\x43\x02\x61\x24\xd8\xc2\x2b\x6b\x08\x0a\x67\xa7\x4a\xa2\x84\xe1\x0c\x12\xee\x9d\x7a\x0d\xca\x90\xe7\x5e\xa9\x35\xde\x59\xdd\x2b\xb4\x30\x98\xc4\x41\xc2\x93\xc1\x7f\x44\x9d\xc3\xf4\xab\x7f\xc7\x51\x74\x72\x02\xbf\x0a\x5d\x22\x45\xd1\x1c\x06\xc2\x89\x1c\x3d\x3a\xd8\xf9\x6f\x0e\x97\x48\xa9\x53\xe1\xcb\xe0\x58\x7f\x2c\x65\x24\x4a\xed\x0f\xe8\x1a\xcd\x7b\x07\xfc\x1d\xd4\xe9\xef\x94\x32\x8f\xe6\x90\x64\xda\x0e\x85\x8e\x55\x2e\x32\x8c\x1d\x66\x8a\xbc\x9b\x25\xbb\xcd\x64\xd3\x1c\x46\xd6\x05\xba\xfd\xc4\x34\x0c\x43\xd1\xf3\xf5\x95\x4c\xac\xc9\x7a\xd2\xa6\x13\x74\xbd\xc0\xfb\xea\x39\x1e\x2a\xe3\x9d\x98\xc5\xca\x26\xeb\xf4\xf5\x04\x97\x17\x59\xb2\x07\x43\xbc\xc8\x8e\x01\xa9\x96\x62\x94\x3e\x05\x59\x89\x22\xf0\x16\x2e\x78\x69\xc5\xe7\x45\xf1\x2b\x3a\xda\xb0\x06\x02\xae\x42\xf8\x74\x7c\x33\x23\x8f\xf9\xb5\xc8\x91\x0a\x91\x62\xb2\x45\xe2\x80\xfb\x04\x5b\xe0\x50\xa3\x20\x04\xd3\x74\x85\x7b\xe5\xab\x57\x01\x28\x85\x81\x41\x8b\x21\xea\xbd\xf5\xe5\x5d\x89\x09\x1c\xb4\xbe\x20\xa9\x6d\xce\x80\x4d\x4e\xac\x6d\xf6\x06\xa7\xa8\xb7\xf0\x30\x7c\xf2\xc5\x00\xb4\xcd\x40\x73\xfb\x33\xb0\x06\xc1\x8e\xc0\x8e\x46\xef\xe7\xca\x8c\xec\xfb\xb9\xc4\x61\x99\x3d\x8b\x87\x3c\x4e\x37\xb8\x72\x2b\xb7\xcf\xd0\x02\x17\x37\xa7\x16\x13\x79\x61\xa4\xd0\xd6\xe0\xfb\xb9\xc3\xdc\x7a\x7c\x3f\xaf\x58\x7e\x20\xae\xc5\x80\xc9\x33\x71\xfd\xb1\xcb\x18\x35\x2e\x6e\x1b\xf8\x77\x2c\x3b\x6f\x94\x3e\xb0\xeb\x12\xae\x89\xa4\xff\x84\x19\x3e\x97\xd2\x21\x51\xb2\x5a\xe2\x2f\x6f\xdf\xb0\x82\xaa\xa6\xad\xf6\xba\xc6\x75\x78\xd7\x25\x5c\xc6\x4a\xbc\x41\x8d\xa9\xb7\x2e\x59\x2f\xf1\xda\x4a\x84\xa6\x5d\xb0\x88\xad\xa1\xb8\xa8\x86\x83\x30\x1e\x14\x56\xd2\xe1\xeb\xeb\x4f\x98\x94\x43\x74\x06\x3d\x52\xac\x6c\xdf\xd2\x19\x68\x65\xca\x4f\xa7\x4f\x5e\x08\x97\x8e\xcf\x40\xe4\xf2\xdb\xaf\xe1\xaf\x64\x05\x2e\x87\x85\x56\xa9\xa0\x2d\x76\xe3\xba\xcc\x87\xe8\x58\x65\x4d\x07\x7e\x5e\x60\x1b\x74\xa2\xaf\x2f\xba\xd3\x97\x32\x1f\x83\x0e\x7e\x10\x4a\x97\x0e\x07\x56\xab\x74\x69\x93\x9e\x43\xfd\x1a\x8a\xf0\xbe\xc1\x94\x97\x5e\x78\x65\x32\xb8\xc7\xe1\xd8\xda\x09\xa8\xbc\xd0\x98\xa3\xf1\x95\xfb\xd7\xe2\xbe\xaa\xa5\x40\x6a\xf3\xc2\x1a\x34\x7e\xb5\xbe\xae\x32\x63\xdd\x01\x96\x7e\x19\x17\xa1\x9b\xaa\x14\x63\x36\x07\x1b\x78\x78\x53\x35\xab\xac\xc6\x23\x4d\x3d\x62\xe1\x3f\xc7\x6e\x34\xb8\xfc\xac\xd8\x05\x17\x37\x3b\x1e\xae\x0b\x5d\x92\x47\x77\x35\xe8\x0e\x97\x30\xc6\x32\xa9\xac\x59\xb1\xd4\xe6\x70\x2e\xa5\xe2\x97\x42\xc3\x83\x96\xec\xea\x14\xa5\x07\x6b\xd6\x01\xad\x87\xdf\x11\xd7\x9f\x7f\x75\xb6\xbe\xaa\x6d\xf4\x6d\xd8\x54\x6f\x66\x26\xbd\x59\xc5\xcb\xd5\x3c\xac\x8c\x7e\xaf\xea\x0b\xdc\xf9\x1f\xc4\xc3\x75\xb8\x1e\xf1\x72\x35\x0f\xbb\xc7\xf5\xc6\x0a\xf9\xbd\xd0\xc2\xa4\xfb\x44\x87\x7b\xe1\xe2\xd8\xf4\x01\xae\x81\x75\x81\x6e\xf7\x63\x95\x8e\x57\x21\x52\x04\xf8\xa9\xb0\x84\xf2\x19\xb8\xbe\xf9\xf6\xbb\x6f\x8e\xac\xaf\x47\xeb\x6d\xc7\xf5\xb5\x02\xee\xff\x6d\x7d\x35\xd1\x4e\x4c\x13\x55\xfc\x8c\x34\xbe\x70\x18\x3e\x3a\x79\x24\xf1\xb7\x31\xfa\x31\x6f\xcc\x0e\x8c\xf5\x8c\x87\xdb\x43\x1a\x1a\x9b\x2c\xc0\xaa\x87\x02\x1e\xe5\x40\x7f\xa3\xbb\x38\xc5\x21\xd9\xd2\xa5\xb8\xd1\xe1\x98\xc3\x3b\x36\x77\xdf\x11\xb4\xcd\x81\x0a\x4c\x83\x43\xd5\x99\xc3\xd1\xc4\x95\x6a\x34\x42\x47\x30\x14\x4c\x6a\x6b\x42\x0c\xb1\x37\x2e\xaf\x29\xce\xd0\xa0\x13\x3a\x26\x4c\x1d\xfa\xeb\xe5\x1d\x9a\xed\x06\xbf\x02\x3f\x16\x3e\xe4\x8c\x84\x62\x16\x6a\x8a\x53\xe7\x4f\x61\x82\x33\x7e\x08\x69\xa7\x54\x84\x47\x46\x5c\x38\xeb\x31\x0d\xfa\xac\x62\x6b\xd3\x4b\xab\x1d\x8a\xfd\x8e\xbc\x34\x2a\x15\x0f\x32\x41\x35\xae\xea\x6b\xd8\x63\xe1\xe1\x08\xf5\xa8\x47\x2a\x33\x1b\x17\xee\x66\x5c\xa9\xf8\xbe\x34\x52\x2f\x33\x61\x0e\xdf\x0b\xc2\x6f\xbf\x06\x34\xa9\x95\x28\xe1\xe2\x1c\x52\x74\x5e\x8d\xf8\xcb\x10\x5e\x32\x0d\x89\xb7\x00\x41\xa0\x0c\x6c\x99\xb9\x93\x0a\xfb\xab\xd5\xfa\xea\x0e\x97\x28\x14\x9b\x0b\x74\xeb\x34\xb6\xab\xbe\x56\x29\xe9\x7c\x70\xc5\x64\xfa\xf1\xdd\xbb\xc1\xcd\x4e\x3c\x14\xa5\xb7\xa9\x35\x23\x95\x95\x0e\x25\x8c\x9c\xcd\x61\x79\x6e\xf6\xc3\x95\x6a\x85\xc6\x5f\xa0\xf3\x74\xf3\x00\xe2\x1a\x5c\x5a\x91\xe7\xcd\x2c\x2e\x30\x7f\xa8\x3f\xaa\xdb\x09\x03\x22\x4d\x91\x08\x84\xcc\x95\x01\x34\xb2\xb0\xca\xf8\x10\x0b\x2c\x83\xee\x74\x5f\x66\x5c\x6d\x6c\xb9\x4e\x6b\x07\xea\x2b\x75\x96\x08\x36\x2d\xa9\xe3\xea\x6b\x22\xa9\xda\x73\x2e\x82\xba\x76\xc6\x55\x9b\x88\x6a\xaf\xbe\x17\x04\x25\x5b\x30\xde\x03\x54\x66\xe0\xa7\xcb\x9b\x26\xbe\xa6\x6a\xbe\xe0\x17\x7e\xcf\xe0\x2f\x06\x30\x45\x57\xa9\xb7\x45\xd9\xa9\xbe\xaa\x2c\x62\x51\x6a\xbd\x3a\xf4\x7a\x92\xb7\xb9\xe2\xe6\x83\xb6\x75\xc7\x79\x80\xe4\x6a\x74\x6d\xfd\xc0\x21\xa1\xf1\x49\x07\xb8\xb6\x64\x7d\x17\xb8\x42\xf3\x45\xd6\xb7\xfb\xbc\xcd\x29\x2b\x9d\x60\xcf\xac\xd6\x7a\x5c\x85\x25\xe5\xad\xdb\xa6\xaf\x06\x57\xd3\xbc\x63\x7d\x85\xdc\x75\x5a\x24\x5d\xf1\x70\x4b\x36\xfb\x29\x2e\x2f\xb2\x63\xe5\xd9\xba\xd2\x17\x9a\xe9\xaf\xc2\xd1\xb6\x3c\xf6\x03\xbf\x17\xcd\x54\x39\x6b\x72\x34\x1e\xa6\xc2\x29\x31\xd4\x8d\x65\xbf\x57\x5a\xc3\x10\xa1\x10\x54\x5b\x10\xde\xb0\x6b\x79\x50\x6c\x09\xa9\x3b\xf5\x7b\x2b\x8b\x9a\x6c\x8d\xd0\x43\x33\xb0\x53\x74\x4e\x49\xa4\x47\x9e\xe1\xcb\xff\x9e\xff\xfc\xa6\xf5\x45\x04\x01\x79\xa7\x4c\xf6\xea\xef\xce\x1f\x1a\x15\xa3\xe1\x69\x96\xc9\xae\x12\xaf\xea\x7a\x62\x80\x12\x0a\x0d\x17\xd7\x57\xa1\xca\x88\x42\xf2\x36\x5b\x38\xfb\x69\x06\xca\xa8\x76\x1f\xd8\x33\x34\x0c\xeb\x6b\x24\x34\x1d\xe2\xd0\xb7\xb8\xd2\x31\x4b\xde\x1f\x57\x85\x06\xea\xee\xbb\xb8\xda\x7f\x2f\x2e\x83\xfe\x52\xb9\x64\x67\x89\x37\x61\x53\xc6\x56\x4b\x8c\x51\x2a\x17\x92\x82\xb3\xee\x70\xf5\xd1\xa7\xfd\xd4\xa8\x7e\x5e\x6a\x5f\x52\xdf\xa0\x8f\x77\x99\xfc\x16\xd7\x50\x99\x83\x71\x0d\x95\x11\x6e\xd6\x39\xac\x80\x6b\x2a\x5c\x5f\xab\x61\xc0\x36\x54\x26\xd9\x9b\x87\xd6\x8c\xae\x37\xa5\x42\x37\xe0\x6a\x9c\xb7\xca\x05\xea\xae\xbe\xd2\xee\x5f\xf5\xf7\x25\x07\xf0\x70\xa7\x72\xde\x43\x7b\x78\x7d\x75\xd4\x9a\x5e\x27\x75\x3d\x5e\x5f\xbb\x94\x51\xb6\xd6\x53\x18\xed\x33\x0a\x28\x5d\xd7\x53\x8c\xda\xe7\x30\x40\xab\xaf\x63\xfa\x86\x35\xae\xba\xfc\xaf\xf6\x55\xda\x12\xae\x8d\x6e\xe1\x1a\x5c\xc7\xf0\x0d\x6b\x5c\xda\x0e\x27\x76\xaa\xf4\x4c\xf4\x6b\xab\xcb\xab\x2d\xd9\x17\xd7\x4e\x87\x1c\xda\x7c\xd4\x02\xdb\xb1\xfc\xc3\xe4\x75\xfc\x3a\xfe\xf2\xd0\xfd\x4b\x0a\x2f\xf6\x08\x52\x16\x79\x36\xf6\x35\x2e\x8f\x17\xab\x3c\xd7\xef\x5d\xc6\xb5\x8d\x8d\xab\x71\x75\xcd\xc7\xe7\xc6\x29\x4f\x71\x6d\x67\xe3\x2a\x5c\xdd\x73\xb1\x43\x7d\x19\xe5\xaf\x76\xe0\xe2\x13\x5c\xec\xdc\x1e\x81\x8c\xc7\xc1\xb5\x89\x8b\x1b\x70\x75\x48\xc6\x86\x87\x3c\x7e\xf2\x3c\x1e\xb6\xb8\x36\x73\x71\x2d\xae\x4e\xc9\xf8\x5c\x7d\x29\x93\x39\x24\xda\x23\x06\x9b\xc3\xd5\x08\xbc\x2b\xf1\x14\x94\x07\x89\x85\xb6\x33\x82\xab\x6a\x9c\xe0\x7d\xec\x99\x2a\x5c\x23\x25\x84\x29\x07\xc7\x95\x0d\xae\x9d\x8e\x6e\x34\x7e\xd4\xda\xf3\x1b\x0d\xba\x2e\xf4\xf5\xbc\xf3\x1b\x0d\x2e\xe9\x84\x32\xef\x54\xbe\xcb\xf9\x28\x6e\x16\x14\x53\x25\x41\xad\x96\x21\x8b\x8d\x1c\x15\x87\xac\x06\xf9\x3a\xb7\x21\x52\xaf\xa6\xa1\x00\x11\xc6\x57\x26\xdb\x1d\xd7\x57\xaf\xa9\x03\x5c\x3b\x1d\xdd\x68\xe3\x94\xe5\xba\x79\x77\x9a\xea\x26\xdf\xfb\x14\xd7\xc6\xa3\x1b\x4f\x70\x3d\xac\x9b\x77\x8f\xeb\x79\x75\xf3\xa7\xb8\x1e\x95\xc8\xd7\x48\x7c\x5c\x37\x6f\x10\x75\x50\x2c\x7f\xbc\xbe\x5e\xbf\x7e\xfd\x45\x67\xfa\xda\x78\x24\x65\x39\x7f\xb8\xbe\x6e\xde\xc0\xdd\xa7\x58\xde\x61\xfe\xb0\xc1\x95\x23\x8d\x77\x8d\x97\x43\x2d\xdc\xdb\x5a\x5f\x97\xc2\x8b\x2a\xcb\xd9\x40\x19\xa2\xb6\x26\x0b\x40\x9f\xa1\x2f\x79\xf8\xf9\xf9\xe8\xe4\x04\x2e\x4a\xf2\x36\x87\xb7\x75\x0d\x1c\x2e\x71\xc4\x7b\x2d\x6b\x20\x8a\xce\x9b\x2c\xe1\xc5\xdb\x4b\x02\xe1\x10\xb4\x15\x12\x25\x4c\x95\x08\x5a\xb9\x4d\x52\x27\x29\xb9\x7b\xc9\xff\xbc\x5a\xa4\x6f\x62\xf8\xc1\x3a\xc8\xad\x43\x90\xe8\x85\xd2\x28\x81\xe3\x7a\x97\x57\xdb\x98\x35\xf5\x90\x46\x86\x3b\x0b\xa7\x51\x51\x9d\x80\x76\x38\x42\xc7\x33\x72\xcb\xc3\x87\xeb\x0c\xd2\xa6\x65\x8e\xa6\xa2\xc5\xdd\xed\x18\x75\xde\x4b\x9d\xbc\xab\xee\x38\x5c\xa2\x46\xaf\x4c\x16\x45\xe7\x04\x85\x70\xa1\xb8\x78\xcb\x1d\x3f\x23\xd0\x2a\x57\x35\x9d\x16\x1d\x7b\x0f\x7f\x3d\xad\xbe\x23\x98\x71\x63\x3d\x1b\x71\xc9\x23\xa2\x84\xfb\x31\x56\xd4\x0b\x9e\x4f\x52\x5f\xb5\x50\xd4\x36\xe0\x8f\x8f\xf2\x92\x1e\xf5\xca\x85\x29\x85\xd6\xb3\x18\x7e\xe3\xfe\x61\xea\x1e\x76\xfa\xa9\x0d\xf5\xeb\x9f\xaa\x1b\x21\x8b\x33\x08\xc1\x60\x09\x0f\x13\x65\x42\x5e\xf9\x1e\xb5\x3e\x05\xb2\xe0\xc7\x8a\x80\xc6\xb6\xd4\x32\x62\x81\xd6\x20\xa4\xc2\xe1\xa8\x64\x71\x51\xf4\xce\x82\xac\x5b\x85\xa4\x6e\x32\x29\x87\x98\x7a\x9d\xf0\x6c\x7f\x6e\xd4\x27\x28\xb4\xf0\xac\x03\x3a\x05\x57\x9a\x33\x88\xa2\x24\x49\x68\x8c\x5a\x47\x75\x5b\xc8\xd0\x03\xeb\x12\xe6\x90\x39\x2c\xc2\x0d\x96\x58\x59\x98\x83\x77\xd0\x23\x78\x01\x2f\x60\x0e\x69\xe9\xa1\x27\xc3\x7f\x7a\xa3\x2f\x60\x0e\x9f\x84\xcb\x08\x9a\x41\x2a\x60\x3c\x4e\x14\x9d\x00\x6f\x9c\xfc\x3d\x1f\x7f\x5f\x96\xd2\xb3\xf0\x91\xac\x81\x39\x7c\xfc\x1d\x3e\x8b\x95\xc7\x9c\x6e\xef\xe2\x1c\xbd\x60\x8f\x31\x6c\x63\x30\x07\x0a\xc9\x99\x97\xf1\xdc\x23\xf9\x97\x2f\xe2\xcf\xf9\xb3\xde\xbf\x8f\x95\x7d\xf1\xea\xd5\x67\x9b\xe4\x27\x49\x12\x68\x72\x6d\x3d\xb6\x87\xfa\x41\xe2\x14\xb5\x2d\xd0\x51\xb4\xb8\x45\x53\x11\x3c\x94\x37\x95\xf1\xe8\x0c\xab\x11\x94\x59\xba\x88\x93\x9c\x32\x2d\x1c\x8e\x98\xde\xe1\x2a\x8f\xd5\xda\xde\xf3\x6e\xef\x4a\xcd\x0a\x2d\x0a\x3d\xab\xf8\x53\x4b\xe2\x77\x06\xef\x59\x90\x6f\x6f\xfe\x9c\x45\xf0\x39\xcb\x83\x24\x17\x13\x6c\xcf\x1c\xf4\x6b\x71\x4d\xd6\xa1\x3f\xf9\x8e\xfa\x8f\xef\xfe\x84\xfa\xeb\xcc\xa4\xd0\x2e\x92\x0a\x17\x33\x72\xe9\x6b\xc1\x63\xce\x9a\x47\x62\x79\xe1\xfa\x51\xf3\x43\xc5\x34\xf2\xdc\xb7\xe2\x4c\xe1\xb0\x97\x54\xe3\x14\x96\x3c\x3f\x3b\x04\x9b\x2b\xdf\x2e\x89\xc2\xd9\x14\x89\x18\xd2\xaa\xc9\x01\x88\xa2\xc5\x7d\xa8\x33\x18\x7b\x5f\xd0\x59\xbf\x5f\x33\xa9\x1f\x3d\xb8\x38\xf5\xf8\x6d\xaf\x28\x87\x5a\xa5\x3d\x41\x84\x9e\x62\xfa\x2a\x16\xb9\xf8\xc3\x1a\x71\x4f\x71\x6a\xf3\x7e\xdb\xaf\x37\xfd\x32\x2e\x4c\x16\x2d\x6c\xc1\x62\x20\xfe\x29\xa6\x71\x5f\xda\x94\xfa\x41\xaf\x1f\x86\x48\xfe\x43\xe1\xd8\x39\x4b\x91\xfa\x69\xb0\x78\x1f\x9a\x15\xf7\x41\x2e\x2c\x5e\x3f\x5a\x6d\x25\xd6\x0c\xef\x6d\xa1\x1a\x29\xd4\x3f\x79\xd0\xa3\x67\x0d\x0f\x42\xd1\xff\x02\x00\x00\xff\xff\xc8\xa7\x9d\xc5\x2a\x36\x00\x00"),
 		},
 		"/crds": &vfsgen۰DirInfo{
 			name:    "crds",
-			modTime: time.Date(2020, 11, 30, 12, 55, 36, 708937352, time.UTC),
+			modTime: time.Date(2020, 11, 30, 14, 20, 7, 254896677, time.UTC),
 		},
 		"/crds/circuit-breaker.yaml": &vfsgen۰CompressedFileInfo{
 			name:             "circuit-breaker.yaml",
@@ -155,7 +155,7 @@ var HelmTemplates = func() http.FileSystem {
 		},
 		"/templates": &vfsgen۰DirInfo{
 			name:    "templates",
-			modTime: time.Date(2020, 11, 30, 12, 56, 31, 41662500, time.UTC),
+			modTime: time.Date(2020, 11, 30, 14, 21, 9, 348218959, time.UTC),
 		},
 		"/templates/NOTES.txt": &vfsgen۰CompressedFileInfo{
 			name:             "NOTES.txt",
@@ -201,7 +201,7 @@ var HelmTemplates = func() http.FileSystem {
 		},
 		"/templates/cp-deployment.yaml": &vfsgen۰CompressedFileInfo{
 			name:             "cp-deployment.yaml",
-			modTime:          time.Date(2020, 11, 30, 12, 56, 31, 41415678, time.UTC),
+			modTime:          time.Date(2020, 11, 30, 14, 21, 9, 348025690, time.UTC),
 			uncompressedSize: 8582,
 
 			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x02\xff\xbc\x59\x4d\x6f\xdb\x3a\x16\xdd\xf7\x57\x10\x46\x17\xef\x01\x63\xbb\x69\x93\x4e\x21\xa0\x0b\xd5\x56\x53\x4d\x6c\xd9\x90\xe4\x00\x99\x8d\xc0\x48\x37\xb6\x60\x8a\x54\x49\xca\x6f\x3c\x69\xff\xfb\x80\x92\x1c\x7f\x51\xb2\x64\x7b\x5e\x57\x0e\x45\xde\x73\xce\xe5\xe5\xe1\x47\x71\x1a\x3f\x02\x17\x31\xa3\x06\xc2\x69\x2a\xfa\xab\x9b\x77\xcb\x98\x46\x06\x1a\x42\x4a\xd8\x3a\x01\x2a\xdf\x25\x20\x71\x84\x25\x36\xde\x21\x44\x71\x02\x06\x7a\x7d\x45\x31\x0d\x49\x16\x01\xea\x2c\xb3\x04\xf7\x54\x73\x07\xf5\xd0\xef\xdf\xdd\x90\x51\xc9\x19\xe9\xa6\x04\x53\x28\x47\x88\x14\x87\xc5\xb0\x9e\x0b\x04\xb0\x80\x9e\xb3\x69\x46\xbf\x7f\xbf\x43\x88\xe0\x67\x20\x42\x21\x20\xf4\xfa\xda\x3d\x08\x5f\x7c\x55\x00\xbf\x10\x8d\x69\x04\x54\xa2\xdb\x62\x20\x52\xbc\x0d\xa4\xba\x1d\x40\x8b\x14\x42\x15\x90\x43\x4a\xe2\x10\x8b\x02\xff\x11\x93\x0c\x44\xaf\xec\x3a\x55\x3d\x7b\x9b\x1e\x45\x44\x21\x39\x96\x30\x5f\x17\x64\x38\x23\x24\xa6\xf3\x59\x1a\x61\x09\x45\x13\x42\x09\xfe\x8f\x97\xf1\x39\x18\xe8\x66\xdb\x32\xa3\x78\x85\x63\x82\x9f\x09\x18\xe8\x83\x0a\x04\x04\x42\xc9\x78\x31\x2a\xc1\x32\x5c\x8c\x76\x64\xea\x84\x6e\x86\x8c\x34\x82\x3f\x6f\x04\x57\x4b\x46\x48\x42\x92\x92\x37\xa6\xbb\x33\x97\x8f\xa3\x94\x49\x2c\x63\x46\xdf\x38\x20\x14\x2e\x20\x5c\x8a\x2c\xe9\x87\x8c\xbe\xc4\xf3\xbd\xd9\xfd\x23\xe5\x31\x95\xe8\x7d\xcf\x2f\xe3\xf6\xbe\x61\x01\x53\x2c\x17\xa8\xd3\x0f\xd3\x6e\x31\x24\xc1\x69\x6f\x8d\x13\xd2\xf9\x33\x27\x2c\x16\xf8\xe3\xdd\x67\x91\x25\x5b\xc2\x3b\x28\x92\x88\xae\x80\x90\x83\x14\xad\xa0\xfe\x82\xe7\x05\x63\x4b\xd1\xc5\x34\xda\x04\x38\x81\x4a\xf6\xb2\xdd\x36\xdf\x5f\x76\xe9\x57\x67\x1c\xa1\x4d\xa1\xe5\xbf\x81\xaf\xe2\x10\xcc\x30\x64\x19\x95\x4e\xeb\xd5\xb2\xa1\xf9\x57\x2c\x17\xfa\x62\xa5\x2c\x02\xaf\xa4\xbd\x65\xb8\xdb\xba\x2b\x18\x49\xf6\x84\x13\x52\x25\x4c\x41\x01\x8d\xb6\x0d\x0a\x0a\xc7\x14\xf8\x4e\xda\xba\xe5\xaa\xd7\x71\x55\xff\xe2\x04\xcf\x75\x32\x5f\x18\x4f\xb0\xb4\xd5\xd7\x0e\xfa\x23\x8a\x43\x89\x3a\x71\xf1\x97\x56\x59\xfe\x0d\x75\x38\x63\xb2\x83\xde\xff\x89\x7e\xa1\x9f\x19\x93\xb0\x3b\x0d\x25\xd8\x34\x23\x64\xca\x48\x1c\xae\xab\x17\x75\xde\xb1\x97\xbe\xf5\xdc\x0f\x03\x74\x65\xec\xfc\xb9\x15\xf9\x30\x1b\x9b\x81\xe5\x3c\xda\xee\xc4\x19\x5b\x8e\xbf\xd7\x09\xa1\x95\x42\x32\x94\xc0\x67\xe0\x14\x24\x88\x4e\x75\x18\xcf\x9f\xb8\x56\xe0\x3f\x4d\xad\xcb\xa3\x3c\xcc\xbe\x59\xae\x63\xf9\x96\x17\x78\x4f\x9e\x6f\x8d\x03\xc7\x1c\x5b\xde\xd4\x1c\x54\x04\xd7\x9b\xad\x36\xa7\x07\x80\xf7\x96\x63\xb9\xe6\x28\xf0\x47\x5e\x30\xb0\x5c\x3f\xf8\x6e\x8f\x2a\x40\xfa\x2b\xcc\xfb\x3c\xa3\xfd\x72\x41\xf6\xf3\x89\x8f\x59\xbe\xca\x43\xe0\x52\xfd\xe8\x85\x5c\x36\x43\x7b\xb0\x9e\x2e\x06\x5b\xc2\x7a\x6f\x78\xbe\xe8\x5f\x10\xfc\xd4\x97\x49\xc2\x54\xbd\x72\x48\x98\x84\x4e\x6d\x5a\xc6\xb3\x91\x6f\xff\x7b\xe2\x58\x81\x6b\x8d\x27\xbe\x15\xdc\x8f\x26\xdf\xcc\x51\x60\x0e\x87\xae\xe5\x79\xd5\xb3\xa0\x83\x5d\x46\xe2\x9e\xb0\x67\x4c\xcc\x28\xe2\x20\xc4\x21\xf2\xd1\xc2\xd4\x10\x32\xa7\x76\xe0\x59\xee\xa3\xe5\x06\xae\x65\x0e\x83\x89\x33\x7a\xaa\x28\x34\xc9\x33\xa8\x29\x31\x77\xe6\xf8\xf6\x78\xaf\xc8\xcc\xe1\xd8\xf6\x3c\x7b\xe2\x6c\x20\xa6\x13\xb7\x6a\x31\xdc\xdd\xde\x7e\xba\x30\x7a\x5e\x67\x43\xdb\x3d\x73\xe6\x5b\x81\xdb\xce\xbf\xac\x81\x3f\x71\x83\x81\x63\x07\x96\x63\x7e\x1b\x59\xc3\xd3\xb3\x47\xe3\x1e\x50\xb5\xb9\x47\x8d\x16\x51\x1d\xae\x67\x0f\xad\x81\xe9\x06\x83\x89\xe3\x9b\xb6\x63\xb9\x81\x3d\x36\xef\xab\xd7\x71\x6b\x5b\x55\x7b\x7e\x0b\x4f\x3d\xa0\xfe\xc6\xd3\x76\x6c\xff\x6f\x21\x49\xe3\xa2\x6b\x4b\xa2\xb5\x73\x6b\x5e\xee\x5d\x21\xae\xb7\xae\xa1\xf5\xdd\x9c\x8d\x7c\x2f\xf0\x1e\xec\x69\x30\xb6\xbc\x1f\xc1\xc0\xb5\x4c\xdf\x9e\x38\xed\xdc\x20\x82\x17\x9c\x11\x29\x7a\x62\x19\xa7\x63\x10\x8b\x01\x87\xfc\x98\xd6\x28\x0d\xe3\xc9\xd0\x6a\x87\x97\x9b\x5e\x45\xe8\xd2\x2f\xb5\xe3\xfe\xcb\x28\xb4\xf3\x48\xf5\xbb\x1d\xb7\x1c\xa3\x86\x9b\xc6\x15\xeb\x28\xab\x2d\x01\xa7\xb1\x07\x7c\x05\xbc\x57\x4c\xb5\xda\x0e\x9b\x3a\xeb\x0f\xdf\x9f\x7a\x17\x6d\x85\x38\x8d\xbb\x22\x87\xef\x36\xdf\x15\xb5\x0c\xce\xdc\x1e\xab\x08\xe8\x76\xca\x8b\xb2\x1b\x92\x18\xa8\x1c\x00\x97\xc2\x6b\x9d\x68\x73\xe6\xff\x08\x06\x23\xdb\x72\xfc\x3c\xd5\xde\x19\xdb\xc1\x8e\xd2\x82\x4b\x2e\x56\xf4\xaf\x21\xf3\x6d\xc7\x6e\x57\x4a\xdb\x15\x51\x1e\x17\x1e\x86\x97\x95\xd3\x32\x12\xed\xcb\xa9\x92\xc5\x99\x25\x55\x45\xe2\x4a\x25\xb5\x8c\x84\x9b\x9f\xc8\x06\xf9\x2c\xb6\xcf\x75\xe9\x3e\x4a\xa5\x3b\x99\xf8\x6a\x37\x38\x53\x65\x59\x47\x75\x7b\x82\x56\xa4\x6a\xe4\x98\xce\x01\xbd\x5f\xc2\xfa\x1f\xe8\x7d\x0e\x86\x8c\xaf\x7a\xd5\x40\x57\x8f\x98\x8b\x2a\x79\xaf\xaf\x79\x18\xf4\x0b\x65\x69\x0a\xfc\xb0\xdb\xae\xa9\x96\x40\x5a\x07\x3d\xc5\x14\x08\x24\xea\x86\x58\xc5\xb2\x4c\x50\x1d\xcb\x32\x44\xcf\xa2\xab\x0a\x96\xdf\x39\x4b\x8c\x83\x0f\xea\xe2\xac\x42\x3f\xc0\xda\x85\x97\xe3\xaf\x48\x83\x50\x58\xcc\x31\x88\xfa\xb7\x84\xf5\x7e\xe7\x07\x58\x37\x48\x05\xe6\x73\x71\x78\x2d\xe4\x19\x3d\x68\xe9\x76\x09\x9b\x77\x09\xac\x80\x7c\xad\xda\xc5\x08\x9b\x8f\x54\x87\xe3\x54\x75\xcb\x47\x93\xee\x4b\x4c\xe0\x6b\x1f\x64\xb8\xad\xb7\xa3\xf7\x85\xf2\x4d\x26\x7f\xe7\xd8\x89\x93\x32\x2e\x8f\x88\xbe\x5d\xdd\xa7\x8c\x4b\x03\xdd\x7d\xfe\x72\x73\xb2\xc7\xc7\x13\x3d\x6e\x6f\x3f\xe9\x16\x2e\x85\xba\xcb\xd4\x3c\xb7\x49\xcd\x65\xea\x08\xff\x9f\x5f\x4e\xf5\xb8\xfb\x74\x30\xbb\x29\x67\x92\x85\x8c\x18\x68\x36\x9c\x9e\x9a\x4f\x12\xaf\x80\x82\x10\x53\xce\x9e\x61\x3f\x5f\x0b\x29\xd3\x7b\x90\x87\xa5\x96\x62\xb9\x30\x50\x7f\x01\x98\xc8\xc5\xfa\xf0\xe3\x26\x6d\x1f\x76\x3e\x70\xc0\x51\x7c\x16\x88\x1a\xd9\x10\x42\xb0\x8c\x87\x70\x30\xe5\x75\x2e\xfa\x36\xe4\xd8\x7a\x4f\x0d\xf8\xb5\x79\x33\xda\xbe\x18\xdd\x7c\xd4\x9e\xc4\x88\x80\xd3\x57\xeb\x8a\x6a\xe0\xf0\x33\x03\x71\x58\xc5\x08\x85\x69\x66\xa0\xbb\x0f\x1f\x92\x83\xf6\x04\x12\xc6\xd7\x06\xfa\x78\xf7\x79\x1c\xeb\xa9\xb4\x41\xb8\x69\x8e\xa0\xad\xac\x15\x23\x59\x02\x63\x96\xd1\xe3\x85\x58\x58\xd5\x1c\x28\x70\x4c\xba\xda\x2b\x2a\x42\x89\x1a\x3a\x2d\x0a\xa1\xd5\xed\xb6\xa8\xb8\x09\x25\x6b\x03\xa9\x6b\x7d\x95\x13\x37\x7b\x72\x2c\xcd\xa8\x86\x5c\xbd\x41\x35\xa5\x76\xcd\x23\xba\xe6\x3c\x7b\x46\x72\x4f\x47\xa9\x15\xa3\xdd\x46\xff\x0f\xc7\xe4\x8a\x23\xed\x65\x82\x6b\x22\x5d\x57\x74\xfb\x43\xb3\xe6\x64\x79\x86\xd6\xd3\x51\xae\xae\xb3\xe5\x81\x55\x73\xb6\x3c\x53\x67\x7d\x94\xe6\x3a\x0b\x4b\x3b\xfc\xef\x92\x1a\xd1\xa5\xc3\x55\x88\x6d\xe0\x83\xc5\xc0\x7d\xfb\xdc\x06\xab\x7e\x22\x38\x0d\xae\xdb\x13\xae\x43\xa8\xd2\x56\x8f\xc2\x69\x0a\xe9\x52\x17\x6c\xe6\x80\x97\xa4\xf5\x14\x83\x8b\x44\x9d\x34\xbe\xe6\xa6\x77\x1d\x8d\x27\x09\x9d\x21\xb7\x99\xe5\x35\xb3\xbb\x4b\x54\x36\xe3\x71\x9e\xc0\x06\x5e\xd7\xcc\xe7\x2e\x14\xd8\x80\x87\x46\xe0\x15\x0e\x49\x45\xc3\x18\xa7\xfb\xd4\xcf\x8c\xfb\xbf\x00\x00\x00\xff\xff\x75\x3f\x9f\x8a\x86\x21\x00\x00"),
@@ -215,7 +215,7 @@ var HelmTemplates = func() http.FileSystem {
 		},
 		"/templates/cp-rbac.yaml": &vfsgen۰CompressedFileInfo{
 			name:             "cp-rbac.yaml",
-			modTime:          time.Date(2020, 11, 30, 12, 55, 36, 753587874, time.UTC),
+			modTime:          time.Date(2020, 11, 30, 14, 20, 7, 285608872, time.UTC),
 			uncompressedSize: 3374,
 
 			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x02\xff\xd4\x56\x3b\x6f\xdb\x30\x10\xde\xfd\x2b\x08\x77\x2b\x20\x05\x05\x3a\x04\xde\xda\x0e\x5d\x8a\xa2\x48\x8a\xec\x34\xf5\xc9\xba\x9a\x3a\xaa\xe4\xd1\x49\xe3\xfa\xbf\x17\x94\x1d\xcb\xb5\x6c\x23\x56\x92\x3e\x34\x89\x47\xde\xeb\xbb\xa7\x6e\xe8\x06\x3e\x90\xe3\x89\x5a\xbc\x19\xcd\x89\x8b\x89\xba\x86\x5f\x90\xc1\x3b\x63\x5c\x64\x19\xd5\x10\x5d\x68\xd1\x93\x91\x52\xac\x6b\x4c\xd4\x72\xa9\x88\x8d\x8d\x05\xd4\x78\x1e\x6b\x9d\x27\xf2\x58\xe5\x6a\xb5\xca\x8c\x63\xf1\xce\x66\x8d\xd5\x8c\x0d\x47\x68\xb4\x59\xb3\xe5\x57\xb0\xd0\x01\xf9\xe7\x07\xb2\x5a\xad\x46\x4a\x59\x3d\x85\x0d\x49\xc3\x72\x99\xed\x09\x5f\xdf\x25\xf1\x3f\x15\x13\x17\x60\x51\x6f\x13\x5b\x96\x65\xa3\x5d\x07\xfc\x54\x9b\x5c\x47\xa9\x9c\xa7\x7b\x2d\xe4\x38\x9f\x5f\x86\x9c\xdc\xc5\xd6\xb5\x0f\x36\x06\x81\xbf\x72\x16\x4f\xf4\x6b\x90\xc5\x3e\x5a\xb4\x3c\x99\xd2\x0d\x7d\xf4\x2e\x36\xed\x31\x7d\x99\x1a\x8f\xdb\x5f\x8f\xe0\xa2\x37\xd8\xb9\xd9\x82\x18\xb6\xa4\xc6\x15\xdd\x21\xac\x23\xd6\x11\x8c\xe3\x92\x66\xb5\x6e\x3a\x12\xbb\x62\xf3\x60\x01\x3f\xdd\x11\x3e\x83\x6c\xff\x2d\x85\xee\x70\xab\xc5\x54\xe7\x1b\x8b\x05\x58\x0e\x6a\x32\x1e\x5a\xd0\xb9\x70\x4a\x7e\x0b\x24\xb9\x63\x4a\x52\xe0\xda\x50\x84\x3e\x89\x38\xd0\xac\x92\xee\xa6\x46\xa8\x76\x1e\xde\x3b\xde\x3b\x1d\xe4\xe8\x11\x1b\xef\xee\x7e\x08\xea\xc6\x6a\xd9\x11\x20\x5e\x97\x25\x99\x06\xbe\xa6\x90\x32\xb1\x77\xe5\x5d\x94\x81\xd8\x1f\x04\x2e\x36\xc5\x21\x1c\x37\x30\xc0\xa2\xbd\x1c\x02\xab\x21\x6f\x22\xc9\xd4\x43\xcf\xe1\x3b\x47\x70\x27\xf0\xac\x6d\x2f\xd1\x4a\x1d\xad\x10\x7f\x83\x91\xdf\x3c\xaf\xa0\xad\x54\xa6\x82\x99\xf7\xe0\xb0\x6e\xd6\xa3\x89\xdf\x66\xf7\x10\x88\xda\x1a\x2c\x15\xbe\xab\xfc\x46\xdb\x88\x90\x6f\xea\xf5\x4b\x4a\x88\xbc\x76\xa9\x36\x3d\x6a\x27\x18\xaf\x3b\xce\x13\x80\x4d\xca\xc0\x45\x92\xb3\xd1\xbb\x55\xca\x94\x83\xf5\xd4\xa2\x58\x6b\x39\x1c\x83\xcb\xf5\x4b\xc3\xa6\x3c\x11\x0b\x86\xdc\x3a\x3f\xcf\xb4\x88\x36\x55\x0d\x96\xac\x40\x49\x4c\x1d\xd2\xcf\x92\x4d\x1b\xbf\x76\xbc\x3a\xbb\xe4\x53\x33\xba\x28\x89\xb5\xa5\xfb\x87\xb4\xd9\xb3\x6d\xfc\x7a\x3c\x30\x27\xd7\xd5\xfb\x62\xe2\xbb\x4e\xf2\x28\x15\xaf\xd4\x42\x5b\x4a\x69\x92\xe2\xa8\xc4\xcd\xc1\x6a\x8a\xd2\x79\x28\x0a\x21\x82\x78\xa6\xea\xaf\x9f\xae\x95\x81\x97\x63\x36\xa5\x29\x05\x16\x32\xbb\x63\xea\x98\x85\xad\x0e\x8f\x05\xe1\xf6\x54\x5b\x7d\xda\x38\x7c\x4f\x5c\x10\xcf\xfe\xca\x54\x74\x16\x57\x28\x13\xd7\x03\x54\x27\xac\x1f\x29\xd5\x9f\xe5\xe7\xdb\x1a\xe2\x34\x35\xad\xcd\x34\x3e\xb8\xf8\x24\x74\xcf\x87\xe0\x71\x2b\xcf\x80\x60\x3d\xc3\xd2\xf2\x82\xcb\xd8\xd0\xd5\x26\xc0\x78\xc8\xbf\x31\x1c\x8f\x5b\xb9\xb7\x4f\xfd\x31\x43\x07\xa6\xc9\xf3\x14\xf3\x63\xb2\x65\x60\xed\xfe\x9f\x45\xfb\x2b\x00\x00\xff\xff\xc1\x34\x0e\x4c\x2e\x0d\x00\x00"),
@@ -229,14 +229,14 @@ var HelmTemplates = func() http.FileSystem {
 		},
 		"/templates/cp-webhooks-and-secrets.yaml": &vfsgen۰CompressedFileInfo{
 			name:             "cp-webhooks-and-secrets.yaml",
-			modTime:          time.Date(2020, 11, 30, 12, 55, 36, 754940870, time.UTC),
-			uncompressedSize: 5312,
+			modTime:          time.Date(2020, 11, 30, 14, 20, 7, 286370153, time.UTC),
+			uncompressedSize: 5849,
 
-			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x02\xff\xe4\x58\xdd\x6f\xdb\x36\x10\x7f\xd7\x5f\x41\x18\x2d\xd0\x16\xa0\x14\x27\x71\x90\x09\xe8\x43\xd7\xa6\xc5\xb0\xac\x08\x9a\x2c\x7b\xa6\xa8\x93\xc4\x99\x22\x35\xf2\xe4\xd4\x73\xfd\xbf\x0f\xa4\x3e\x2c\x39\x4e\xe2\x7e\x0c\xcb\x5a\x3f\x25\xf7\xc5\xbb\xfb\xfd\xee\x48\x68\xb5\xa2\xe4\x09\x67\x3f\xd7\x2a\x95\x40\xe2\x97\x24\xbc\x66\xb2\x06\x1b\x72\xad\xd0\x68\x79\x21\x99\x82\x10\xa5\x0d\x73\x50\x60\x98\x0c\x7b\xe3\xf5\x3a\x58\xad\xa2\x17\xc1\x3b\xaf\x40\x20\x1c\x0c\x8a\x4c\x70\x86\x60\x03\x0b\x10\x93\x02\xb1\xb2\x71\x14\x95\xcc\x22\x98\x52\xa8\xd4\x86\xb9\xc0\xa2\x4e\x42\xa1\x23\x5b\x19\x91\x47\xdc\x2c\x2b\xd4\x61\x81\xa5\xdc\x72\x82\x54\xd4\x65\xc8\x75\x19\xa9\x7a\xa1\x69\x6e\x74\x5d\x51\x04\x5e\x44\xa5\x5e\x00\x5d\xea\xda\x50\x77\xa6\xa5\xa8\x69\x01\xb2\xa4\xc7\xd9\x2c\x3b\x99\x1e\x1d\x9d\x32\xce\xc6\xc1\xda\x53\x7d\x30\xc0\x1b\x6d\xe6\x16\xcc\x42\x70\x28\xc1\x16\xbb\x44\x89\xd4\x49\x74\x7a\x70\xcc\xd2\xd9\xc1\xe1\x49\x92\xcc\xd2\x24\x3d\x3c\x9d\xf1\xc3\xc3\x83\x6c\x3a\x3b\xfa\x69\x96\xc1\xe1\x0c\x8e\x4f\xb2\x19\xa4\x49\x94\x42\x25\xf5\xb2\x04\x85\x36\x72\x99\x44\xca\x96\x11\x2f\x98\x41\x1b\xb1\xb4\x14\xd6\x0a\xad\xe8\x0d\x24\x85\xd6\xf3\x08\xa1\xac\xa4\xeb\xd2\x6d\x1d\xb5\xc0\x0d\x60\x88\x95\x0c\x5e\x44\xeb\x75\x10\x38\x84\x44\x46\xe0\xaf\x87\xa1\x69\x7c\xdf\xb3\x12\xc8\x64\x42\xa8\x07\xc8\xc1\xab\xcb\x52\x2b\x2f\x8e\x5f\x92\x67\x42\x71\x59\xa7\x40\x26\xf3\xba\x64\xe3\x60\x6d\x03\x9c\xe9\x84\x84\xcf\x37\x21\x98\xf4\x61\xad\x0b\x20\x85\x45\xf2\xac\x32\x42\x61\x46\x26\x4f\x6d\xf8\xd4\x4e\x46\x87\x84\x1f\x40\x02\xb3\x10\x7a\x97\x8a\x71\x78\xbe\x65\x1f\xda\x05\x7f\xd8\x67\x53\x00\x18\xbc\xba\x3a\x77\x87\x1f\x9d\xcc\x0e\x06\x0a\xe6\x64\x39\xa8\xd7\xaf\x9a\x72\x28\x67\x93\x8d\x3d\xed\xfa\xf7\xc4\x99\x80\xc1\xd6\xfa\x52\xe4\x0a\x52\x2f\x18\xe6\xa0\x84\x1c\x54\xda\x47\x71\xa7\x8c\x52\x71\x51\xba\x88\xa1\x8f\xd2\xab\xe7\xb0\x1c\x69\x7f\x85\x65\xab\x1c\x4c\xd9\x4b\xf7\x77\xe3\xf8\x89\x24\x27\xc7\xa0\xb8\x1b\x26\x4a\x69\xc0\x2a\x71\x0d\xc6\x11\x22\x26\x8b\x69\x30\x17\x2a\x8d\xc9\xa5\x87\x35\xc0\x65\x05\x31\x99\xd7\x09\x18\x05\x08\xd6\x8d\x10\x4a\x1b\x94\x80\x2c\x65\xc8\xe2\x80\x10\xc5\x4a\x88\xc9\x6a\x45\xc6\x20\xab\x06\x50\xb2\x5e\x53\x94\xd6\x0f\x4d\x6b\xec\x5b\xed\x3d\x6e\x23\xe0\x92\x22\x44\xb2\x04\xa4\x75\xc1\x3d\x13\x47\x71\x1b\x9d\x8b\xfc\x89\x28\xa1\x52\x50\x48\x8e\x9d\x5b\x97\x8f\x63\x27\x37\xe8\x0f\x68\x7a\x37\xac\xb8\xd1\xcf\x61\xd9\xe8\x5d\xf3\xb6\xf4\x9c\x0d\xdc\x47\x8b\x87\x12\x50\xe9\xae\xb6\xf5\x23\x65\x20\x17\x16\x0d\x43\xa1\x55\x38\x3f\xf5\xfd\x5a\x4c\x13\x40\xd6\x35\xf6\xb7\x1a\x19\x0a\x95\xff\xd1\xcc\xde\x6b\xad\x32\x91\xd7\x8d\xc7\x67\xb6\x75\x33\xc8\x65\x1b\xb4\x9f\x68\x3e\x0a\xfb\x25\x6d\xdf\xb7\xeb\xed\x89\xde\x8b\xb6\x49\xbb\x65\x16\xa6\x90\xb1\x5a\x22\x98\xd0\x0f\x49\x9f\xac\xff\x37\x14\x3a\x20\x84\x90\x8c\x09\x59\x1b\xb8\xd0\x52\xf0\x65\x4c\xde\x32\x21\xbd\x9c\x4b\x01\x0a\x9b\xe6\xc4\x5e\xe2\x70\x69\xb0\xb8\x8d\x4c\xa3\x6f\x17\x49\x67\xbe\x6f\xd1\x1b\xdb\x1d\xdd\xbe\x67\x53\x0d\xbd\x2b\x86\x45\x4c\xa2\xb6\x64\xea\x0b\x16\x9a\x2e\xa6\x4c\x56\x05\x9b\x52\xd7\x10\x6f\x6c\x6a\x09\xb6\xcb\x90\x12\x56\x89\x77\xee\x86\xb1\x9b\xa4\x9d\x78\xd8\x21\xf7\xdb\x50\x6d\xcb\xb0\x3b\xa0\x17\xea\x0a\x1a\xcc\xb7\x0c\x5f\x7f\x38\x7b\x75\x75\x36\x12\xfd\x7e\xf1\x66\x28\x32\x60\x75\x6d\x38\x6c\x39\xba\xcc\xc1\x7a\x91\x15\x29\x9c\x65\x19\x70\xb4\x31\x79\xaf\x15\x0c\x10\xd7\x37\x0a\x0c\x35\x90\x81\x01\xc5\xe1\xc7\x81\x7c\xab\xf0\x5b\xd0\x3f\x26\xd4\xef\x80\x98\x0b\xc3\x6b\x81\x89\x01\x36\x07\x63\x47\x3a\xf8\x88\x60\x14\x93\x6d\x1f\xc6\x4a\x4f\x76\xa1\xfe\x04\xee\xcf\x1e\xe9\x0a\x60\x12\x0b\x5e\x00\x9f\x8f\x15\x95\xd1\x1f\x97\xfd\x63\x64\xa4\x42\xc3\xb2\x4c\x70\xa9\xf3\x9d\xf2\xca\xbd\xe6\x3c\x9f\x76\xaa\x8d\xae\xef\x08\x88\x86\xf1\x3d\x38\xdc\x40\xe7\xcb\xd1\xe6\x3e\xca\x3a\x66\xed\x7a\x16\x75\xbe\x6f\x87\xe6\x1d\x67\xfe\x9f\xf4\x6e\x4a\xa2\xae\x6d\x9c\x99\xcf\x20\xf3\x64\xb2\x0f\x8f\xbf\x11\x83\x2b\x9d\xde\x05\xef\x57\xdc\xd4\xd7\x4c\x8a\xf4\x5b\xdd\xd5\x8b\x3e\xd8\x23\xb9\xa3\xdb\x84\xf4\x0f\x74\x3d\xb7\x25\x3f\xee\x25\xbd\xe3\x6a\x76\xa2\x37\x67\xe7\x67\x5f\xb7\xca\x1d\x57\x2b\xd7\xa8\x7f\x7b\xc3\x0f\x9e\x0c\x8f\x63\xe9\x77\x9a\xbf\xb5\xda\xe3\x1a\x68\x1b\x11\x7e\xc9\x80\xfc\x92\x2b\x6d\xe0\x7b\x18\x91\xc5\x94\xb6\xc6\xff\xf9\xd2\xdf\xff\xb1\x3a\xe2\xf0\xfd\x18\xfb\x0f\x1e\x7b\x41\xdc\x63\x70\x09\xd2\x5f\xef\xdd\x99\x25\x43\x5e\x9c\xf7\xeb\xb8\xf9\xb5\x9e\x91\x5d\x5a\x84\x92\x0e\x00\x9c\xa0\xa9\x61\xf2\x1d\xb0\xe6\x41\xda\xf8\x2f\x07\x8f\x90\x35\xfb\xef\xd1\xa6\x86\xbb\x78\xf4\x4f\x00\x00\x00\xff\xff\xb1\x8a\x50\x1d\xc0\x14\x00\x00"),
+			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x02\xff\xe4\x58\x5f\x6f\xdb\x36\x10\x7f\xd7\xa7\x38\x08\x2d\xd0\x16\x10\x15\x27\x71\x90\x09\xc8\x43\xd7\xa6\xdd\xb0\xb4\x28\xda\xac\x7d\xa6\xa8\x93\xc4\x99\x22\x35\x92\x72\xea\xa5\xf9\xee\x03\xa9\x3f\x96\x6c\xa7\xf1\xda\x0e\xcb\x5a\xbf\xf9\xfe\xdf\xef\x7e\x3c\x12\xba\xbe\x8e\xe0\x01\xa3\x3f\x37\x32\x13\x08\xc9\x19\x90\xf7\x54\x34\x68\x08\x53\xd2\x6a\x25\xde\x08\x2a\x91\x58\x61\x48\x81\x12\x35\x15\x64\x30\xbe\xb9\x09\xae\xaf\xe3\x27\xc1\x4b\xaf\xb0\x08\x0c\xb5\xe5\x39\x67\xd4\xa2\x09\x0c\x62\x02\xa5\xb5\xb5\x49\xe2\xb8\xa2\xc6\xa2\xae\xb8\xcc\x0c\x29\xb8\x2d\x9b\x94\x70\x15\x9b\x5a\xf3\x22\x66\x7a\x55\x5b\x45\x4a\x5b\x89\x0d\x27\xcc\x78\x53\x11\xa6\xaa\x58\x36\x4b\x15\x15\x5a\x35\x75\x64\x91\x95\x71\xa5\x96\x18\xad\x54\xa3\x23\x97\xd3\x44\x56\x45\x25\x8a\x2a\x3a\xce\xe7\xf9\xc9\xec\xe8\xe8\x94\x32\x3a\x0d\xd6\x65\xf5\xc1\xd0\x5e\x29\xbd\x30\xa8\x97\x9c\x61\x85\xa6\xdc\x25\x4a\x85\x4a\xe3\xd3\x83\x63\x9a\xcd\x0f\x0e\x4f\xd2\x74\x9e\xa5\xd9\xe1\xe9\x9c\x1d\x1e\x1e\xe4\xb3\xf9\xd1\x4f\xf3\x1c\x0f\xe7\x78\x7c\x92\xcf\x31\x4b\xe3\x0c\x6b\xa1\x56\x15\x4a\x6b\x62\x57\x49\x2c\x4d\x15\xb3\x92\x6a\x6b\x62\x9a\x55\xdc\x18\xae\x64\x74\x85\x69\xa9\xd4\x22\xb6\x58\xd5\xc2\xa1\xb4\xad\x8b\x0c\x32\x8d\x96\xd8\x5a\x04\xc1\x07\x04\x25\xc5\x0a\x68\x63\x55\x31\x46\xd9\x00\xcf\xa1\x31\xa8\x21\xe3\x19\x48\x65\x81\x95\xca\x20\xd8\x12\xb9\x06\x75\x25\xa1\x0b\x73\x47\x08\x5b\xb6\x7f\x80\x1b\x1f\x65\x85\x16\x7a\xab\x8c\xc0\x65\xc9\x0d\x5c\xd1\x15\x5c\x21\x2c\x10\x6b\x6f\xdf\x46\x36\x90\xa2\xbd\x42\x94\xf0\xcb\xf9\xc5\x2b\x68\xea\x42\xd3\x0c\x0d\x09\x9e\xc4\x37\x37\x41\xe0\x68\xc5\x73\xc0\x3f\xef\xe6\x53\x1b\xef\x35\xad\x10\xc2\x10\x22\xcf\x2a\xc7\x49\x57\x56\x72\xe6\x64\xbd\x68\x81\xab\x0d\xc9\xc8\x37\x39\x83\x5a\x73\x69\xe1\x11\x97\x4c\x34\x19\x42\xb8\x68\x2a\x4a\x24\xad\x30\x04\xf2\x18\xc2\xc8\x0a\xe3\xf9\xe2\xfd\xc7\x01\x9c\xf3\x23\xa1\xd4\xa2\xa9\x21\x5c\xce\x42\x08\xdf\x79\x79\x08\xe4\x2d\x0a\xa4\x06\x89\xcb\x61\x6a\xca\x70\x9c\xf4\xf1\x50\x2e\xcf\x87\x58\x4e\x04\xb0\xee\xe1\x0c\xb8\xcc\xf0\x63\xaf\x27\x19\xb5\x14\x42\x87\x00\x73\xa5\x8c\xcc\x5d\x7f\xb7\x5b\x2f\x70\x35\xb1\x1e\xce\xe1\x6e\x17\x46\xd7\xf1\x9d\x3d\x0a\x83\x13\x77\x55\x55\x4a\xf6\xd0\x6d\x80\x36\x19\x56\x77\x2a\x5e\xf7\x40\x8e\x82\x50\xe1\x71\x30\x2e\x84\xe0\xc6\xc2\x23\x3f\x83\x1c\xc2\x87\x86\x3c\x34\xe1\x24\xcd\x36\x96\x8f\x37\xec\x89\x59\xb2\xbb\x7d\x36\x00\xbe\xbc\xbc\x70\xe9\x8f\x4e\xe6\x07\x53\x78\x9c\xb4\x40\xf9\xec\x69\xdb\x54\xc4\x68\xb8\xf6\x70\x96\xbd\xa9\x33\xea\xd8\x56\xa0\x7c\xc7\x0b\x89\x99\x17\x8c\x2b\x91\x5c\x8c\xfa\x1d\xe2\xb8\x3c\xdb\x13\xef\x43\x12\x1f\xe6\x13\xa4\x27\xc7\x28\xd9\xf6\xac\x07\xbb\xdf\x70\xb5\x6d\x36\x99\xf1\x03\x46\x37\xa2\xf5\x83\x95\x99\xf7\x88\xa2\x28\xa0\x35\x7f\x8f\xda\xed\x93\x04\x96\xb3\x60\xc1\x65\x96\x40\xcb\xe5\xc0\xae\x6a\x4c\x60\xd1\xa4\xa8\x25\x5a\x34\x6e\x03\x5b\x61\x82\x0a\x2d\x75\x94\x49\x02\x00\x77\x58\x12\x9f\x79\x74\xb2\x7c\x35\xb2\xc7\xdf\xab\x77\x1c\x0b\x6f\x25\x68\x8a\xc2\x24\x5d\x93\x53\x4e\xb5\xba\x10\x08\x7c\x02\xe9\x18\x2b\x2d\x1c\x3b\xb7\x3e\x79\x77\x24\xda\xfc\x1e\x48\x1f\xb3\xe3\x7e\x2b\x76\xb0\x79\x69\x4b\xef\x64\x8a\xd2\x08\x91\x1d\x80\x0c\xbb\x56\x63\xc1\x8d\xd5\xd4\x72\x25\xc9\xe2\xd4\x23\xb1\x9c\xa5\x68\x69\x0f\xd9\xab\xc6\x52\xcb\x65\xf1\xa1\x5d\xca\xcf\x94\xcc\x79\xd1\xb4\x1e\xbb\x01\xdb\xb9\x74\xe0\xe6\x26\x5a\x6f\xf8\xaa\x0b\x3a\xac\x7a\x36\x09\xfb\x25\x18\xef\x0b\x71\x97\xd1\x7b\x45\x5d\xd1\xee\x96\x23\x19\xe6\xb4\x11\x16\x35\xf1\x47\x64\x28\xd6\xff\x25\x5c\x05\x00\x00\x39\xe5\xa2\xd1\xf8\x46\x09\xce\x56\x09\xbc\xa0\x5c\x78\x39\x13\x1c\xa5\x6d\xc1\x49\xbc\xc4\xcd\xa5\x9d\xc5\xf6\x64\x5a\x7d\xb7\x4c\x7a\xf3\x7d\x9b\x5e\xdb\xee\x40\xfb\x33\xdb\x6a\xec\x5d\x53\x5b\x26\x10\x77\x2d\x47\xbe\x61\xae\xa2\xe5\x8c\x8a\xba\xa4\xb3\xc8\x01\xe2\x8d\x75\x23\xd0\xf4\x15\x46\x40\x6b\xfe\xd2\x3d\x3d\xcc\xba\x68\x27\x1e\x23\xe4\x7e\x6b\xaa\x6d\x18\xf6\x09\x06\xa1\xaa\xb1\x9d\xf9\x86\xe1\xb3\xb7\xe7\x4f\x2f\xcf\x27\xa2\xdf\xdf\x3c\x1f\x8b\x34\x1a\xd5\x68\x86\x1b\x8e\xae\x72\x34\x5e\x64\x78\x86\xe7\x79\x8e\xcc\x9a\x04\x5e\x2b\x89\xa3\x89\xab\x2b\x89\x3a\xd2\x98\xa3\x46\xc9\xf0\xc7\x19\xf9\x46\xe3\x5b\xa3\xbf\x4f\x53\xbf\x65\xc4\x8c\x6b\xd6\x70\x9b\x6a\xa4\x0b\xd4\x66\xa2\xc3\x8f\x16\xb5\xa4\xa2\xc3\x61\xaa\xf4\x64\xe7\xf2\x0f\x64\x3e\xf7\x44\x57\x22\x15\xb6\x64\x25\xb2\xc5\x54\x51\x6b\xf5\x71\x35\xbc\x52\x27\x2a\xab\x69\x9e\x73\x26\x54\xb1\x53\x5e\xbb\x67\xbe\xe7\xd3\x4e\xb5\x56\xcd\x2d\x01\xad\xa6\x6c\x0f\x0e\xb7\xa3\xf3\xed\x28\xfd\x39\xca\x3a\x66\xed\x7a\x7a\xf6\xbe\x2f\xc6\xe6\x3d\x67\xfe\x9f\xf4\x6e\x5b\x8a\x1c\x6c\x8c\xea\x7f\x40\xe6\x30\xdc\x87\xc7\xdf\x88\xc1\xb5\xca\x6e\x1b\xef\x57\xdc\xd4\xef\xa9\xe0\xd9\xb7\xba\xab\x97\x43\xb0\x7b\x72\x47\x77\x05\xa9\x1f\xe8\x7a\xee\x5a\xbe\xdf\x4b\x7a\xc7\xd5\xec\x44\xcf\xcf\x2f\xce\xbf\x6e\x95\x3b\xae\xd6\x0e\xa8\x7f\x7b\xc3\x8f\x9e\x0c\xf7\x63\xe9\xf7\x9a\xbf\x94\xdc\xe3\x1a\xe8\x80\x20\x5f\x72\x40\x7e\x2d\xa4\xd2\xf8\x3d\x1c\x91\xe5\x2c\xea\x8c\xff\xf3\xa5\xbf\xff\x63\x75\xc2\xe1\xcf\xcf\xd8\x7f\xce\xd8\x6b\xc4\xc3\x0c\xde\xa1\xf0\xd7\x7b\x9f\xb3\xa2\x96\x95\x17\xc3\x3a\x6e\x7f\x9d\x67\x6c\x56\xc6\x62\x15\x8d\x06\x18\x5a\xdd\x60\xf8\x1d\xb0\xe6\x4e\xda\xf8\x6f\x02\xf7\x90\x35\xfb\xef\xd1\xee\x43\xe4\x2d\x3c\xfa\x3b\x00\x00\xff\xff\x4e\x58\x19\xe3\xd9\x16\x00\x00"),
 		},
 		"/templates/ingress-deployment.yaml": &vfsgen۰CompressedFileInfo{
 			name:             "ingress-deployment.yaml",
-			modTime:          time.Date(2020, 11, 30, 12, 56, 31, 42048800, time.UTC),
+			modTime:          time.Date(2020, 11, 30, 14, 21, 9, 348401965, time.UTC),
 			uncompressedSize: 3237,
 
 			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x02\xff\xdc\x57\x4d\x73\xda\x3a\x17\xde\xe7\x57\x9c\x61\xba\x68\x16\xd8\x90\xb7\x49\x5b\xcd\xbc\x0b\x4f\xa0\xd3\x4c\xc1\x78\x08\xe9\x96\x51\xe4\x03\x68\xa2\x0f\x47\x92\xb9\x65\xd2\xfc\xf7\x3b\xc2\x18\x6c\x63\x52\xb2\xb8\x77\x71\xbd\xc2\xe7\x39\x7a\xce\xd7\x23\x59\xbc\xbc\x74\x81\x2f\x20\xf8\x49\x45\x8e\x36\xe0\x6a\x69\xd0\xda\x00\x15\x7d\x14\x98\xc2\xeb\xeb\x05\xcd\xf8\x4f\x34\x96\x6b\x45\x80\x66\x99\x0d\xd7\xfd\x8b\x27\xae\x52\x02\x03\xcc\x84\xde\x48\x54\xee\x42\xa2\xa3\x29\x75\x94\x5c\x00\x28\x2a\x91\xc0\xcb\x0b\x70\xc5\x44\x9e\x22\x74\x9e\x72\x49\x03\x6f\xee\x40\x00\xaf\xaf\xdd\x5d\x94\x9d\xaf\xcd\x28\x2b\x16\x04\x53\x14\x48\x2d\x06\x71\x69\xf6\x09\x00\x08\xfa\x88\xc2\x7a\x6e\x80\x6d\xc2\x35\xe2\x02\xf5\xd4\xbf\x41\x71\x95\xa2\x72\xf0\xa9\x58\x08\x3e\x63\x02\xde\x6d\x1f\xd4\x66\xc8\x3c\x95\x75\x86\x3a\x5c\x6e\x0a\x5a\xa3\x85\xe0\x6a\xf9\x90\xa5\xd4\x61\x61\x02\x90\xf4\xd7\x7d\x6e\x96\x48\xa0\x7f\xb0\x3c\x28\xba\xa6\x5c\xf8\xfe\x10\xe8\x5d\x00\x18\xcc\x04\x67\xd4\x16\x25\x34\x1a\x59\x82\x45\x3e\x16\x05\x32\xa7\x4d\x11\x40\x52\xc7\x56\xa3\x4a\x6d\x6d\xd5\x95\x4b\x46\x2d\x55\xde\x94\x55\xb6\xd5\x09\xe0\x50\x66\x62\x5f\x4e\x75\x44\xdb\x15\x4a\x69\x47\x1d\xd7\x6a\x1f\x1d\xb6\x0c\x01\xd7\xe1\x8e\x84\xc0\x4e\x08\x47\x0e\x12\xed\xaa\xb5\x60\x0f\x1c\xd2\x12\xb5\xea\xde\x5b\xdf\x97\x03\x51\x7b\x85\x00\xe5\x34\xb7\xbf\xd1\xac\x39\xc3\x88\x31\x9d\x2b\x17\xbf\x43\x86\xfe\x61\x5a\x39\xca\x15\x9a\x4a\xba\xdd\x9d\x98\xeb\x9e\xfe\xe1\x92\x2e\xdb\xe8\x17\xda\x48\xea\xee\x3c\xda\x81\x8f\x29\x67\x0e\x3a\xbc\x78\x2b\x3b\xe5\x87\x90\x08\xaa\x30\xd8\x02\xd0\x31\x5a\xbb\x0e\x7c\xb8\x84\xdf\xf0\x9c\x6b\x87\xd5\xaa\x77\x91\x92\x5c\x88\x44\x0b\xce\x36\xb5\xa6\x37\xa8\x82\x6c\xef\x56\xe7\x40\xb5\x26\x95\xd7\x43\x61\xc9\x64\x30\x8f\xa3\xf1\xb0\x06\x02\xac\x3d\xfd\x37\xa3\x25\x69\x00\x00\x0b\x8e\x22\x9d\xe2\xe2\x18\xd9\x61\x09\x75\x2b\xb2\x57\xdb\xb6\xdf\x6f\x86\xbe\x4f\xa2\xdb\x7f\x38\xfe\xf6\x28\x69\x4d\xe2\xc7\xc3\x38\x9a\xdf\x4e\xe2\xd9\x74\x32\x9a\x27\xa3\x28\x1e\xce\x1f\xa6\xa3\xb6\x6c\x08\x74\x56\xce\x65\x96\x84\xe1\xd1\xd0\xbd\x74\x8c\x16\xc5\x24\x76\x2a\x8c\xf7\x3a\x0b\x4e\x9d\x6c\xe4\xfa\xe6\xf3\x97\xce\xb9\x79\xdd\x46\xf3\xdb\xe1\x74\x36\xff\x76\x37\x1a\xb6\x27\x18\xae\xa9\x09\x4d\xae\x42\x8b\xcc\xa0\xb3\x61\xb9\x59\x9d\xb0\x5d\x86\xc6\x85\x8c\x06\xcc\xb8\xd3\x11\x07\xd1\x2c\x2a\xa2\x8d\x87\xf7\xdf\xdb\xa3\xfc\x71\xcf\xbf\xc9\x7b\x4a\x6c\x04\x3e\x7c\x2c\x15\x71\x19\x1c\x7e\x6f\xd5\x71\x79\x0e\x73\x34\x18\xdf\xc5\xf3\x64\x32\x9d\x9d\x18\xdf\xd7\xaf\xbd\x7e\xe7\x1c\xa6\xc1\x34\xba\x8b\xe7\xb3\xbb\x53\x99\xb6\x74\x20\x35\x94\xab\x19\x97\x78\x66\x1b\xa6\x0f\xb1\xe7\x9f\xcf\x26\x3f\x86\xf1\x3c\x89\x66\xdf\xcf\x1e\xe9\x23\x1a\x85\xce\xc7\xd6\xe1\x4e\x6b\xb4\x38\xf1\x42\xa7\x9f\x50\x55\x88\xa8\x59\xda\xe6\xbe\x37\xb9\x6a\x58\xba\x5d\xa1\x97\x5d\x81\x6b\x14\xff\xe7\x6a\xa1\x2b\x70\xa6\x8d\x3b\x62\xd8\x1f\x94\x89\x36\x8e\x40\xbf\xd7\xeb\xf5\x2b\x2e\x82\xaf\x51\xa1\xb5\x89\xd1\x8f\x58\x5f\x8b\xbf\x0e\x87\x75\xf9\x30\x2d\x25\x55\xe9\xf1\x76\xee\xc2\x5f\x4b\x74\x2d\xe6\xee\xf3\xa4\xdb\x62\xf6\xbb\x93\x84\x61\xff\xea\x73\xd0\x0b\x7a\x41\x9f\xf8\x79\xd7\xfc\x16\x94\x8b\xdc\xe0\x6c\x65\xd0\xae\xb4\x48\x09\xf4\xaf\x6a\x0e\x5c\x71\xc7\xa9\x18\xa0\xa0\x9b\x7b\x64\x5a\xa5\x96\xc0\x4d\xaf\xe6\x93\xa1\xe1\x3a\xdd\xa3\xd7\x35\xd0\xe6\x8c\xa1\xb5\xd5\x08\x35\xdc\x71\x89\x3a\x77\xfb\xd5\xff\xab\xa0\x06\x69\xca\xff\x4b\x8d\xeb\xff\x5b\x7d\xb3\x3a\x37\x0c\x1b\x3a\x35\xf8\x9c\xa3\x6d\xaa\x17\x80\x65\x39\x81\xeb\x9e\x6c\x98\x25\x4a\x6d\x36\x04\x6e\x3e\x8d\x79\x0d\x12\x5c\xf2\x13\x2c\x5e\xf9\xa7\x78\xae\xfb\x57\x35\xa2\xb5\x16\xb9\xc4\xb1\xdf\xa6\xb6\xfd\x53\xfc\xd6\x4d\xa5\x3c\xc0\x9b\xc1\x3c\x5d\xf1\xbd\xfb\xe3\xd9\xdf\x58\xea\xd5\x36\x51\x62\x43\xc0\x99\xbc\xfc\x36\x16\x49\xb6\xdc\x7f\xde\x99\x5b\x91\x43\xbd\xcc\xc2\x16\x9f\x4f\xe7\xaf\x8a\xa8\xb6\x7f\x41\xfe\x0e\x00\x00\xff\xff\x18\x8b\xd1\xc5\xa5\x0c\x00\x00"),
@@ -271,7 +271,7 @@ var HelmTemplates = func() http.FileSystem {
 		},
 		"/values.yaml": &vfsgen۰CompressedFileInfo{
 			name:             "values.yaml",
-			modTime:          time.Date(2020, 11, 30, 12, 56, 31, 42451259, time.UTC),
+			modTime:          time.Date(2020, 11, 30, 14, 21, 9, 348708923, time.UTC),
 			uncompressedSize: 1911,
 
 			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x02\xff\xac\x54\x4d\x6f\xe3\x46\x0c\xbd\xeb\x57\x10\xf6\x79\x6d\x27\x6d\x82\x42\xb7\x5d\x2f\x5a\x04\xcd\x06\xc1\x3a\xd8\x9e\xe9\x11\x2d\x4d\x3d\xe2\xa8\x24\xe5\xae\xfb\xf1\xdf\x8b\x99\x51\x9c\x78\x9b\x66\x5b\xa0\x37\x89\xc3\x79\xf3\x48\x3e\xbe\x39\x3c\x74\x04\x0d\xed\x70\x0c\x06\x42\xad\x57\x93\x23\x20\x37\x60\xd8\x82\x45\x18\x95\x60\x17\x05\x30\x04\xf8\x71\xec\x11\x7c\x8f\x2d\x69\xd5\x86\xb8\xc5\x50\x57\x00\x8c\x3d\xe9\x80\x8e\x6a\x98\xed\xc7\x1e\xdf\xe8\x51\x8d\xfa\x59\x05\x25\x37\xe5\xc0\x09\x3b\x25\x45\x6e\xdf\x34\xd1\xed\x49\xde\xe4\x0b\xe5\x7b\xb1\xf5\x6c\x82\xc7\x85\x8f\xb3\x7c\x65\x0e\xef\x0b\x31\x4d\x44\x16\xeb\x0e\xc5\x16\x6f\x87\xe1\x13\x89\xfa\xc8\x53\x8e\x61\x5b\xc3\x6c\x56\x55\x73\xf8\xa9\x23\xeb\x48\x20\x0a\x70\xb4\x74\x69\x40\x73\x1d\x58\x47\x60\x28\x2d\xd9\x13\x59\xf8\xd5\x5b\x39\x29\x74\x21\xe0\x96\x42\x95\x2f\x6c\x72\xe4\xee\xa9\x2e\x93\x91\xaa\xca\x45\x36\x89\xe1\x3e\x20\xe7\xa2\x42\x6c\x6f\xe9\x40\xa1\x86\x99\xe7\x5d\x26\xdd\xc7\x26\xb5\x41\x0d\xb9\xc1\x10\x99\x52\x70\x0e\xbf\x45\xa6\x42\x12\x60\xdf\xe8\x0f\xb9\x77\x6f\x9b\x46\x48\xf5\x31\x2e\x34\x04\xef\x50\x6b\xb8\x48\xbf\x1c\x1b\xda\x50\x20\x67\x51\x4a\x07\xf7\xe3\x96\x84\xc9\x48\x17\x3e\x2e\xa3\xd6\x10\x3c\x8f\x9f\x5f\x38\x43\x71\x5d\x0d\xd8\x37\xd7\xdf\x26\x28\xcf\x3f\x67\x98\xef\xd1\x87\x51\xe8\x3e\x06\xef\x8e\x35\xdc\xb4\x1c\x85\x52\x82\x92\x1c\xbc\x9b\x06\x35\xcf\x3d\xca\xac\xd2\xaf\x1d\x07\xaa\x61\x1d\x46\x35\x92\x9b\xfb\x1c\x43\xe6\x68\x68\x3e\xb2\xd6\xf0\xfb\x9f\x09\xa2\xc8\xe1\x23\xf5\xd1\x68\x73\x64\xb7\xf9\x2a\xe4\x6d\xc4\xe6\x1d\x06\x64\x47\xf2\x22\x6a\x8a\x0d\x51\xac\x86\xab\xeb\xef\xae\xd2\x23\x93\x4e\xb5\xa0\xea\xde\x0f\x1f\x48\xbb\xb5\x50\xbe\x55\xc3\x0e\x83\xe6\x82\xe6\xa9\x9d\x1a\x47\x71\x94\x93\xe7\x50\x24\xf8\xcb\x48\x6a\xcf\x22\x00\x6e\x18\x6b\xb8\x58\xad\xfa\x67\xb1\x9e\xfa\x98\x84\x7a\x79\x75\xfd\xc1\x17\xb8\x87\xdb\x4d\xde\x82\x03\x8a\x8f\xa3\xe6\x8e\x91\x68\x05\x60\x61\xa2\xd3\x12\x93\x94\x8d\xc8\xec\xc8\x09\xd9\xdd\xf3\xba\x01\x1c\xbe\x1b\xb9\x09\x4f\x21\x1c\xfc\x26\x43\xbd\x7e\x2d\x78\x62\x5b\x93\x98\x6e\xfe\x7e\x7e\x12\xd4\x57\x91\xf6\x8d\x96\x09\xad\x33\xe0\x3f\x64\x9e\xef\xed\x30\x86\x70\x52\xcc\xee\x2e\xda\xbd\x90\x12\xdb\xb4\xd4\x43\x54\x6f\xb1\xac\x75\x5a\x65\x37\x14\xc5\x17\xcc\x93\x3c\x88\x0f\x9f\x50\xa6\xdf\x39\x80\x8b\xbc\xf3\x6d\x0d\x7f\x54\xb9\xe9\x9f\x1b\x7d\x24\x3f\x0d\xa1\x41\xc3\x21\x2d\xda\x3a\x67\x8e\x92\x47\xfc\x91\x76\x42\xda\xdd\xb0\x91\x1c\x30\xd4\x70\xa9\x55\xe5\xd8\xd7\xf9\x09\xdc\x06\x6a\x1e\x55\x00\xe0\x3a\xf4\xfc\x3c\xc0\x64\xef\xbd\xd4\xb0\x24\x73\x4b\xc7\x7e\xd9\x8f\xc1\x46\x5d\x32\xd9\xa2\xa9\x00\xb6\x9e\xcb\xf9\x01\x65\x19\xfc\x36\xe7\x6c\x7d\x32\x9a\xc4\xb7\x34\xa8\x54\xc9\x7e\x91\x42\x67\x26\x90\x3c\xe0\xff\xde\xdc\x17\xfd\x73\xb2\xcb\x47\x9b\x3c\x1b\x42\x88\xdb\x7d\x3c\xf8\x70\xc4\xa5\x67\x35\x0c\x21\x91\x9d\xf6\x2e\x3b\xe5\x6a\xb1\x5a\x5c\x66\xbb\x3c\x6b\x6d\x96\x77\xb2\xc3\x54\xe0\x53\xfb\x41\x7d\x43\x0e\xa5\x4a\x91\x93\xf3\x9d\xf1\xfa\x52\x02\xcd\x30\x7b\x5d\x39\x59\x20\xaf\x3c\xee\xd9\x1b\x0c\x1d\x2a\x81\xe7\x62\xd1\x13\x09\xc8\x67\x37\xaf\xbd\x9e\x12\x66\x55\xe5\xb9\xcd\xe6\xfa\x92\x30\x7a\xd2\xae\x7e\x34\x93\x64\x2b\x82\x9e\x1f\x7c\x9a\xee\x37\x2b\xfd\xc2\x8a\xff\x8d\x3b\xfe\x07\x2b\xbb\x58\xad\x56\x17\xd5\x5f\x01\x00\x00\xff\xff\xc1\xeb\xfd\xbd\x77\x07\x00\x00"),
diff --git a/app/kumactl/pkg/k8s/client.go b/app/kumactl/pkg/k8s/client.go
deleted file mode 100644
index e756bcdfc..000000000
--- a/app/kumactl/pkg/k8s/client.go
+++ /dev/null
@@ -1,46 +0,0 @@
-package k8s
-
-import (
-	"context"
-
-	kube_core "k8s.io/api/core/v1"
-	kube_apierrors "k8s.io/apimachinery/pkg/api/errors"
-	kube_scheme "k8s.io/client-go/kubernetes/scheme"
-	kube_rest "k8s.io/client-go/rest"
-	kube_client "sigs.k8s.io/controller-runtime/pkg/client"
-
-	mesh_v1alpha1 "github.com/kumahq/kuma/pkg/plugins/resources/k8s/native/api/v1alpha1"
-)
-
-type Client interface {
-	HasNamespace(name string) (bool, error)
-}
-
-func NewClient(cfg *kube_rest.Config) (Client, error) {
-	scheme := kube_scheme.Scheme
-	if err := mesh_v1alpha1.AddToScheme(scheme); err != nil {
-		return nil, err
-	}
-	kubeClient, err := kube_client.New(cfg, kube_client.Options{Scheme: scheme})
-	if err != nil {
-		return nil, err
-	}
-	return &client{Client: kubeClient}, nil
-}
-
-type client struct {
-	kube_client.Client
-}
-
-var _ Client = &client{}
-
-func (c *client) HasNamespace(name string) (bool, error) {
-	ns := &kube_core.Namespace{}
-	if err := c.Get(context.Background(), kube_client.ObjectKey{Name: name}, ns); err != nil {
-		if kube_apierrors.IsNotFound(err) {
-			return false, nil
-		}
-		return false, err
-	}
-	return true, nil
-}
diff --git a/app/kumactl/pkg/k8s/config.go b/app/kumactl/pkg/k8s/config.go
deleted file mode 100644
index 433896b17..000000000
--- a/app/kumactl/pkg/k8s/config.go
+++ /dev/null
@@ -1,77 +0,0 @@
-package k8s
-
-import (
-	"net/http"
-
-	"k8s.io/client-go/tools/clientcmd"
-	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
-)
-
-type KubeConfig interface {
-	GetFilename() string
-	GetCurrentContext() string
-	NewClient() (Client, error)
-	NewServiceProxyTransport(namespace, service string) (http.RoundTripper, error)
-}
-
-type kubeConfig struct {
-	clientConfig clientcmd.ClientConfig
-	config       *clientcmdapi.Config
-}
-
-var _ KubeConfig = &kubeConfig{}
-
-func (c *kubeConfig) GetFilename() string {
-	return c.clientConfig.ConfigAccess().GetDefaultFilename()
-}
-func (c *kubeConfig) GetCurrentContext() string {
-	return c.config.CurrentContext
-}
-func (c *kubeConfig) NewClient() (Client, error) {
-	cfg, err := c.clientConfig.ClientConfig()
-	if err != nil {
-		return nil, err
-	}
-	return NewClient(cfg)
-}
-func (c *kubeConfig) NewServiceProxyTransport(namespace, name string) (http.RoundTripper, error) {
-	cfg, err := c.clientConfig.ClientConfig()
-	if err != nil {
-		return nil, err
-	}
-	kubeApiProxy, err := NewKubeApiProxyTransport(cfg)
-	if err != nil {
-		return nil, err
-	}
-	return NewServiceProxyTransport(kubeApiProxy, namespace, name), nil
-}
-
-func DetectKubeConfig() (KubeConfig, error) {
-	loadingRules := clientcmd.NewDefaultClientConfigLoadingRules()
-	configOverrides := &clientcmd.ConfigOverrides{}
-	clientConfig := clientcmd.NewNonInteractiveDeferredLoadingClientConfig(loadingRules, configOverrides)
-	return newKubeConfig(clientConfig)
-}
-
-func GetKubeConfig(kubeconfig, context, namespace string) (KubeConfig, error) {
-	loadingRules := &clientcmd.ClientConfigLoadingRules{ExplicitPath: kubeconfig}
-	configOverrides := &clientcmd.ConfigOverrides{
-		Context: clientcmdapi.Context{
-			Namespace: namespace,
-		},
-		CurrentContext: context,
-	}
-	clientConfig := clientcmd.NewNonInteractiveDeferredLoadingClientConfig(loadingRules, configOverrides)
-	return newKubeConfig(clientConfig)
-}
-
-func newKubeConfig(clientConfig clientcmd.ClientConfig) (KubeConfig, error) {
-	config, err := clientConfig.ConfigAccess().GetStartingConfig()
-	if err != nil {
-		return nil, err
-	}
-	return &kubeConfig{
-		clientConfig: clientConfig,
-		config:       config,
-	}, nil
-}
diff --git a/app/kumactl/pkg/k8s/fake/client.go b/app/kumactl/pkg/k8s/fake/client.go
deleted file mode 100644
index 127db8287..000000000
--- a/app/kumactl/pkg/k8s/fake/client.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package fake
-
-import (
-	kumactl_k8s "github.com/kumahq/kuma/app/kumactl/pkg/k8s"
-)
-
-var _ kumactl_k8s.Client = &FakeClient{}
-
-type FakeClient struct {
-	NamespaceExists    bool
-	NamespaceExistsErr error
-}
-
-func (c *FakeClient) HasNamespace(string) (bool, error) {
-	return c.NamespaceExists, c.NamespaceExistsErr
-}
diff --git a/app/kumactl/pkg/k8s/fake/config.go b/app/kumactl/pkg/k8s/fake/config.go
deleted file mode 100644
index b4c159883..000000000
--- a/app/kumactl/pkg/k8s/fake/config.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package fake
-
-import (
-	"net/http"
-
-	kumactl_k8s "github.com/kumahq/kuma/app/kumactl/pkg/k8s"
-)
-
-var _ kumactl_k8s.KubeConfig = &FakeKubeConfig{}
-
-type FakeKubeConfig struct {
-	Filename                 string
-	CurrentContext           string
-	Client                   kumactl_k8s.Client
-	ClientErr                error
-	ServiceProxyTransport    http.RoundTripper
-	ServiceProxyTransportErr error
-}
-
-func (c *FakeKubeConfig) GetFilename() string {
-	return c.Filename
-}
-func (c *FakeKubeConfig) GetCurrentContext() string {
-	return c.CurrentContext
-}
-func (c *FakeKubeConfig) NewClient() (kumactl_k8s.Client, error) {
-	return c.Client, c.ClientErr
-}
-func (c *FakeKubeConfig) NewServiceProxyTransport(namespace, name string) (http.RoundTripper, error) {
-	return c.ServiceProxyTransport, c.ServiceProxyTransportErr
-}
diff --git a/app/kumactl/pkg/k8s/kubectl_proxy.go b/app/kumactl/pkg/k8s/kubectl_proxy.go
deleted file mode 100644
index a812477c1..000000000
--- a/app/kumactl/pkg/k8s/kubectl_proxy.go
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-Copyright 2014 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package k8s
-
-import (
-	"net"
-	"net/http"
-	"net/url"
-	"strings"
-	"time"
-
-	utilnet "k8s.io/apimachinery/pkg/util/net"
-	"k8s.io/apimachinery/pkg/util/proxy"
-	"k8s.io/client-go/rest"
-	"k8s.io/client-go/transport"
-)
-
-// NewKubeProxyHandler creates a proxy server which is similar to `kubectl proxy`
-// but, unlike it, is not exposed outside of the process.
-func NewKubeProxyHandler(cfg *rest.Config) (http.Handler, error) {
-	host := cfg.Host
-	if !strings.HasSuffix(host, "/") {
-		host = host + "/"
-	}
-	target, err := url.Parse(host)
-	if err != nil {
-		return nil, err
-	}
-	transport, err := rest.TransportFor(cfg)
-	if err != nil {
-		return nil, err
-	}
-	upgradeTransport, err := makeUpgradeTransport(cfg)
-	if err != nil {
-		return nil, err
-	}
-	responder := &responder{}
-	proxy := proxy.NewUpgradeAwareHandler(target, transport, false, false, responder)
-	proxy.UpgradeTransport = upgradeTransport
-	proxy.UseRequestLocation = true
-
-	return proxy, nil
-}
-
-// makeUpgradeTransport creates a transport that explicitly bypasses HTTP2 support
-// for proxy connections that must upgrade.
-func makeUpgradeTransport(config *rest.Config) (proxy.UpgradeRequestRoundTripper, error) {
-	transportConfig, err := config.TransportConfig()
-	if err != nil {
-		return nil, err
-	}
-	tlsConfig, err := transport.TLSConfigFor(transportConfig)
-	if err != nil {
-		return nil, err
-	}
-	rt := utilnet.SetOldTransportDefaults(&http.Transport{
-		TLSClientConfig: tlsConfig,
-		DialContext: (&net.Dialer{
-			Timeout: 30 * time.Second,
-		}).DialContext,
-	})
-
-	upgrader, err := transport.HTTPWrappersForConfig(transportConfig, proxy.MirrorRequest)
-	if err != nil {
-		return nil, err
-	}
-	return proxy.NewUpgradeRequestRoundTripper(rt, upgrader), nil
-}
-
-type responder struct{}
-
-func (r *responder) Error(w http.ResponseWriter, req *http.Request, err error) {
-	http.Error(w, err.Error(), http.StatusInternalServerError)
-}
diff --git a/app/kumactl/pkg/k8s/proxy.go b/app/kumactl/pkg/k8s/proxy.go
deleted file mode 100644
index 731ffa38f..000000000
--- a/app/kumactl/pkg/k8s/proxy.go
+++ /dev/null
@@ -1,99 +0,0 @@
-package k8s
-
-import (
-	"bufio"
-	"bytes"
-	"fmt"
-	"net/http"
-	"runtime/debug"
-	"strings"
-
-	kube_util_net "k8s.io/apimachinery/pkg/util/net"
-	kube_rest "k8s.io/client-go/rest"
-
-	"net/http/httptest"
-)
-
-func NewServiceProxyTransport(kubeApiServer http.RoundTripper, namespace, name string) http.RoundTripper {
-	return &resourceProxyTransport{
-		resource:      "services",
-		namespace:     namespace,
-		name:          name,
-		kubeApiServer: kubeApiServer,
-	}
-}
-
-var _ http.RoundTripper = &resourceProxyTransport{}
-
-type resourceProxyTransport struct {
-	resource      string
-	namespace     string
-	name          string
-	kubeApiServer http.RoundTripper
-}
-
-func (t *resourceProxyTransport) RoundTrip(req *http.Request) (*http.Response, error) {
-	req = kube_util_net.CloneRequest(req)
-
-	if strings.HasPrefix(req.URL.Path, "/") {
-		if 1 < len(req.URL.Path) {
-			req.URL.Path = req.URL.Path[1:]
-		} else {
-			req.URL.Path = ""
-		}
-	}
-
-	req.URL.Path = fmt.Sprintf("/api/v1/namespaces/%s/%s/%s/proxy/%s", t.namespace, t.resource, t.name, req.URL.Path)
-
-	return t.kubeApiServer.RoundTrip(req)
-}
-
-func NewKubeApiProxyTransport(cfg *kube_rest.Config) (http.RoundTripper, error) {
-	proxy, err := NewKubeProxyHandler(cfg)
-	if err != nil {
-		return nil, err
-	}
-	return NewInprocessKubeProxyTransport(proxy), nil
-}
-
-func NewInprocessKubeProxyTransport(handler http.Handler) http.RoundTripper {
-	return &inprocessKubeProxyTransport{handler: handler}
-}
-
-var _ http.RoundTripper = &inprocessKubeProxyTransport{}
-
-type inprocessKubeProxyTransport struct {
-	handler http.Handler
-}
-
-func (t *inprocessKubeProxyTransport) RoundTrip(req *http.Request) (*http.Response, error) {
-	var buf bytes.Buffer
-	if err := req.Write(&buf); err != nil {
-		return nil, err
-	}
-	req, err := http.ReadRequest(bufio.NewReader(&buf))
-	if err != nil {
-		return nil, err
-	}
-
-	type result struct {
-		resp *http.Response
-		err  error
-	}
-	ch := make(chan result)
-	go func() {
-		defer close(ch)
-		defer func() {
-			if p := recover(); p != nil {
-				ch <- result{resp: nil, err: fmt.Errorf("kube proxy paniced: %v\n%s", p, debug.Stack())}
-			}
-		}()
-		w := httptest.NewRecorder()
-		t.handler.ServeHTTP(w, req)
-		resp := w.Result()
-		defer resp.Body.Close()
-		ch <- result{resp: resp, err: nil}
-	}()
-	res := <-ch
-	return res.resp, res.err
-}
diff --git a/deployments/charts/kuma/templates/cp-webhooks-and-secrets.yaml b/deployments/charts/kuma/templates/cp-webhooks-and-secrets.yaml
index 15aaf2a38..560f6c75e 100644
--- a/deployments/charts/kuma/templates/cp-webhooks-and-secrets.yaml
+++ b/deployments/charts/kuma/templates/cp-webhooks-and-secrets.yaml
@@ -4,30 +4,44 @@ Generate certificates
 see: https://masterminds.github.io/sprig/crypto.html
 see: https://medium.com/nuvo-group-tech/move-your-certs-to-helm-4f5f61338aca
 see: https://github.com/networkservicemesh/networkservicemesh/blob/804ad5026bb5dbd285c220f15395fe25e46f5edb/deployments/helm/nsm/charts/admission-webhook/templates/admission-webhook-secret.tpl
+
+We only autogenerate certs if user did not chose their own secret.
+We only autogenerate certs if the cert is not yet generated. This way we keep the secrets between HELM upgrades.
 */}}
 
 {{- if eq .Values.controlPlane.tls.general.secretName "" -}}
-{{- $commonName := (include "kuma.controlPlane.serviceName" .) -}}
-{{- $altNames := list (printf "%s.%s" $commonName .Release.Namespace) (printf "%s.%s.svc" $commonName .Release.Namespace) -}}
-{{- $certTTL := 3650 -}}
-{{- $ca := genCA "kuma-ca" $certTTL -}}
+{{- $cert := "" }}
+{{- $key := "" }}
+{{- $secretName := print (include "kuma.name" .) "-tls-cert" }}
+
+{{- $secret := (lookup "v1" "Secret" .Release.Namespace $secretName) -}}
+{{- if $secret -}}
+  {{- $cert = index $secret.data "tls.crt" -}}
+  {{- $key = index $secret.data "tls.key" -}}
+  {{- $caBundle = index $secret.data "ca.crt" -}}
+{{- else -}}
+  {{- $commonName := (include "kuma.controlPlane.serviceName" .) -}}
+  {{- $altNames := list (printf "%s.%s" $commonName .Release.Namespace) (printf "%s.%s.svc" $commonName .Release.Namespace) -}}
+  {{- $certTTL := 3650 -}}
+  {{- $ca := genCA "kuma-ca" $certTTL -}}
 
-{{- $genCert := genSignedCert $commonName nil $altNames $certTTL $ca -}}
-{{- $cert := $genCert.Cert -}}
-{{- $key := $genCert.Key -}}
-{{ $caBundle = $ca.Cert | b64enc }}
+  {{- $genCert := genSignedCert $commonName nil $altNames $certTTL $ca -}}
+  {{- $cert = $genCert.Cert | b64enc -}}
+  {{- $key = $genCert.Key | b64enc -}}
+  {{ $caBundle = $ca.Cert | b64enc }}
+{{- end -}}
 ---
 apiVersion: v1
 kind: Secret
 type: kubernetes.io/tls
 metadata:
-  name: {{ include "kuma.name" . }}-tls-cert
+  name: {{ $secretName }}
   namespace: {{ .Release.Namespace }}
   labels:
   {{- include "kuma.labels" . | nindent 4 }}
 data:
-  tls.crt: {{ $cert | b64enc }}
-  tls.key: {{ $key  | b64enc }}
+  tls.crt: {{ $cert }}
+  tls.key: {{ $key }}
   ca.crt: {{ $caBundle }}
 {{- end }}
 ---
diff --git a/docs/cmd/kumactl/HELP.md b/docs/cmd/kumactl/HELP.md
index 27d9ff27c..6d34b1d8c 100644
--- a/docs/cmd/kumactl/HELP.md
+++ b/docs/cmd/kumactl/HELP.md
@@ -219,6 +219,7 @@ Use "kumactl install [command] --help" for more information about a command.
 
 ```
 Install Kuma Control Plane on Kubernetes in a 'kuma-system' namespace.
+This command requires that the KUBECONFIG environment is set
 
 Usage:
   kumactl install control-plane [flags]
@@ -259,6 +260,7 @@ Flags:
       --tls-kds-global-server-secret string         Secret that contains tls.crt, key.crt for protecting cross cluster communication
       --tls-kds-remote-client-secret string         Secret that contains ca.crt which was used to sign KDS Global server. Used for CP verification
       --use-node-port                               use NodePort instead of LoadBalancer
+      --without-kubernetes-connection               install without connection to Kubernetes cluster. This can be used for initial Kuma installation, but not for upgrades
       --zone string                                 set the Kuma zone name
 
 Global Flags:
diff --git a/go.sum b/go.sum
index e3426900d..cea278dc3 100644
--- a/go.sum
+++ b/go.sum
@@ -651,7 +651,6 @@ github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7P
 github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
-github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus=
 github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
 github.com/nakagami/firebirdsql v0.0.0-20190310045651-3c02a58cfed8/go.mod h1:86wM1zFnC6/uDBfZGNwB65O+pR2OFi5q/YQaEUid1qA=
 github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg=


Test patch:
diff --git a/app/kumactl/cmd/completion/testdata/bash.golden b/app/kumactl/cmd/completion/testdata/bash.golden
index 7aad18118..4475fa57b 100644
--- a/app/kumactl/cmd/completion/testdata/bash.golden
+++ b/app/kumactl/cmd/completion/testdata/bash.golden
@@ -1948,6 +1948,8 @@ _kumactl_install_control-plane()
     local_nonpersistent_flags+=("--tls-kds-remote-client-secret=")
     flags+=("--use-node-port")
     local_nonpersistent_flags+=("--use-node-port")
+    flags+=("--without-kubernetes-connection")
+    local_nonpersistent_flags+=("--without-kubernetes-connection")
     flags+=("--zone=")
     two_word_flags+=("--zone")
     local_nonpersistent_flags+=("--zone=")
diff --git a/app/kumactl/cmd/completion/testdata/zsh.golden b/app/kumactl/cmd/completion/testdata/zsh.golden
index 54ae2ddbe..b95d907f5 100644
--- a/app/kumactl/cmd/completion/testdata/zsh.golden
+++ b/app/kumactl/cmd/completion/testdata/zsh.golden
@@ -812,6 +812,7 @@ function _kumactl_install_control-plane {
     '--tls-kds-global-server-secret[Secret that contains tls.crt, key.crt for protecting cross cluster communication]:' \
     '--tls-kds-remote-client-secret[Secret that contains ca.crt which was used to sign KDS Global server. Used for CP verification]:' \
     '--use-node-port[use NodePort instead of LoadBalancer]' \
+    '--without-kubernetes-connection[install without connection to Kubernetes cluster. This can be used for initial Kuma installation, but not for upgrades]' \
     '--zone[set the Kuma zone name]:' \
     '--config-file[path to the configuration file to use]:' \
     '--log-level[log level: one of off|info|debug]:' \
diff --git a/app/kumactl/cmd/install/install_control_plane_test.go b/app/kumactl/cmd/install/install_control_plane_test.go
index f6f7e9d19..3bc9a0a13 100644
--- a/app/kumactl/cmd/install/install_control_plane_test.go
+++ b/app/kumactl/cmd/install/install_control_plane_test.go
@@ -106,7 +106,9 @@ var _ = Describe("kumactl install control-plane", func() {
 			}
 		},
 		Entry("should generate Kubernetes resources with default settings", testCase{
-			extraArgs:  nil,
+			extraArgs: []string{
+				"--without-kubernetes-connection",
+			},
 			goldenFile: "install-control-plane.defaults.golden.yaml",
 		}),
 		Entry("should generate Kubernetes resources with custom settings", testCase{
@@ -129,18 +131,21 @@ var _ = Describe("kumactl install control-plane", func() {
 				"--kds-global-address", "grpcs://192.168.0.1:5685",
 				"--zone", "zone-1",
 				"--use-node-port",
+				"--without-kubernetes-connection",
 			},
 			goldenFile: "install-control-plane.overrides.golden.yaml",
 		}),
 		Entry("should generate Kubernetes resources with CNI plugin", testCase{
 			extraArgs: []string{
 				"--cni-enabled",
+				"--without-kubernetes-connection",
 			},
 			goldenFile: "install-control-plane.cni-enabled.golden.yaml",
 		}),
 		Entry("should generate Kubernetes resources for Global", testCase{
 			extraArgs: []string{
 				"--mode", "global",
+				"--without-kubernetes-connection",
 			},
 			goldenFile: "install-control-plane.global.golden.yaml",
 		}),
@@ -149,6 +154,7 @@ var _ = Describe("kumactl install control-plane", func() {
 				"--mode", "remote",
 				"--zone", "zone-1",
 				"--kds-global-address", "grpcs://192.168.0.1:5685",
+				"--without-kubernetes-connection",
 			},
 			goldenFile: "install-control-plane.remote.golden.yaml",
 		}),
@@ -157,6 +163,7 @@ var _ = Describe("kumactl install control-plane", func() {
 				"--ingress-enabled",
 				"--ingress-drain-time", "60s",
 				"--ingress-use-node-port",
+				"--without-kubernetes-connection",
 			},
 			goldenFile: "install-control-plane.with-ingress.golden.yaml",
 		}),
diff --git a/app/kumactl/pkg/k8s/k8s_suite_test.go b/app/kumactl/pkg/k8s/k8s_suite_test.go
deleted file mode 100644
index 4b7eb1513..000000000
--- a/app/kumactl/pkg/k8s/k8s_suite_test.go
+++ /dev/null
@@ -1,13 +0,0 @@
-package k8s_test
-
-import (
-	"testing"
-
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-)
-
-func TestK8s(t *testing.T) {
-	RegisterFailHandler(Fail)
-	RunSpecs(t, "K8s Suite")
-}
diff --git a/app/kumactl/pkg/k8s/proxy_test.go b/app/kumactl/pkg/k8s/proxy_test.go
deleted file mode 100644
index 0c7d3da8e..000000000
--- a/app/kumactl/pkg/k8s/proxy_test.go
+++ /dev/null
@@ -1,153 +0,0 @@
-package k8s_test
-
-import (
-	"bytes"
-	"io/ioutil"
-	"net/http"
-
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/ginkgo/extensions/table"
-	. "github.com/onsi/gomega"
-
-	kube_rest "k8s.io/client-go/rest"
-
-	"github.com/kumahq/kuma/app/kumactl/pkg/k8s"
-)
-
-var _ = Describe("Proxy", func() {
-	Describe("NewServiceProxyTransport(..)", func() {
-
-		type testCase struct {
-			originalPath string
-			expectedPath string
-		}
-
-		DescribeTable("should rewrite request URI",
-			func(given testCase) {
-				// given
-				req, _ := http.NewRequest("GET", given.originalPath, nil)
-				expected := &http.Response{}
-
-				// setup
-				rt := RoundTripperFunc(func(req *http.Request) (*http.Response, error) {
-					Expect(req.URL.Path).To(Equal(given.expectedPath))
-					return expected, nil
-				})
-
-				// when
-				spt := k8s.NewServiceProxyTransport(rt, "kuma-system", "kuma-control-plane:http-apis-server")
-				// and
-				resp, err := spt.RoundTrip(req)
-				// then
-				Expect(err).ToNot(HaveOccurred())
-				// and
-				Expect(resp).To(BeIdenticalTo(expected))
-			},
-			Entry("", testCase{
-				originalPath: "",
-				expectedPath: "/api/v1/namespaces/kuma-system/services/kuma-control-plane:http-apis-server/proxy/",
-			}),
-			Entry("/", testCase{
-				originalPath: "/",
-				expectedPath: "/api/v1/namespaces/kuma-system/services/kuma-control-plane:http-apis-server/proxy/",
-			}),
-			Entry("meshes", testCase{
-				originalPath: "meshes",
-				expectedPath: "/api/v1/namespaces/kuma-system/services/kuma-control-plane:http-apis-server/proxy/meshes",
-			}),
-			Entry("/meshes/default/dataplanes", testCase{
-				originalPath: "/meshes/default/dataplanes",
-				expectedPath: "/api/v1/namespaces/kuma-system/services/kuma-control-plane:http-apis-server/proxy/meshes/default/dataplanes",
-			}),
-		)
-	})
-
-	Describe("NewInprocessKubeProxyTransport(..)", func() {
-		It("should process requests in-process using a given handler", func() {
-			// given
-			req, _ := http.NewRequest("GET", "/api/v1/namespaces/kuma-system/services/kuma-control-plane:http-apis-server/proxy/meshes", nil)
-
-			// setup
-			handler := http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-				w.WriteHeader(http.StatusOK)
-				_, err := w.Write([]byte("hi there!"))
-				Expect(err).ToNot(HaveOccurred())
-			})
-
-			// when
-			kpt := k8s.NewInprocessKubeProxyTransport(handler)
-			// and
-			resp, err := kpt.RoundTrip(req)
-			// then
-			Expect(err).ToNot(HaveOccurred())
-			// and
-			Expect(resp.StatusCode).To(Equal(http.StatusOK))
-
-			// when
-			data, err := ioutil.ReadAll(resp.Body)
-			// then
-			Expect(err).ToNot(HaveOccurred())
-			// and
-			Expect(string(data)).To(Equal("hi there!"))
-		})
-
-		It("should catch a panic and translate it into an error", func() {
-			// given
-			req, _ := http.NewRequest("GET", "/api/v1/namespaces/kuma-system/services/kuma-control-plane:http-apis-server/proxy/meshes", nil)
-
-			// setup
-			handler := http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
-				panic("something bad has happened")
-			})
-
-			// when
-			kpt := k8s.NewInprocessKubeProxyTransport(handler)
-			// and
-			resp, err := kpt.RoundTrip(req)
-			// then
-			Expect(err.Error()).To(MatchRegexp("kube proxy paniced: something bad has happened\n.+"))
-			// and
-			Expect(resp).To(BeNil())
-		})
-	})
-
-	Describe("NewKubeApiProxyTransport(..)", func() {
-		It("should work", func() {
-			// given
-			req, _ := http.NewRequest("GET", "/api/v1/namespaces/kuma-system/services/kuma-control-plane:http-apis-server/proxy/meshes", nil)
-			expected := &http.Response{
-				StatusCode: http.StatusCreated,
-				Body:       ioutil.NopCloser(&bytes.Buffer{}),
-			}
-
-			// setup
-			rt := RoundTripperFunc(func(req *http.Request) (*http.Response, error) {
-				Expect(req.Header.Get("Authorization")).To(Equal("Bearer abcdef"))
-				return expected, nil
-			})
-
-			// when
-			apt, err := k8s.NewKubeApiProxyTransport(&kube_rest.Config{
-				Host:        "1.2.3.4",
-				BearerToken: "abcdef",
-				Transport:   rt,
-			})
-			// then
-			Expect(err).ToNot(HaveOccurred())
-
-			// when
-			resp, err := apt.RoundTrip(req)
-			// then
-			Expect(err).ToNot(HaveOccurred())
-			// and
-			Expect(resp.StatusCode).To(Equal(expected.StatusCode))
-		})
-	})
-})
-
-type RoundTripperFunc func(*http.Request) (*http.Response, error)
-
-func (f RoundTripperFunc) RoundTrip(req *http.Request) (*http.Response, error) {
-	return f(req)
-}
diff --git a/mk/e2e.mk b/mk/e2e.mk
index 3f746220a..81db39d17 100644
--- a/mk/e2e.mk
+++ b/mk/e2e.mk
@@ -313,7 +313,7 @@ load/example/minikube: ## Minikube: Load Docker images into Minikube
 
 deploy/kuma/minikube: ## Minikube: Deploy Kuma with no demo app
 	eval $$(minikube docker-env) && $(call pull_docker_images)
-	eval $$(minikube docker-env) && docker run --rm $(KUMACTL_DOCKER_IMAGE) kumactl install control-plane $(KUMACTL_INSTALL_CONTROL_PLANE_IMAGES) | kubectl apply -f -
+	eval $$(minikube docker-env) && docker run --rm $(KUMACTL_DOCKER_IMAGE) kumactl install control-plane $(KUMACTL_INSTALL_CONTROL_PLANE_IMAGES) --without-kubernetes-connection | kubectl apply -f -
 	kubectl wait --timeout=60s --for=condition=Available -n kuma-system deployment/kuma-control-plane
 	kubectl wait --timeout=60s --for=condition=Ready -n kuma-system pods -l app=kuma-control-plane
 
diff --git a/test/framework/k8s_controlplane.go b/test/framework/k8s_controlplane.go
index e27df67fd..74a857af6 100644
--- a/test/framework/k8s_controlplane.go
+++ b/test/framework/k8s_controlplane.go
@@ -185,6 +185,12 @@ func (c *K8sControlPlane) FinalizeAdd() error {
 }
 
 func (c *K8sControlPlane) InstallCP(args ...string) (string, error) {
+	// store the kumactl environment
+	oldEnv := c.kumactl.Env
+	c.kumactl.Env["KUBECONFIG"] = c.GetKubectlOptions().ConfigPath
+	defer func() {
+		c.kumactl.Env = oldEnv // restore kumactl environment
+	}()
 	return c.kumactl.KumactlInstallCP(c.mode, args...)
 }
 
@@ -192,15 +198,15 @@ func (c *K8sControlPlane) InjectDNS(args ...string) error {
 	// store the kumactl environment
 	oldEnv := c.kumactl.Env
 	c.kumactl.Env["KUBECONFIG"] = c.GetKubectlOptions().ConfigPath
+	defer func() {
+		c.kumactl.Env = oldEnv // restore kumactl environment
+	}()
 
 	yaml, err := c.kumactl.KumactlInstallDNS(args...)
 	if err != nil {
 		return err
 	}
 
-	// restore kumactl environment
-	c.kumactl.Env = oldEnv
-
 	return k8s.KubectlApplyFromStringE(c.t,
 		c.GetKubectlOptions(),
 		yaml)