Repository: kumahq/kuma
Pull request #1043 (2020-09-30 09:38:11)

fix(kuma-cp) CNI relies on annotations
### Summary

The current state of CNI has a couple of problems after recent changes

* On the latest OpenShift namespace name for controller was empty (due to Watch on the Mesh)
* RBAC for NAD was lost when migrating to HELM
* Namespace controller was relying on labels, not annotations
* We were not deleting NAD when a user removes Kuma annotation from the namespace

### Documentation

- [ ] No docs, internal fixes.



Patch:
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 cd7d38483..32b1ace8a 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, 9, 18, 8, 21, 4, 141738361, time.UTC),
+			modTime: time.Date(2020, 9, 28, 12, 56, 47, 951836718, time.UTC),
 		},
 		"/.helmignore": &vfsgen۰CompressedFileInfo{
 			name:             ".helmignore",
@@ -32,21 +32,21 @@ var HelmTemplates = func() http.FileSystem {
 		},
 		"/Chart.yaml": &vfsgen۰CompressedFileInfo{
 			name:             "Chart.yaml",
-			modTime:          time.Date(2020, 9, 8, 11, 23, 47, 178483800, time.UTC),
+			modTime:          time.Date(2020, 9, 24, 9, 57, 34, 6302958, time.UTC),
 			uncompressedSize: 265,
 
 			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x02\xff\x44\x8e\xb1\x4e\x03\x31\x0c\x86\xf7\x3c\x85\x5f\xe0\x92\x02\x03\x52\x36\xc4\x82\xc4\xc2\xd4\xdd\xcd\x99\x8b\xd5\x24\x36\x49\xee\xaa\xbe\x3d\x4a\x44\xc5\x64\xe9\xb3\x7f\xff\x1f\x2a\x9f\xa9\x36\x96\xe2\xe1\x78\x36\x05\x33\x79\xb8\xee\x19\xcd\x4a\x2d\x54\xd6\x3e\x57\x6f\xf0\x41\x29\x43\x88\x58\x3b\x7c\x4b\x85\x1e\x09\x3e\xf7\x8c\xf0\x2e\xa5\x57\x49\xf0\x95\xb0\x90\xe9\x77\x25\x0f\xa8\x9a\x38\xe0\x88\x9a\xe3\xf1\xfd\x64\x5f\xec\xc9\xa0\xea\xf9\x9f\xbc\xda\x27\x13\x65\x54\xc6\xde\xb5\x79\xe7\x36\xee\x71\xbf\xd8\x20\xd9\x0d\x8b\xf8\x33\x87\xe1\x30\x02\x8f\xa3\x81\x2c\x8b\xe3\x8c\x1b\x35\x77\xa9\x58\xd6\x09\x97\x24\x9b\x2c\x85\x6e\xb6\x1d\x9b\xb9\xd2\xfd\x26\x75\x6d\xde\x00\x2c\xd0\xa8\x1e\x1c\x08\x32\xb5\x38\x41\xf8\x33\xd7\x69\xfe\x1b\x00\x00\xff\xff\xd9\x76\x18\x85\x09\x01\x00\x00"),
 		},
 		"/README.md": &vfsgen۰CompressedFileInfo{
 			name:             "README.md",
-			modTime:          time.Date(2020, 9, 18, 8, 21, 4, 141572929, time.UTC),
+			modTime:          time.Date(2020, 9, 28, 12, 56, 47, 949870700, time.UTC),
 			uncompressedSize: 9833,
 
 			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x02\xff\xc4\x9a\xdf\x73\xdb\xb8\x11\xc7\xdf\xf9\x57\x6c\xc7\x2f\xfd\x61\x51\x4e\xd3\xbb\xc9\xf8\x2d\xb5\xe7\x5a\xcd\xa5\x1e\x4f\x7c\xbd\x3e\x38\x9e\x10\x02\x56\x14\x2a\x10\xcb\xc1\x82\x76\x74\xa7\xfc\xef\x1d\x80\xa2\x64\xcb\xfa\x41\x89\x4c\xa3\x87\x44\x16\x81\x05\x3e\xd8\xc5\x8f\xfd\x12\xf7\x7f\xb8\x7f\xb8\x9f\x55\x85\x18\x18\xca\xe9\x61\xf9\xbd\x72\xe6\x21\x49\xce\x20\xfc\x91\x24\xbf\x4c\x31\x7e\x03\x39\x15\xce\x03\x57\x65\x49\xce\x33\x08\x63\xc0\x4f\x11\x26\x28\x7c\xe5\x90\x41\x58\x05\x54\x7a\x4d\x96\xa1\x74\xf4\xa8\x15\x2a\x18\xcf\x21\x0b\xb5\xa5\x37\xa0\x2d\xfb\x50\x4b\x92\xf5\x8e\xcc\xa0\x34\xc2\x62\x96\xc6\x16\x36\x8c\xff\x13\x4d\x01\x8f\x6f\xff\x92\x26\xc9\xd9\x19\xfc\x2a\x4c\x85\x9c\x24\x0b\xb8\x15\x4e\x14\xe8\xd1\x41\xeb\xcf\x02\xae\x91\xa5\xd3\xb1\x67\xd0\xcf\x27\xd8\x9c\x88\xca\xf8\x13\xaa\x26\x8b\xc1\x31\x9f\xa6\xda\xa0\xff\x4f\x07\x9b\x8b\x64\x01\x59\x6e\x68\x2c\x4c\xaa\x0b\x91\x63\xea\x30\xd7\xec\xdd\x3c\x6b\x37\x6e\x4d\x71\x98\x90\x8b\xa1\xf4\x73\x08\xb1\x68\x8a\x8f\xf5\x45\x36\x23\x9b\x0f\x14\xc9\x19\xba\x41\x8c\xe0\xfa\x7b\x3a\xd6\xd6\x3b\x31\x4f\x35\x65\xbb\x7c\xb1\x41\xe1\x45\x9e\x1d\xe1\x7d\x2f\xf2\xee\x00\x4b\x9b\x56\x9b\x73\x50\xb5\x61\x06\x4f\x70\x15\xa6\x44\xfa\xbe\x2c\x7f\x45\xc7\x7b\x62\x37\x52\x94\xc2\xcb\xe9\xdd\x9c\x3d\x16\x37\xa2\x40\x2e\x85\xc4\xec\x40\x8b\xb7\xa1\x4e\x9c\xc3\x0e\x0d\x0a\x46\xb0\x4d\x55\x78\xd2\xbe\x7e\x14\xb1\x38\x1a\x06\x23\xc6\x68\x0e\xf8\xc2\xbb\x0a\x33\x38\x69\x5e\x40\xb6\x5c\x19\x6e\xc3\xc2\x90\x1a\xca\x3f\xe0\x23\x9a\x03\x11\x15\x3b\x78\x75\x0b\x86\x72\x30\xa1\xfc\x25\x90\x45\xa0\x09\xd0\x64\xf2\x69\xa1\xed\x84\x3e\x2d\x14\x8e\xab\xfc\x88\x88\x0a\xb5\xfa\xa1\x28\x48\x1d\x1e\x8f\x35\x45\x28\xce\x2b\x02\xf6\xc2\x2a\x61\xc8\xe2\xa7\x85\xc3\x82\x3c\x7e\x5a\xd4\xf1\xda\x8a\x62\x5d\x3d\xeb\x48\xf1\x5b\x1b\x1b\x4b\x8a\x50\x36\x46\x52\x3f\x2b\xad\xd5\xe6\xc4\xaa\xaf\x28\x66\x8a\xff\x11\x47\xef\xbd\x52\x0e\x99\xb3\xed\x2d\xfe\xfb\xe3\x87\x30\xf8\x75\xd1\x95\x67\xba\x51\x9c\x5e\xf5\x15\x85\x25\x85\x77\x68\x50\x7a\x72\xd9\xee\x16\x6f\x48\x21\x34\xe5\xe2\x2a\xb5\x9a\xce\x57\xb5\x39\x88\xf6\xa0\x24\xc5\x6d\xe7\xc5\xef\x30\xab\xc6\xe8\x2c\x7a\xe4\x54\xd3\x90\xf8\x12\x8c\xb6\xd5\x97\xf3\x8d\x07\xc2\xc9\xe9\x25\x88\x42\xfd\xf8\x37\xf8\x9a\x6d\xa1\xd0\xf6\xbf\xb1\x67\x3f\x09\x6d\x2a\x87\xb7\x64\xb4\x7c\xb5\x79\x2c\x60\xf9\x18\xca\xf8\x3c\xb8\x25\x50\x14\x95\x17\x5e\xdb\x1c\x9e\x70\x3c\x25\x9a\x81\x2e\x4a\x83\x05\x5a\x5f\x1f\x39\x56\xa4\xa3\x65\x2b\x20\xa9\x28\xc9\xa2\xf5\x81\x62\x94\x5b\x72\x27\xac\x52\xaf\x29\x18\xdd\xa3\x96\x98\x86\x70\xdf\xe3\x8b\xbb\xba\x58\x3d\x2b\x96\x0c\x5b\x3c\xf1\xbd\xe6\x45\x43\xe1\xe7\x65\x1b\x8a\x50\xac\x2f\x8a\x2b\x53\xb1\x47\x37\xba\xed\x8f\x42\x58\x4b\x21\x3c\xc8\x6e\x99\xe0\x0b\x78\xaf\x94\x0e\x0f\x85\x81\x67\x25\xc3\x86\x5b\x56\x1e\xc8\xee\xc2\x5a\x9a\xdf\x4a\xf1\xfb\xd7\xde\x66\x77\xbd\xbc\x7f\x8c\x8b\xfd\xdd\xdc\xca\xbb\x6d\x11\xb6\x3d\xa2\xea\x05\x6b\x50\xd7\x85\x50\xf9\xbb\x45\xd4\x2e\x8a\x17\x11\xb6\x3d\xa2\xba\x52\x7c\x20\xa1\xfe\x2e\x8c\xb0\xf2\x98\x2c\xe1\x28\x8a\x90\xa3\x3c\xa3\xb8\x25\x17\x03\xe7\x69\xaa\xe5\x74\x5b\xff\x35\x03\x7e\x29\x89\x51\xb5\xa6\xf8\xe1\xc7\x77\x3f\x7c\x63\x5f\xbc\x98\x27\x2d\xe7\xc5\x16\xb8\xff\xd3\xbc\x68\x4e\xc6\x29\xcf\x74\xf9\x2f\xe4\xe9\x95\xc3\xd8\xc5\xec\x45\x8b\xff\x99\xa2\x9f\xa2\x03\x72\x60\xc9\x87\xde\x87\xf2\x20\x63\x61\x9b\x47\x88\xa5\x29\x08\x56\x5a\xed\x7a\xfd\x9d\x69\x1d\x32\x55\x4e\x22\x67\x7b\x5b\x0c\x19\xf1\xcf\xef\x18\x56\xc5\x81\x4b\x94\x71\x13\x3f\xf1\x38\xd2\xe4\x17\x7a\x32\x41\xc7\x30\x16\x21\x18\xc9\xc6\xf3\xe6\xd1\x14\xde\x70\x2a\xf1\xd9\x1c\xd8\x41\xf1\xe1\x0e\x42\x31\x3d\xd1\x52\x78\x5c\x9d\x41\x56\xd9\x52\x08\x9d\xd0\x9b\x63\x29\x72\xb4\xe8\x44\xd8\xeb\x85\x55\xc0\x68\x26\x03\xd6\xb9\xdd\x3b\xbd\xb6\x53\xcc\x70\x7e\x28\x4b\x0a\x14\x33\x9c\xf7\xd0\xfb\x6f\x42\x51\xe7\xad\x65\x65\xcc\xf6\x23\xd4\x46\x7e\x31\x0a\xc5\x6f\x57\xa5\x3b\x9d\x69\xb3\xd1\xe4\x86\xfc\xad\x43\x46\xeb\xb3\x4e\xf3\xa2\x95\x86\xb0\xa6\x88\xc5\xd7\x1a\x42\xd7\xfc\xe2\x1c\x2a\x46\x86\xb6\x99\xd5\x41\x8a\x92\x58\x7b\x72\x87\x7c\xd1\x50\x34\xc5\x3b\xf9\x22\xea\x1e\xb2\xcc\xba\xaf\x51\xad\x94\x90\x4d\x0a\x2f\xf2\x7e\x72\xbd\x2e\xbe\xb0\x3a\x45\x2b\xc6\x06\x55\xd6\xb6\xc5\xd1\x52\x93\x8c\x34\x51\xf4\xb8\xba\x19\x45\xa5\x12\x85\x0a\x47\x92\xd2\xd1\x97\x39\x68\xab\x7d\xd4\x2d\x85\xb6\x07\x8e\x15\x0b\xc8\x26\xc2\xf0\x29\x1b\xc6\x8a\xa2\x95\xf4\xf1\xfc\x14\x7d\x33\xea\x51\xff\xe8\x45\x03\xb1\xba\x5d\xa2\x7a\x30\x63\x0d\x6c\xad\x53\xd4\xbe\x33\x56\xab\x8f\x91\x37\x57\xbe\xe8\x6f\x7d\x5a\x52\x2c\x05\x4d\x7d\xac\x43\x5e\x51\xec\x5d\x9a\x76\x50\x74\x5f\x9f\x96\x14\x86\xc6\x33\x7a\xd4\x66\x2e\x86\xcb\x77\x01\x03\x69\x75\x76\x2c\x45\x2b\x91\x76\x75\x8e\x5a\x93\xf4\xb3\x46\x65\x17\xe9\x45\xfa\xe6\xd4\xd9\xad\x84\x17\x47\x6c\x79\xeb\xd3\x60\x58\x9f\xae\xfb\xda\xf9\xba\xae\xb4\xaf\x29\x0e\xc5\xd5\x76\x8a\x6e\x91\xd5\x75\xd7\xdb\xa4\x38\x1c\x57\xdb\x28\xba\x46\x55\x8f\xbe\xb0\xda\x8f\x5a\x44\xd5\x06\x45\xd8\xda\x3a\x87\xd5\xb7\xa1\xd8\x17\x55\x7b\x28\x4e\x0e\xab\x26\xa2\x82\xb5\xac\x5b\x44\xad\x28\xf6\x47\xd5\x4e\x8a\x0e\x61\xd5\xd5\x17\xda\xe6\x0e\x99\x8f\x38\x4b\x2d\x60\x34\x81\x90\x25\x9f\x83\xf6\xa0\xb0\x34\x34\x67\x18\xd5\x76\xe2\x4e\x2e\x1d\x31\x83\xac\xd5\x3e\x90\x54\x14\x95\x0d\x59\xe1\xee\xf7\x5a\x0b\x88\xc7\xa8\x93\xd5\x83\x86\x42\x39\xa1\xed\x2f\xba\x68\xf3\xfe\x22\x14\x8b\xdd\xad\xa5\x1c\x32\x0a\x8c\x66\x1f\x12\x35\x78\xd2\xc6\x00\xfb\xf0\xef\x18\x41\x48\xaf\x1f\x11\x04\x43\xb4\xaf\x6d\xbe\xcb\xe6\xdb\x0b\xee\xa0\x81\x34\x14\xad\x84\xe6\x3d\xda\x60\xe3\x8b\xef\xf3\x16\x66\x93\x62\xaf\xd0\xbc\x47\x1b\xec\x4a\xd1\x4d\x1b\xdc\xa4\x78\x21\x03\xee\x7a\xc7\xfa\x42\x1b\x6c\xfa\x7f\xb4\x20\xf8\xc2\xe6\x9b\x8b\x8b\x8b\x37\xbd\xf9\x62\xaf\x5c\x7e\x8c\x66\xde\xc0\xed\x16\x04\x7b\xd4\x06\x1b\x8a\x02\x79\xda\x36\x4b\x8a\x7a\x9f\xa7\xa5\x2f\xae\x85\x17\xf1\x06\xca\xaa\xe3\x63\x34\x64\xf3\x88\xd5\xda\x17\xea\xf4\x7b\x20\xc9\xd9\x19\x5c\x55\xec\xa9\x80\x8f\x4b\x9d\x0f\xae\x71\x12\xf6\x80\x30\xba\x49\xf2\xbe\xc9\x4b\xaf\x3e\x5e\x33\x08\x87\x60\x48\x28\x54\xf0\xa8\x45\x1c\xf1\xfb\x4c\x3a\xc5\xd9\xc3\x1f\xc3\x7f\x7f\x02\xa5\x5d\x4c\x9d\xe6\x29\xfc\x44\x0e\x0a\x72\x08\x0a\xbd\xd0\x06\x15\x84\x6c\xce\x15\xf5\x82\x4b\x76\x69\xd2\xaa\x78\xd3\xe6\x3c\x29\xeb\xf7\xff\x0e\x27\xe8\x02\xff\x7d\x30\x1f\x2f\xe1\x28\x92\x55\x81\xb6\x76\xf9\xc3\xfd\x14\x4d\x31\x90\x4e\x3d\xd4\x37\x73\x6e\xc8\xe3\xea\xae\x02\xa8\x90\x7e\x52\x89\x8e\x93\xf5\xa5\x9e\xba\xe7\x15\xc7\x3e\x78\x74\x56\x18\x13\x12\xea\x57\xf7\x82\xb2\xf3\x00\xe5\x70\x12\xfa\x1d\x6f\x16\x91\x31\xf4\x14\x96\x56\x57\x19\x64\x10\x65\x69\xe6\xf0\x34\x45\xdb\xb4\x14\x9e\x59\x7c\x0a\x0d\xf9\xd5\x45\xa4\xcb\x04\xfe\x1c\xda\x83\xac\x10\x33\x5c\xc9\x6c\xc3\x65\x73\x4d\xea\x31\x9c\xbd\xe3\xe1\xcb\xab\x48\x51\x2e\x9e\x5b\x09\x2b\xfa\x9a\x2b\x8c\xd3\xab\xde\x82\xc7\xa2\x34\xc2\x23\x87\xf6\xe2\x6d\xa8\xe6\x07\xf0\xa1\x3f\xec\x43\xdd\xa8\x29\x64\xa5\xc3\x41\x56\xdb\x29\x89\x7d\xf8\xee\x10\xa8\xd0\xde\xa3\xaa\x91\x4a\x47\x12\x99\x03\xd2\xb6\xc1\x01\x48\x92\xf5\xf5\xac\x4b\x98\x7a\x5f\xf2\xe5\x30\x52\x85\xf4\x35\x79\x76\x8f\xeb\xe5\xd3\x41\x59\x8d\x8d\x96\x03\xc1\x8c\x9e\x53\x7e\x9b\x8a\x42\xfc\x46\x56\x3c\x71\x2a\xa9\x18\xae\xea\x0d\x1e\xff\x9a\x96\x36\x4f\xd6\x4e\x5e\x1b\x0a\x3f\xa5\x3c\x1d\x2a\x92\x3c\x8c\x7e\xfd\x3c\x46\xf6\x9f\x4b\x17\x76\x42\x89\x3c\x94\x31\x94\x3f\x37\x92\xf5\x67\xb5\x0e\xe5\x61\xf2\xbf\x00\x00\x00\xff\xff\xc6\xab\x84\x50\x69\x26\x00\x00"),
 		},
 		"/crds": &vfsgen۰DirInfo{
 			name:    "crds",
-			modTime: time.Date(2020, 8, 7, 14, 28, 17, 766503188, time.UTC),
+			modTime: time.Date(2020, 9, 28, 12, 56, 40, 7593884, time.UTC),
 		},
 		"/crds/circuit-breaker.yaml": &vfsgen۰CompressedFileInfo{
 			name:             "circuit-breaker.yaml",
@@ -141,7 +141,7 @@ var HelmTemplates = func() http.FileSystem {
 		},
 		"/templates": &vfsgen۰DirInfo{
 			name:    "templates",
-			modTime: time.Date(2020, 9, 18, 9, 19, 48, 12669714, time.UTC),
+			modTime: time.Date(2020, 9, 29, 9, 24, 11, 829275335, time.UTC),
 		},
 		"/templates/NOTES.txt": &vfsgen۰CompressedFileInfo{
 			name:             "NOTES.txt",
@@ -166,7 +166,7 @@ var HelmTemplates = func() http.FileSystem {
 		},
 		"/templates/cni-daemonset.yaml": &vfsgen۰CompressedFileInfo{
 			name:             "cni-daemonset.yaml",
-			modTime:          time.Date(2020, 9, 16, 12, 28, 12, 986457107, time.UTC),
+			modTime:          time.Date(2020, 9, 24, 9, 57, 34, 7303355, time.UTC),
 			uncompressedSize: 2929,
 
 			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x02\xff\x94\x56\x5d\x6f\xdb\xb8\x12\x7d\xf7\xaf\x18\xb8\x05\xda\x02\x91\x84\x5e\xdc\x16\x17\xba\x4f\xd9\x34\xed\x1a\x6d\xdc\x20\x1f\x5d\x2c\x16\x8b\x60\x4c\x8e\x2c\xc2\x14\x47\x4b\x8e\x9c\x7a\xd3\xfc\xf7\x05\xf5\x61\xcb\x89\xd3\x76\xf5\x10\x44\xd4\xcc\xe1\xe1\x99\x33\x43\xdf\xdd\x25\x60\x0a\x48\xbf\xa0\x6d\x28\xa4\xca\x99\x94\x1c\x2e\x2c\x69\xb8\xbf\x9f\xac\x8c\xd3\x39\xbc\x43\xaa\xd8\x5d\x92\x4c\xb0\x36\x5f\xc8\x07\xc3\x2e\x07\xac\xeb\x90\xad\x5f\x4f\x2a\x12\xd4\x28\x98\x4f\x00\x1c\x56\x94\xc3\xdd\x1d\x18\xa7\x6c\xa3\x09\xa6\xab\xa6\xc2\x34\x2e\x4f\x21\x85\xfb\xfb\x44\x39\x93\x38\xd6\xd4\x07\x87\x1a\x15\xe5\xb0\x6a\x16\x94\x84\x4d\x10\xaa\x26\x00\x16\x17\x64\x43\xc4\x6b\xd9\xed\x41\x29\x67\x3e\xb5\x9f\x23\xde\x37\x70\xc6\x69\x72\x02\xff\x8d\x6c\x43\x4d\x2a\x66\x05\xb2\xa4\x84\x7d\xfc\x1f\xa0\x42\x51\xe5\xa7\xef\x43\x5e\xf6\x19\x87\xa0\xdf\x46\x68\x80\xa6\xd6\x28\x74\x29\x1e\x85\x96\x9b\x0e\x5a\x36\x35\xe5\x70\xc1\xd6\x1a\xb7\xbc\x6e\x03\xda\x75\x3f\x5e\xe9\x42\x23\x8f\xaf\xd7\x0e\xd7\x68\x6c\x94\x37\x87\xd7\x13\x00\xa1\xaa\xb6\xdb\x98\xb1\x92\xf1\xd9\xe9\x10\x9f\x7f\x4d\xfc\x7f\x1d\xf1\xf8\xa0\x73\x2c\x28\x86\xdd\x16\x0e\xe0\x19\x5c\x95\x26\x1c\x01\x5a\x76\x4b\xb8\x35\x52\x82\x94\x04\x27\xde\x88\x51\x68\x8f\xb5\x66\x17\x3e\x3b\xbb\x01\x61\x4b\xbe\x4d\x87\x05\x59\xbe\x3d\x1a\x61\x54\xe8\x57\xa1\x4d\xac\x59\x03\x06\x40\x50\x3d\x02\xa0\xd6\x09\xbb\x23\x20\x17\x1a\x6f\xdc\x12\x8c\xc0\x92\x24\x8c\xd2\x6b\x6f\xd8\x1b\xd9\x40\x50\x25\xe9\x26\xca\x06\xe8\x34\x48\x89\x02\x46\x02\x78\x0a\xdc\x78\x45\x01\xd0\x53\x7c\x23\xbf\x26\x3d\x42\x30\x45\x84\xa5\x35\xf9\x16\x1b\x68\x6d\x94\x90\x4e\xb7\x21\x3d\x32\xf9\x14\x6d\x5d\x62\x1a\xcd\xe6\x1d\x09\x85\xd4\x70\x36\x90\x4d\x6a\xd6\x39\xbc\x78\xb1\x4d\x53\x25\xa9\x55\x68\xaa\x4c\xb1\x2b\xcc\x72\xcf\xd6\x2f\x6b\x6f\x9c\xc0\xf3\xf4\xaa\x2f\x60\xfa\x0b\x06\x3a\x47\x29\x61\x9a\x45\x8b\x77\x39\x15\xd6\xe9\x06\x2b\x3b\x7d\xd5\x16\x26\x94\xf8\x9f\x37\x6f\x43\x53\x0d\x85\x19\x0c\x3b\x94\xb7\xad\xc1\xb8\x15\x63\xa7\x0c\x25\xde\x55\x73\xbc\xba\x4b\x07\xe1\xdf\xb1\xb2\x4f\x59\x20\xe2\x93\xd3\xbb\x85\x92\x83\xcc\x49\x6e\xd9\xaf\x72\x10\xdf\x50\xbf\xbe\x2b\xf6\x9e\x57\xce\x70\x45\x10\x1a\x4f\x10\xbd\xb7\xed\xe3\x4e\xf3\x41\x62\x0d\xec\x00\xad\x6d\x29\x86\x5d\x09\x12\xa0\xa2\x20\x25\x39\xcc\xf9\xb2\x8f\xdd\x7e\x04\xe0\x3a\xee\xc8\x3e\x87\xd3\xaf\x26\xec\xf9\xe3\x0c\xfd\xea\xbb\xee\x82\x82\x7d\xb4\xc5\xd6\x3e\xe3\x5d\x57\xb4\xc9\x0f\x18\xfa\x67\xb6\x1e\x53\x3e\xfd\x4a\xaa\x91\x9f\x60\x3c\xb8\xf9\xc4\x62\x08\xf3\x76\x18\x76\x53\x2d\x51\xb6\x09\x42\x3e\x19\xd8\xf7\x09\xd1\xcd\x46\xd1\xb1\x52\xdc\x38\xe9\x32\x06\x7d\x27\x5b\x0d\x8c\x33\x95\xf9\x9b\x40\xf3\xad\x13\x53\x11\xe8\xae\x9d\x70\x98\x34\xd0\xd4\x4b\x8f\x9a\x80\x3d\x68\xb2\x14\xab\xf7\x7f\x10\xb2\x16\x3e\x6e\xdd\x0e\xc2\xa0\x19\x10\xa6\x05\x7b\x45\x5b\xf8\x21\x61\x9a\x43\x29\x52\x87\x3c\xcb\xf6\x5b\x44\xb3\x0a\xb1\x0b\x14\xd5\x12\xb2\x68\x18\xcb\xa8\x43\x56\x73\xf7\x27\x7b\x26\xe4\x2b\xe3\x5a\xd3\x24\x5c\xc4\x56\xda\x16\x7f\xf4\xe9\x83\x47\x45\xe7\xe4\x0d\xeb\x4b\x52\xec\x74\xc8\xe1\x4d\x1f\xa6\xd8\x09\x1a\x47\x7e\x64\xba\xa4\xbf\x4f\x8c\x0b\x82\xd6\x8e\x34\x89\x8f\xa9\x70\x79\xe8\xb2\x29\xd8\x57\x28\xb3\xf8\x75\x0a\x2f\xb5\x51\x02\x53\xd3\xbd\x8d\x5b\xab\x5d\x82\xa9\x67\x96\x29\x3c\x7f\x05\xdf\xe0\xaf\x86\x85\x76\xfd\xb1\xdd\xe3\xbc\xb1\xf6\x9c\xad\x51\x9b\x1c\x8e\xed\x2d\x6e\xc2\x28\x42\x71\x55\x61\xbc\x24\xff\x98\x66\x23\x9e\x69\x28\xa7\x7f\x8e\xc2\xc8\xad\xf3\xd1\x6b\x94\x3d\x16\x1b\xb8\xe8\x66\xee\x7c\x06\xdd\xc8\x80\xc2\x58\x8a\x95\x52\x9e\xe2\x5c\xd9\x4b\x1a\x04\x39\x99\xcf\x6e\x4e\x3e\xcf\xdf\xdf\xcc\x8f\xcf\x4e\xf7\x22\x00\xd6\xf1\x88\x79\xa7\x45\xcb\x24\xe2\x4e\x1f\xec\x7d\xd5\xef\xe9\xba\xfe\x1f\xf6\x16\x1e\xb4\x8e\x7d\x4c\xa8\xca\xb6\x91\x9f\x26\x31\x3f\xbd\xfa\xed\xf3\xc5\xc7\x96\xcc\xec\xc3\x21\x26\xef\x3d\x57\xf9\x83\x0f\xd0\xef\x77\x86\xf5\x47\xda\x5c\x50\xf1\x38\xe0\x67\x7f\x4a\x74\x40\x07\xd2\xdb\xce\x57\xce\xdc\xf4\x47\xbc\x39\x10\xf9\xe0\x24\x37\xef\x66\x17\x87\xc5\xcc\x48\x54\x1c\xeb\x59\xd5\x58\x69\x42\xe6\x48\x52\xfd\x40\xd2\x59\xd1\x0e\xd1\x23\xd0\x54\x5b\xde\xf4\xb3\xaa\x8c\x9e\xd6\xad\xd6\xb5\x6d\x96\xc6\x1d\x01\x4b\x49\xfe\xd6\x04\xda\x8b\x0c\x82\x4e\xc7\x9b\xb8\x2d\xcc\x61\x9a\xbf\x1e\xcf\xe6\xa7\xef\x6e\x22\xdd\xf3\x4f\xd7\x1f\x66\xf3\x27\x4a\x5f\xa0\x0d\x34\x2e\xf9\x9a\x6d\x53\xd1\x59\x1c\x31\x21\x7f\x80\x5d\xc5\xd5\x78\x73\xe5\x90\xc5\x2b\x21\xe3\x5a\xda\xb3\x2e\x8c\x9b\x1c\x2a\x49\x94\x7d\x61\x5c\xa2\x8d\xff\x11\xd4\x20\xdb\x63\xbd\xc6\x60\x8e\x64\x04\xd6\x71\xdd\xbb\x7a\xae\x03\xe9\xb1\x37\x4f\xe6\xb3\xf4\xd1\x90\x38\x4c\x2b\xd2\x68\x19\xed\xed\x5e\x77\x1c\xd7\xe8\x33\x6b\x16\x8f\x4e\x9b\x3c\x49\xee\x87\x90\x4f\x18\x65\x74\xf9\xfe\x13\x00\x00\xff\xff\xb6\xbe\x03\xf8\x71\x0b\x00\x00"),
@@ -187,7 +187,7 @@ var HelmTemplates = func() http.FileSystem {
 		},
 		"/templates/cp-deployment.yaml": &vfsgen۰CompressedFileInfo{
 			name:             "cp-deployment.yaml",
-			modTime:          time.Date(2020, 9, 17, 12, 52, 10, 936301747, time.UTC),
+			modTime:          time.Date(2020, 9, 28, 12, 56, 47, 951268512, time.UTC),
 			uncompressedSize: 5252,
 
 			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x02\xff\xbc\x57\x51\x73\xda\x38\x10\x7e\xcf\xaf\xd0\x30\x7d\x68\x1f\x30\x49\x9a\xa4\x3d\xcf\xf4\xc1\x01\x35\xf5\x05\x1b\xc6\x36\x99\xc9\xbd\x78\x14\x7b\x03\x1e\x64\xc9\x95\x64\x7a\x5c\x9a\xff\x7e\x23\x1b\x08\x18\x1b\x70\x7b\x73\x3c\x81\xb4\xbb\xdf\xb7\xab\xd5\xc7\x8a\x64\xc9\x03\x08\x99\x70\x66\x22\x92\x65\xb2\xb7\xb8\x38\x9b\x27\x2c\x36\xd1\x00\x32\xca\x97\x29\x30\x75\x96\x82\x22\x31\x51\xc4\x3c\x43\x88\x91\x14\x4c\xf4\xf2\x82\x12\x16\xd1\x3c\x06\xd4\x99\xe7\x29\x31\xf4\x72\x07\x19\xe8\xf5\xb5\x1b\x71\xa6\x04\xa7\xdd\x8c\x12\x06\x2b\x0f\x99\x91\xa8\x74\x33\x3c\xa0\x40\x24\x18\xee\x7a\x19\xbd\xbe\x9e\x21\x44\xc9\x13\x50\xa9\x11\x10\x7a\x79\xe9\x56\xc2\x97\xbb\x1a\xe0\x27\x62\x09\x8b\x81\x29\x74\x55\x3a\x22\xcd\xdb\x44\xda\xac\x02\x2d\x33\x88\x74\x40\xa9\x04\x51\x30\x5d\x96\xc1\x05\xa7\x34\x61\xd3\x49\x16\x13\x05\xe5\x12\x42\x29\xf9\xdb\xcf\xc5\x14\x4c\x74\xf1\xb6\x32\x61\x64\x41\x12\x4a\x9e\x28\x98\xe8\x5c\x07\x02\x0a\x91\xe2\xa2\xf4\x4a\x89\x8a\x66\xc3\x2d\xda\x75\xc4\xd7\x2e\xc3\x9a\x04\x6e\xd6\x09\x34\xa7\x80\x90\x82\x34\xa3\x1b\xa6\xdb\x27\x51\xf8\x31\xc6\x15\x51\x09\x67\x1b\x0e\x08\x45\x33\x88\xe6\x32\x4f\x7b\x11\x67\xcf\xc9\x74\xe7\xb4\xde\x67\x22\x61\x0a\xbd\x33\x82\x55\x5c\xe3\x96\x48\x18\x13\x35\x43\x9d\x5e\x94\x75\x4b\x97\x94\x64\xc6\x92\xa4\xb4\xf3\xa1\x20\x2c\x67\xe4\xf2\xfa\x46\xe6\xe9\x1b\xe1\x2d\x14\x45\x65\x57\x42\x24\x40\xc9\x56\x50\x3f\xe0\x69\xc6\xf9\x5c\x76\x09\x8b\xd7\x01\x8e\xa0\xd2\x9d\x6a\xb7\xad\xf7\xe7\x6d\xfa\xcd\x15\x47\x68\xdd\x38\xc5\x77\x10\x8b\x24\x02\x2b\x8a\x78\xce\x94\xdb\xba\xfb\xd7\x34\x7f\x24\x6a\x86\x8c\x07\x42\x73\x90\xc6\xca\x68\xac\x6d\x0c\xc6\x63\xf0\x57\xb4\xdf\x18\x6e\xaf\x6e\x27\x8c\x14\x7f\x24\x29\x6d\x4a\x4c\x43\x01\x8b\xdf\x16\x34\x14\x49\x18\x88\xad\xb2\x75\x57\xb7\xb8\x8e\xab\xfe\x24\x29\x99\xd6\xa5\xf9\xcc\x45\x4a\x94\xad\x77\x3b\xe8\x7d\x9c\x44\x0a\x75\x92\xf2\x57\x6d\x66\xc5\x1e\xea\x08\xce\x55\x07\xbd\xfb\x80\x7e\xa2\xef\x39\x57\xb0\x7d\x0c\x2b\xb0\x71\x4e\xe9\x98\xd3\x24\x5a\x96\x22\xd1\x18\xcd\xc8\x36\x96\xbb\x61\x80\x2d\xcc\xad\x9f\x6f\x49\xde\x4f\x1c\x2b\xc4\xee\x83\xed\x8d\x5c\x07\xbb\xc1\x8e\x11\x42\x0b\x8d\x64\xea\x04\x9f\x40\x30\x50\x20\x3b\xcd\x61\xfc\x60\xe4\xe1\x30\x78\x1c\xe3\xdf\x8f\x72\x3f\xb9\xc5\x9e\x8b\x03\xec\x87\xfe\xa3\x1f\x60\x27\x74\x2d\x07\xfb\x63\xab\xdf\x10\xbc\x5e\x3c\x6b\x6b\x5a\x01\xbc\xc3\x2e\xf6\xac\x61\x68\x0d\x1e\xb0\x17\xd8\x3e\x1e\x84\xdf\x46\x7e\xa0\xf1\x1a\xa1\x4e\x6b\x70\xe3\x80\xa2\x1f\x21\x13\x0c\xfd\xb0\x8f\xbd\x20\xfc\x6a\x0f\x1b\x68\xf4\x16\x44\xf4\x44\xce\x7a\x2b\x75\xe8\x15\x5c\x12\x5e\x48\x4e\x04\x42\xe9\x2f\x46\x24\xd4\x69\x68\xf7\xf8\xf1\xb7\xc1\xe6\xb0\xdc\x71\x2f\x14\xe8\x19\xc1\xf7\xfa\x9e\x4d\xb9\x2e\xa1\x80\x94\x2b\xe8\x1c\x2c\x8b\x33\x19\x06\x76\x7f\x38\xf1\x03\xec\x85\x1e\x76\x46\x01\x0e\xef\x86\xa3\xdb\xe2\xd8\x06\x1e\xf6\xfd\xe6\xae\xa8\x43\x9e\xc7\xf2\x8e\xf2\x27\x42\xad\x38\x16\x20\x65\x15\x7c\x4f\x28\x6a\x38\x59\x63\x3b\xf4\xb1\xf7\x50\x30\xb2\x06\xe1\xc8\x1d\x3e\x36\x34\xbe\x12\x39\x1c\x68\x79\x6f\xe2\x06\xb6\xb3\xd3\xf4\xd6\xc0\xb1\x7d\xdf\x1e\xb9\x6b\x88\xf1\xc8\x6b\xba\x9c\xd7\x57\x57\x1f\x7f\x33\x7a\xd1\x6a\x03\xdb\xfb\xc5\xc3\x6f\x05\x6e\xbb\x7f\xe2\x7e\x30\xf2\xc2\xbe\x6b\x87\xd8\xb5\x6e\x87\x78\x70\xfc\xf4\x58\x62\x00\xd3\xc3\x46\x7c\xd2\xa5\x3e\x84\xeb\xdb\x03\xdc\xb7\xbc\xb0\x3f\x72\x03\xcb\x76\xb1\x17\xda\x8e\x75\x77\xea\x65\x3f\x41\xe6\xf5\x0c\xd2\x42\xe3\x2b\xd4\x37\x3c\x6d\xd7\x0e\xfe\x17\x92\x2c\x29\x4d\x5b\x12\x1d\xe0\xaf\xd6\x64\x18\xf8\xa1\x7f\x6f\x8f\x43\x07\xfb\xdf\xc2\xbe\x87\xad\xc0\x1e\xb9\xed\x6e\x63\x0c\xcf\x24\xa7\x4a\x1a\x72\x9e\x64\x0e\xc8\x59\x5f\x40\x31\xb6\x9d\x44\xc3\x19\x0d\x70\x3b\xbc\x42\x77\x1a\x42\xaf\x24\xab\xd6\xef\x1f\xce\xa0\xb5\x4c\xfd\x35\x72\x5b\xd2\x2b\x60\x6a\xe9\xd5\xca\x92\x5e\x14\x84\x4d\x01\xbd\x03\x0a\xfa\x49\x82\xcc\x2f\xf5\x91\x57\xf7\xb7\x29\x87\x97\x97\x4d\x08\x03\xb3\x45\xd5\x6c\x45\xfc\xab\xe0\xa9\x59\xd9\xd0\x93\xa0\x0e\x7d\x0f\x4b\x0f\x9e\xf7\x77\x51\x0d\x82\x5f\x78\xec\x83\xe8\xcf\x1c\x96\xbb\xc6\xf7\xb0\x3c\xa1\x14\x44\x4c\x65\x75\xce\x11\x39\xab\xac\x74\xbb\x94\x4f\xbb\x14\x16\x40\xbf\x34\x9d\x01\xe5\xd3\xa1\x36\xd8\x2f\x55\x77\xf5\x0a\xe8\x3e\x27\x14\xbe\xf4\x40\x45\x1b\x39\xdc\x1f\x98\x57\x8f\x8c\x62\x70\xdf\x8a\x93\x71\xa1\xf6\x88\x6e\x66\xd1\x31\x17\xca\x44\xd7\x37\x9f\x2f\x8e\x58\x5c\x5d\x7d\xac\xeb\x5d\x06\x87\xfe\x6e\xa7\xc5\xff\x5e\xcd\xdf\xed\x1e\xfe\xa7\x4f\x47\x2d\x3e\x1f\xb5\xf8\xe3\x68\x96\x97\xc7\x2c\xae\x3f\x56\x3a\x24\x13\x5c\xf1\x88\x53\x13\x4d\x06\xe3\x63\x3d\x41\x93\x05\x30\x90\x72\x2c\xf8\x13\xec\xd6\x7c\xa6\x54\x76\x07\xaa\xda\xae\x19\x51\x33\x13\xf5\x66\x40\xa8\x9a\x2d\xab\x9b\x6b\xda\xe7\x5b\x1b\x02\x48\x9c\xfc\x12\x88\xf6\x3c\x11\x42\xf2\x5c\x44\x50\x69\x9b\x43\x72\xb5\x71\xd9\xd7\xb8\x63\x0e\x3f\xd7\x0f\xa9\xb7\x67\xd4\xc5\x65\xed\x90\x44\x25\x1c\x1f\xf1\x1a\x7a\x4e\xc0\xf7\x1c\x64\xf5\x26\x20\x14\x65\xb9\x89\xae\xcf\xcf\xd3\xca\x7a\x0a\x29\x17\x4b\x13\x5d\x5e\xdf\x38\x49\x3d\x95\x36\x08\x17\xa7\x23\xd4\x76\xd6\x82\xd3\x3c\x05\x47\xbf\x7c\xa5\xd9\x24\xa8\x8d\x2f\x85\xda\xd9\x09\xa1\x54\x87\x1b\x97\xcd\xd1\x6a\xec\x2a\xbb\x70\xc4\xe8\xd2\x44\x7a\xde\x6c\x4d\x68\x47\xb8\x56\x22\x77\x80\xdc\x61\xe1\x3b\x85\x5a\x59\xbf\x9a\x97\x77\xcb\xb2\x95\xe5\xd9\x3d\x81\x72\xcd\x6d\x1f\xee\x3f\xa8\x54\xb9\xe0\x90\x6c\x97\xd2\x2f\xc6\xfd\x37\x00\x00\xff\xff\x3d\xf1\x32\x7b\x84\x14\x00\x00"),
@@ -201,21 +201,21 @@ var HelmTemplates = func() http.FileSystem {
 		},
 		"/templates/cp-rbac.yaml": &vfsgen۰CompressedFileInfo{
 			name:             "cp-rbac.yaml",
-			modTime:          time.Date(2020, 8, 31, 9, 49, 40, 375001562, time.UTC),
-			uncompressedSize: 3364,
+			modTime:          time.Date(2020, 9, 29, 9, 24, 11, 829006519, time.UTC),
+			uncompressedSize: 3578,
 
-			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x02\xff\xd4\x56\x4d\x6f\xdb\x30\x0c\xbd\xe7\x57\x10\xd9\x6d\x80\x5d\x0c\xd8\xa1\xc8\x6d\xdb\x61\x97\x61\x18\xda\xa1\x77\x45\x7e\x8e\x39\xcb\x92\x27\x51\xe9\xd6\x2c\xff\x7d\x90\x9d\x26\x69\x3e\xba\xc6\x6d\xb7\x35\x27\x8b\x0a\xc9\x47\x52\x7c\xa4\x6a\xf9\x0a\x3e\xb0\xb3\x13\x9a\xbf\x19\xd5\x6c\x8b\x09\x5d\xc2\xcf\x59\xe3\x9d\xd6\x2e\x5a\x19\x35\x10\x55\x28\x51\x93\x11\x91\x55\x0d\x26\xb4\x58\x10\x5b\x6d\x62\x01\x1a\xd7\xb1\x51\x79\x12\x8f\x29\xa7\xe5\x32\xd3\xce\x8a\x77\x26\x6b\x8d\xb2\x58\x69\x84\x56\xe9\x5e\x2d\xbf\x80\x81\x0a\xc8\x3f\xdf\x8a\x69\xb9\x1c\x11\x19\x35\x85\x09\xc9\xc3\x62\x91\xed\x18\xef\xef\x92\xf9\x5f\x64\xd9\x16\xb0\x42\x6f\x93\x5a\x96\x65\xa3\xed\x00\xfc\x54\xe9\x5c\x45\xa9\x9c\xe7\x1b\x25\xec\x6c\x5e\x9f\x87\x9c\xdd\xd9\x3a\xb4\x0f\x26\x06\x81\xbf\x70\x06\xa7\xc5\x35\xd9\x8d\x6b\x10\x62\x1f\x0d\x3a\x9d\x8c\x54\xcb\x1f\xbd\x8b\x6d\x77\x4c\xbf\x8c\xc6\xe3\xee\xd3\x23\xb8\xe8\x35\xb6\x6e\xd6\x49\x0c\x6b\x51\xeb\x8a\xcd\x21\xf4\x15\xeb\x05\x73\xf8\xe9\x96\xee\x0c\xb2\xfe\x36\x1c\x36\x87\x6b\x25\xba\x3a\x1d\x0b\xe6\xb0\x72\xd0\x93\xf6\x50\x82\x0d\xc2\xfb\xec\x77\x79\x62\x77\xcc\x49\xaa\x4b\x97\xe9\xb0\x2f\x62\x1b\x78\x56\xc9\xe6\xa6\x41\xa8\xb6\xfe\x78\xe3\xec\xce\xe9\x8e\xc6\xa9\xe9\x39\x18\x5b\x6c\x8b\x43\xa1\xae\x90\xc2\xa0\xbb\x1c\x12\x79\xeb\xdd\x8f\x9f\x82\xa6\x35\x4a\xf0\x02\x11\x9f\x05\x51\x12\xff\x08\xfc\x08\x9c\x21\xfe\xc5\xab\xb2\x64\xdd\xc2\x37\x1c\x12\x13\x84\xdd\x2b\xe3\x66\x7b\x32\xef\xa2\x60\x4f\x2a\xfe\x4e\x93\x95\x2a\x1a\x61\xfb\x0d\x5a\xee\xd8\xd5\xec\x75\x64\x99\x7a\xa8\x1a\x7e\x23\xaf\xa0\x8c\x54\xba\x82\xae\x87\x97\xae\xe3\x93\x92\xf0\x9d\xf2\x2b\x65\x22\x42\xbe\xe2\x9e\x2f\xe9\xf5\xe7\x8d\x4b\x3c\xe3\xd1\x38\xc1\xb8\x67\xcf\x47\x14\x3c\x39\x83\x2d\x7a\x3b\x27\x32\x41\xa2\xa0\xb3\x92\xad\x32\x7c\x73\x9b\x85\x9d\x80\xc7\xaf\xc7\x03\xab\xda\x37\xf5\xb3\x99\xdf\x10\xcc\x83\x5c\xbc\xa2\xb9\x32\x9c\x12\x4a\xf5\x79\x20\x71\x35\x2c\x4d\x51\x3a\x0f\xe2\x10\x22\xd8\xce\xa8\xf9\xfa\xe9\x92\x34\xbc\x1c\xc3\x94\x66\x13\xac\xb0\xde\x1e\x4e\x47\x9f\x75\xf2\xe1\x31\x67\x5c\xdf\xc7\xb6\x8f\x1b\x82\xef\xd9\x16\x6c\x67\xff\x64\x16\x3a\x83\x0b\x94\x49\xeb\x36\x55\xf7\xa0\x1f\x11\xed\x4f\xf0\xd3\xb1\x86\x38\x4d\xcd\xbc\x9a\xc1\x07\xd7\x9d\x94\xdd\xd3\xd7\x9c\x87\x2d\x3a\x03\x8a\xf5\x04\xab\xca\x33\xae\x60\x43\x17\x9a\x00\xed\xf1\x9f\x0c\xe4\xe3\x28\xb5\xb3\x25\xcf\x1a\xd5\xfe\x65\xa0\x03\x9f\xc9\xd3\x34\xf3\x43\x5e\xcb\xc0\xde\x7d\x99\x4d\xfb\x3b\x00\x00\xff\xff\xd7\x24\x70\x59\x24\x0d\x00\x00"),
+			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x02\xff\xd4\x56\x4d\x6f\xdb\x38\x10\xbd\xfb\x57\x10\xde\xdb\x02\x52\xb0\xc0\x1e\x02\xdf\xda\x1e\x7a\x29\x8a\x22\x29\x72\xa7\xa9\x27\x6b\x6a\x6a\xa8\x92\x43\xa7\x8d\xeb\xff\x5e\x50\x72\x2c\xc7\x5f\x8d\x95\xa4\x6d\x7c\x32\x87\x9a\x99\x37\x1f\x7c\x33\xba\xa1\x1b\xf8\x40\x8e\x27\x6a\xf1\xdf\x68\x4e\x5c\x4c\xd4\x35\xfc\x82\x0c\xde\x18\xe3\x22\xcb\xa8\x86\xe8\x42\x8b\x9e\x8c\x94\x62\x5d\x63\xa2\x96\x4b\x45\x6c\x6c\x2c\xa0\xc6\xf3\x58\xeb\x3c\x89\xc7\x2a\x57\xab\x55\x66\x1c\x8b\x77\x36\x6b\xac\x66\xac\x35\x42\xa3\x4d\xa7\x96\x5f\xc1\x42\x07\xe4\x1f\xef\xc5\x6a\xb5\x1a\x29\x65\xf5\x14\x36\x24\x0f\xcb\x65\xb6\x63\xbc\xbb\x4b\xe6\x7f\x28\x26\x2e\xc0\xa2\xfe\x4f\x6a\x59\x96\x8d\xb6\x03\xf0\x53\x6d\x72\x1d\xa5\x72\x9e\xee\xb4\x90\xe3\x7c\x7e\x19\x72\x72\x17\x9b\xd0\xde\xd9\x18\x04\xfe\xca\x59\x9c\x17\xd7\x64\x37\xae\x41\x88\x7d\xb4\x68\x75\x32\xa5\x1b\x7a\xef\x5d\x6c\xda\x63\xfa\x65\x6a\x3c\x6e\xff\x7a\x04\x17\xbd\xc1\xd6\xcd\x26\x89\x61\x23\x6a\x5c\xd1\x1f\x42\x57\xb1\x4e\xb0\x80\x9f\x6e\xe9\xce\x20\x9b\xff\x96\x42\x7f\xb8\xd5\x62\xaa\xf3\xb1\x60\x01\x96\x83\x9e\x8c\x87\x16\xf4\x08\x4f\xd9\x6f\xf3\x44\xee\x98\x93\x54\x97\x36\xd3\x61\x5f\x44\x1c\x68\x56\x49\x7f\x53\x23\x54\x5b\x1f\xde\x39\xde\x39\x3d\xd0\x38\x37\x3d\x07\x63\x8b\x4d\x71\x28\xd4\x35\x52\x58\xb4\x97\x43\x22\x6f\xbc\xfb\xf6\x5d\x50\x37\x56\x0b\x5e\x21\xe2\x8b\x20\x5a\xe2\x2f\x81\x1f\x81\x33\xc4\xbf\x78\x5d\x96\x64\x1a\xf8\x9a\x42\x62\x82\xb0\x7b\x65\xdd\x6c\x4f\xe6\x5d\x14\xec\x49\xc5\x3f\x78\x64\xa5\x8e\x56\x88\xbf\xc0\xc8\x03\xbb\x86\xbc\x89\x24\x53\x0f\x3d\x87\xef\xe5\x15\xb4\x95\xca\x54\x30\xf3\xe1\xa5\x6b\xf9\xa4\x54\xf8\xaa\xf2\x1b\x6d\x23\x42\xbe\xe6\x9e\x4f\xa9\xfb\xf3\xda\x25\x9e\xf1\xa8\x9d\x60\xdc\xb1\xe7\x13\x0a\x9e\x9c\x81\x8b\x64\x67\xed\x77\xe3\x94\x29\x07\xeb\xa9\x45\xd1\x79\x39\x5c\x9b\xcb\xee\x4b\xc3\xa6\x3c\x51\x23\x86\xdc\x3a\x3f\xcf\xb4\x88\x36\x55\x0d\x96\xac\x40\x49\x4c\x7d\x5e\x9f\xa5\xcb\xd7\x71\x6d\x45\x75\x36\xbf\x25\x62\xbd\x28\x89\xb5\xa5\xbb\xfb\xda\xee\x60\x1b\xff\x3b\x1e\xd8\xab\x1d\x55\xbd\x98\xf9\x9e\x36\x1f\xe5\xe2\x1f\xb5\xd0\x96\x52\x9b\xa4\x3a\x2a\x71\x73\xb0\x9a\xa2\x74\x1e\x8a\x42\x88\x20\x9e\xa9\xfa\xf3\x87\x6b\x65\xe0\xe5\x18\xa6\x34\x71\xc1\x42\x66\x7b\xe4\x1e\x7d\xac\xc9\x87\xc7\x82\x70\x7b\x6a\x86\x3c\x6d\xb4\xbf\x25\x2e\x88\x67\x7f\x64\xc2\x3b\x8b\x2b\x94\x49\xeb\x3e\x55\x27\xd0\x8f\x94\xda\xdf\x4b\xce\xc7\x1a\xe2\x34\x51\xd4\x7a\xb3\x38\xb8\xc4\xa5\xec\x9e\xbf\xbc\x3d\x6e\x7d\x1b\x50\xac\x67\x58\xc0\x5e\x70\xb1\x1c\xba\xa6\x05\x18\x8f\xbf\x64\xcd\x38\x8e\xd2\x38\x2e\x69\x56\xeb\xe6\x37\x03\x1d\xd8\x26\xcf\xf3\x98\x1f\xd3\x2d\x03\xdf\xee\xeb\x7c\xb4\x3f\x03\x00\x00\xff\xff\x05\xfb\xce\x73\xfa\x0d\x00\x00"),
 		},
 		"/templates/cp-service.yaml": &vfsgen۰CompressedFileInfo{
 			name:             "cp-service.yaml",
-			modTime:          time.Date(2020, 9, 16, 12, 28, 12, 987846054, time.UTC),
+			modTime:          time.Date(2020, 9, 24, 9, 57, 34, 8953825, time.UTC),
 			uncompressedSize: 1001,
 
 			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x02\xff\x7c\x53\x4d\x8f\xd3\x30\x10\xbd\xf7\x57\x8c\xa2\x3d\x92\xc0\x42\xbf\xb0\xc4\x8d\x23\x5a\x55\x20\xf6\x3e\xb5\x87\xae\x55\xc7\x36\x9e\x49\xc5\xaa\xdb\xff\x8e\x5c\x27\x62\xd3\x84\xbd\xb5\xf1\x7b\xf3\x3e\xc6\xc6\x68\x1f\x29\xb1\x0d\x5e\xc1\xe9\x7e\x71\xb4\xde\x28\xf8\x41\xe9\x64\x35\x2d\x5a\x12\x34\x28\xa8\x16\x00\x1e\x5b\x52\x70\x3e\x83\xf5\xda\x75\x86\xa0\x3a\x76\x2d\x36\x3a\x78\x49\xc1\xed\x1c\x7a\x6a\xb8\xf0\x1e\xb0\xa5\x0a\x1a\xb8\x5c\x7a\x1e\x47\xd4\x85\xdc\x7c\x27\x47\xc8\xd4\x3c\x0c\x9f\x0b\xca\xe1\x9e\x1c\x67\x9d\xf3\xb9\xbe\x91\x28\x67\x79\xe0\x0b\x78\xeb\x0d\x79\x81\x65\xa1\xa1\xf7\x41\x50\x6c\xf0\x57\x2e\x40\x4c\xa1\x25\x79\xa2\x8e\x1b\x1b\xde\xb3\x4e\x18\x49\x41\x25\xa9\xa3\x6a\x06\x10\x43\x12\x05\xd5\x6a\xbd\xfd\x50\x8e\xb3\x7a\x42\x7f\x20\xb8\x3b\xd2\xf3\x3b\xb8\x3b\xa1\xeb\x08\xd4\x17\x68\x1e\xf3\x2f\x9e\x0d\xdc\xbc\xf2\x51\x8c\x95\x59\xd7\x21\x70\xb9\x5c\xa3\xf7\xa3\x5e\xe0\x77\x17\x84\x06\x58\x16\x24\x6f\xf2\x5f\x8e\xa4\x73\x0a\x79\x8e\x7d\x59\x6f\x49\x66\x54\x19\x92\x43\xf4\xf1\x6b\x28\x89\x56\xeb\xed\x7d\xef\xa2\xec\xed\x49\x24\xd6\x18\x6d\x9d\xe9\x94\x46\xe0\xe5\xf2\xd3\x04\xcb\x35\x9a\xd6\x72\xbe\x17\xaf\x29\x00\x82\xe9\x40\xb2\x2b\x2a\x03\xf3\xba\xb3\x5f\xe0\x69\xde\x72\x1b\xf2\x2e\x0f\x2e\xec\xd1\x55\x43\xf0\x7f\x56\x37\xeb\x91\x7c\x8b\x86\xe7\x6c\xae\xd6\x9b\xcd\x08\x78\x48\x51\xd7\x6c\xf8\x16\xb5\x9d\xa2\xfe\x4c\x51\x9f\xa7\xfd\x4c\x51\xdb\x8f\x53\xd4\x3e\x04\x61\x49\x18\xe7\x4d\xae\xc6\x65\x1a\xcf\xe3\x02\x63\x0a\x12\x74\x70\x0a\x7e\x7e\xdd\x2d\x46\x17\x00\x80\xc9\x91\x96\x90\xca\x36\x31\x46\x05\xf9\x09\xd4\x7d\x9d\x75\xcc\x7d\xce\x3e\x92\x81\xf9\xed\x7f\x8f\xe5\x6f\x00\x00\x00\xff\xff\x4c\xb9\x00\x16\xe9\x03\x00\x00"),
 		},
 		"/templates/cp-webhooks-and-secrets.yaml": &vfsgen۰CompressedFileInfo{
 			name:             "cp-webhooks-and-secrets.yaml",
-			modTime:          time.Date(2020, 9, 18, 9, 19, 48, 12545199, time.UTC),
+			modTime:          time.Date(2020, 9, 28, 12, 56, 47, 951621116, time.UTC),
 			uncompressedSize: 5397,
 
 			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x02\xff\xe4\x58\x5f\x6f\xdb\x36\x10\x7f\xd7\xa7\x20\x84\x16\x68\x0b\x50\x8a\x93\x38\xc8\x04\xf4\xa1\x6b\xd3\x62\x58\x5b\x04\x4d\x96\x3d\x53\xd4\xc9\xe2\x4c\x91\x1a\x79\x72\xe6\xb9\xfe\xee\x03\x29\xc9\x96\x14\x27\x71\xba\x02\xcb\x52\xbd\xe9\xfe\xdf\xfd\x7e\x3c\xca\x5e\xad\x28\x79\x86\xd2\x5e\x31\x69\x49\xf2\x9a\x44\x57\x4c\xd6\x60\x23\xae\x15\x1a\x2d\xcf\x25\x53\x10\xa1\xb4\x64\xbd\x0e\x56\xab\xf8\x55\xf0\x01\x14\x18\x86\x40\x38\x18\x14\xb9\xe0\x0c\xc1\x06\x16\x20\x21\x05\x62\x65\x93\x38\x2e\x99\x45\x30\xa5\x50\x99\x8d\x66\x02\x8b\x3a\x8d\x84\x8e\x6d\x65\xc4\x2c\xe6\x66\x59\xa1\x8e\x0a\x2c\xe5\xc8\x09\x32\x51\x97\x11\xd7\x65\xac\xea\x85\xa6\x33\xa3\xeb\x8a\x22\xf0\x22\x2e\xf5\x02\xe8\x52\xd7\x86\xba\x9c\x96\xa2\xa6\x05\xc8\x92\x1e\xe7\xd3\xfc\x64\x72\x74\x74\xca\x38\x1b\x06\x6b\xb3\xfa\x60\x80\xd7\xda\xcc\x2d\x98\x85\xe0\x50\x82\x2d\x76\x89\x52\xa9\xd3\xf8\xf4\xe0\x98\x65\xd3\x83\xc3\x93\x34\x9d\x66\x69\x76\x78\x3a\xe5\x87\x87\x07\xf9\x64\x7a\xf4\xd3\x34\x87\xc3\x29\x1c\x9f\xe4\x53\xc8\xd2\x38\x83\x4a\xea\x65\x09\x0a\x6d\xec\x2a\x89\x95\x2d\x63\x5e\x30\x83\x36\x66\x59\x29\xac\x15\x5a\xd1\x6b\x48\x0b\xad\xe7\x31\x42\x59\x49\x37\xa5\x9b\x3a\x6a\x81\x1b\xc0\x08\x2b\x19\xbc\x8a\xd7\xeb\x80\x10\x0f\x08\xd7\x65\xa9\xd5\x67\x56\x82\xc3\xe4\x85\x50\x5c\xd6\x19\x90\x70\x5e\x97\x6c\x08\x4d\xdb\x84\x33\x0d\x49\xf4\x92\x6c\x63\x30\x89\x4e\xea\x51\x95\xc2\x22\x79\x51\x19\xa1\x30\x27\xe1\x73\x1b\x3d\xb7\xe1\x20\x4b\xf4\x05\x24\x30\x0b\x91\x77\xa9\x18\x87\x97\x23\xfb\xc8\x2e\xf8\xfd\x3e\xb4\xd7\x03\x18\xbc\xbc\xfc\xe8\xd2\x1f\x9d\x4c\x0f\x06\x2a\xe6\xa4\x33\x50\x6f\xdf\x34\x3d\x51\xce\xc2\xad\x87\xb3\xec\x4c\x9d\x11\x18\x6c\xed\x2f\xc4\x4c\x41\xe6\x05\xfd\x4a\x94\x90\xbd\x7e\x37\x71\x5c\x9e\x51\x41\x2e\x4e\x17\x33\xf2\x71\xb6\xfa\x39\x2c\x07\xea\x5f\x61\x49\xfa\x35\xff\x5c\xab\x4c\x36\x80\x3c\xe3\xac\xf1\xfe\x4a\xd2\x93\x63\x50\xbc\xdf\xb9\xc8\xb7\x27\x6a\x94\xfd\xf5\x46\x13\xf1\xc6\xdd\xc0\x9f\xb5\x30\x90\x91\xf0\x53\x6d\x91\x54\x46\x2f\x44\x06\xb7\x1e\x43\xef\x16\x8e\x8a\xee\x45\x75\xaf\x0f\x0f\x3a\x87\x65\xb8\xab\xd5\xd7\x6d\xd9\x5d\x97\x5b\x1b\x50\x99\x7b\x09\x28\xa5\x01\xab\xc4\x15\x18\x47\xeb\x84\x2c\x26\xc1\x5c\xa8\x2c\x21\x17\x9e\xd8\x01\x2e\x2b\x48\xc8\xbc\x4e\xc1\x28\x40\xb0\x6e\x11\xa0\xb4\x41\x09\xc8\x32\x86\x2c\x09\x08\x51\xac\x84\x84\xac\x56\x64\x48\x73\xd5\x50\x9a\xac\xd7\x14\xa5\xf5\x47\xbf\x35\xf6\x5c\xf3\x1e\x37\x29\xd8\x94\x28\x59\x0a\xd2\x26\x1d\x20\x83\xb8\x8d\xce\x45\xfe\x4a\x94\x50\x19\x28\x24\xc7\xce\xad\xab\xc7\x8f\xd9\xa0\x4f\xb0\xab\xff\x76\x62\x8d\xde\x0d\x7c\xa0\x1f\x4f\x64\x73\xe6\x0d\xcc\x84\x45\xc3\x50\x68\x15\xcd\x4f\xfd\x28\x16\x93\x14\x90\x75\x33\xfb\x54\x23\x43\xa1\x66\xbf\x37\xcb\xe1\xad\x56\xb9\x98\xd5\x8d\xc7\x03\x27\xb6\xdd\x34\x65\x1b\x74\xb3\x72\xf8\x20\xec\xb7\x4c\x74\xdf\x81\xb6\x19\xbd\x17\x6d\x8b\x76\xdb\x36\xca\x20\x67\xb5\x44\x30\x91\x3f\xfc\x9b\x62\xfd\x6b\x24\x74\x40\x08\x21\x39\x13\xb2\x36\x70\xae\xa5\xe0\xcb\x84\xbc\x67\x42\x7a\x39\x97\x02\x14\x36\xc3\x49\xbc\x84\x90\x8e\xb1\x2d\x66\x1d\x7f\x7d\xe5\xee\x69\xb7\x64\x67\xbe\x6f\xd3\x5b\xdb\x1d\xd3\xbe\x63\x0d\xf7\xbd\x2b\x86\x45\x42\xe2\xb6\x65\xea\x1b\x16\x9a\x2e\x26\x4c\x56\x05\x9b\x50\x37\x10\x6f\x6c\x6a\x09\xb6\xab\x90\x12\x56\x89\x0f\xee\x0a\xb4\xdb\xa2\x9d\xb8\x3f\x21\xf7\x6c\xa9\x36\x32\xec\x12\x6c\x84\xba\x82\x06\xf3\x91\xe1\xdb\x2f\x67\x6f\x2e\xcf\x06\xa2\xdf\xce\xdf\xf5\x45\x06\xac\xae\x0d\x87\x91\xa3\xab\x1c\xac\x17\x59\x91\xc1\x59\x9e\x03\x47\x9b\x90\xcf\x5a\x41\x0f\x71\x7d\xad\xc0\x50\x03\x39\x18\x50\x1c\x7e\x1c\xc8\x47\x8d\xdf\x80\xfe\x31\xa1\x7e\x0b\xc4\x5c\x18\x5e\x0b\x4c\x0d\xb0\x39\x18\x3b\xd0\x79\x3e\x0b\xf5\x07\x70\x1f\x7e\xa0\x43\xc3\xf2\x5c\x70\xa9\x67\x3b\xe5\x95\xfb\x3a\xf4\xf0\xef\x54\x1b\x5d\x23\xec\xd4\xa0\x61\x7c\xa4\x29\x80\x49\x2c\x78\x01\x7c\x3e\x54\x54\x46\xff\xb5\xdc\x7c\x7b\xdd\x4b\xd3\x06\x1d\xdf\x8e\x36\x77\xb1\xd2\x91\x67\xd7\x45\xda\xf9\xbe\xef\x9b\x77\xb4\xf8\x7f\x32\xb8\x69\x89\xba\xb1\x71\x66\x1e\xc0\xd7\x30\xdc\x87\xaa\xdf\x89\xa4\x95\xce\x6e\x83\xf7\x5f\x5c\xc6\x57\x4c\x8a\xec\x7b\x5d\xc7\x8b\x4d\xb0\x47\x72\x0d\xb7\x05\xe9\x1f\xe8\x06\x6e\x5b\x7e\xdc\x7b\x78\xc7\xed\xeb\x44\xef\xce\x3e\x9e\x3d\x89\x6d\xed\x8e\x4c\xe5\xf0\xda\x73\x89\xf7\xbe\x31\xee\xd8\xeb\x9d\xea\x6f\xad\xf6\xd8\xf4\x2d\x53\xa2\x6f\x39\x03\xbf\xcc\x94\x36\xf0\x14\x4e\xc1\x62\x42\x5b\xe3\xff\x7c\xaf\xef\xff\xc9\xd9\x56\xbc\x0f\xc6\xfe\x7f\x95\xbd\x20\xde\x60\x70\x01\xd2\xdf\xe0\x5d\xce\x92\x21\x2f\x3e\x6e\x36\x6e\xf3\xb4\x9e\xb1\x5d\x5a\x84\x92\xf6\x00\x0c\xd1\xd4\x10\x3e\x01\xd6\xdc\x4b\x1b\xff\xd3\xfe\x11\xb2\x66\xff\x55\xd9\xf4\x70\x1b\x8f\xfe\x09\x00\x00\xff\xff\xe8\x5d\x2e\xa5\x15\x15\x00\x00"),
@@ -257,7 +257,7 @@ var HelmTemplates = func() http.FileSystem {
 		},
 		"/values.yaml": &vfsgen۰CompressedFileInfo{
 			name:             "values.yaml",
-			modTime:          time.Date(2020, 9, 18, 8, 21, 4, 142273771, time.UTC),
+			modTime:          time.Date(2020, 9, 28, 12, 56, 47, 952353117, time.UTC),
 			uncompressedSize: 1514,
 
 			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x02\xff\xac\x54\xd1\x6e\xeb\x44\x10\x7d\xf7\x57\x8c\x9c\xe7\xe6\xba\x40\x2b\xe4\xb7\x4b\x11\xa8\xa2\xf7\x2a\x22\x15\x3c\x4f\xd6\x13\x7b\xc9\x7a\xc6\xec\x8c\x03\x06\xf1\xef\x68\x77\x93\x36\x17\x45\x05\xa4\xfb\x16\xcf\xce\x9c\x3d\x7b\xe6\x9c\xac\xe0\x79\x20\xe8\x68\x8f\x73\x30\x88\xd4\x7b\xb5\xb8\x00\x72\x07\x86\x3d\x98\xc0\xac\x04\x7b\x89\x80\x21\xc0\x0f\xf3\x88\xe0\x47\xec\x49\xab\x3e\xc8\x0e\x43\x5b\x01\x30\x8e\xa4\x13\x3a\x6a\xa1\x3e\xcc\x23\xde\xe8\xa2\x46\x63\x5d\x41\xe9\x4d\x3d\xf0\x82\x9d\x9a\x84\xfb\x9b\x4e\xdc\x81\xe2\x4d\x1e\x28\xbf\xd7\x3b\xcf\x16\x71\x59\x7b\xa9\xf3\xc8\x0a\xbe\x2d\xc4\x34\x11\x59\x3f\x0c\x18\x6d\xfd\x7e\x9a\x7e\xa2\xa8\x5e\xf8\xd4\x63\xd8\xb7\x50\xd7\x55\xb5\x82\x9f\x07\xb2\x81\x22\x48\x04\x16\x4b\x43\x13\x9a\x1b\xc0\x06\x02\xc3\xd8\x93\xbd\x92\x85\xdf\xbc\x95\x93\x42\x17\x02\xee\x28\x54\x79\x60\x9b\x2b\x1f\x5f\xdf\x65\x71\xa6\xaa\x72\xc2\x16\x25\x6c\x02\x72\x7e\x54\x90\xfe\x89\x8e\x14\x5a\xa8\x3d\xef\x33\xe9\x51\xba\x24\x83\x1a\x72\x87\x41\x98\x52\x71\x05\x7f\x08\x53\x21\x09\x70\xe8\xf4\xfb\xac\xdd\xfb\xae\x8b\xa4\x7a\xae\xb3\x74\xb4\xa5\x40\xce\x24\x16\xc9\x0e\xf3\x8e\x22\x93\x91\xae\xbd\xbc\x13\x6d\x21\x78\x9e\x7f\xbf\x72\x86\xd1\x0d\x2d\xe0\xd8\xdd\x7f\x95\xa0\x3c\xff\x92\x61\xbe\x43\x1f\xe6\x48\x1b\x09\xde\x2d\x2d\x3c\xf6\x2c\x91\x52\x83\x52\x3c\x7a\x77\xda\xcc\x2a\x8b\x92\x69\xa4\x4f\x5b\x26\x6a\xe1\x21\xcc\x6a\x14\x1f\x37\xb9\x86\xcc\x62\x68\x5e\x58\x5b\xf8\xf3\xaf\x04\x51\xf6\xff\x23\x8d\x62\xb4\x5d\xd8\x6d\xff\x15\xf2\x49\xb0\xfb\x06\x03\xb2\xa3\x78\x15\x35\xd5\x26\x89\xd6\xc2\xdd\xfd\xd7\x77\xe9\x92\x93\x31\xb5\xa0\xea\xc1\x4f\x1f\x48\x87\x87\x48\x79\xaa\x85\x3d\x06\xcd\x0f\x5a\x25\x83\xa9\xcc\xd1\x51\x6e\x5e\x41\xf1\xdc\xaf\x33\xa9\x5d\x54\x00\xdc\x34\xb7\x70\xdb\x34\xe3\x45\x6d\xa4\x51\x92\x33\xbf\xb8\xbb\xff\xe0\x0b\xdc\xf3\xd3\x36\xdb\xfe\x88\xd1\xcb\xac\x59\x31\x8a\x5a\x86\x2c\xbc\x42\x3a\x4a\x84\xeb\xfa\xfc\x7d\xa0\xe5\xbc\xd1\x0b\xf7\x4f\x73\x08\x2f\x6b\xd8\x7f\x14\xdb\x44\x52\x62\x3b\x45\x63\x12\xf5\x26\x25\x1c\x29\x10\x6e\x2a\x78\x4a\x2e\x92\x15\x75\x1c\xfb\x84\x45\x8c\xbb\x40\xdd\xf9\xed\x97\x2e\x4c\x26\xfc\xdc\x4e\xba\x1a\xe0\x53\x5e\xcf\x39\xfd\x84\x7f\x90\xdd\x41\x8e\x3e\x2c\xf8\xce\xb3\x1a\x86\x70\xe3\xd8\x9f\x7c\x90\xa3\xda\xac\x9b\xf5\x6d\xce\xeb\x83\xf0\xde\xf7\x73\xcc\xdb\xcc\x72\xa7\x3c\x26\x05\xa0\x43\xc3\x29\x05\x0d\xd4\x77\xe4\x30\x56\xa9\xf2\x12\xbd\x4f\x78\xfd\x53\xbd\x6e\xaa\xdf\x16\x3d\x6b\xfb\xc6\xe5\x9e\xbd\xc1\x34\xa0\x12\x78\x2e\xff\x11\x27\x12\x90\xcf\x1e\xdf\xba\x3d\x35\xd4\x55\xe5\xb9\xcf\xe9\xbe\xb6\xb2\x91\x74\x68\xcf\xe6\x4e\x36\x8f\xe8\xf9\xd9\xa7\xc4\x7c\xd9\xe8\x7f\xca\xe7\xff\x08\xd3\x6d\xd3\x34\xb7\xd5\xdf\x01\x00\x00\xff\xff\x47\xb7\x1c\x52\xea\x05\x00\x00"),
diff --git a/app/kumactl/pkg/install/k8s/kuma-cni/templates_vfsdata.go b/app/kumactl/pkg/install/k8s/kuma-cni/templates_vfsdata.go
index bde0f5e96..c3fa04a24 100644
--- a/app/kumactl/pkg/install/k8s/kuma-cni/templates_vfsdata.go
+++ b/app/kumactl/pkg/install/k8s/kuma-cni/templates_vfsdata.go
@@ -21,14 +21,14 @@ var Templates = func() http.FileSystem {
 	fs := vfsgen۰FS{
 		"/": &vfsgen۰DirInfo{
 			name:    "/",
-			modTime: time.Date(2020, 4, 20, 13, 13, 4, 146331006, time.UTC),
+			modTime: time.Date(2020, 7, 13, 13, 16, 2, 922467546, time.UTC),
 		},
 		"/all-in-one-template.yaml": &vfsgen۰CompressedFileInfo{
 			name:             "all-in-one-template.yaml",
-			modTime:          time.Date(2020, 4, 20, 13, 13, 4, 146247223, time.UTC),
+			modTime:          time.Date(2020, 7, 13, 13, 16, 2, 922541378, time.UTC),
 			uncompressedSize: 3775,
 
-			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xa4\x56\x4b\x6f\xdb\xba\x12\xde\xfb\x57\x0c\xdc\x45\x37\x91\x74\x8b\x8b\x0b\x14\xba\xab\xd4\x4d\x53\x23\x8d\x1a\x24\xcd\x39\x8b\xa2\x10\xc6\xe4\xd8\xe2\x31\xc5\x11\x48\xca\x89\xdb\x93\xff\x7e\x40\x3d\x1c\xc9\x8f\xb4\xe8\xd1\xc2\x86\xc4\x79\x7c\xfc\x66\xf8\x71\xa2\x28\x9a\x60\xa5\xfe\x20\xeb\x14\x9b\x14\x36\x6f\x26\x6b\x65\x64\x0a\x77\x64\x37\x4a\xd0\xb9\x10\x5c\x1b\x3f\x29\xc9\xa3\x44\x8f\xe9\x04\xc0\x60\x49\x29\xac\xeb\x12\x23\x61\x54\xf7\xc1\x55\x28\x9a\xaf\x0b\x8a\xdc\xd6\x79\x2a\x27\x00\x1a\x17\xa4\x5d\xf0\x01\xc0\xaa\x1a\x38\x85\xbc\x6d\xa2\x19\x9b\xa5\x5a\x5d\x63\xb5\x8f\xe3\x74\xca\x48\x34\x3e\xbf\x97\xb9\x0f\xf9\x0a\xbe\x14\x04\xb3\x6c\x0e\x86\xfc\x03\xdb\x35\xb4\x51\x6b\x8b\x5e\xb1\x01\xcf\x80\x52\x86\x3f\x5f\x10\x54\xba\x5e\x29\x03\xa2\x40\x65\x80\x0d\x10\x8a\x02\x0c\x4b\x8a\xa1\x89\xe3\x2a\x12\x0a\x75\x13\x77\x83\xba\x26\x07\xca\x80\x2f\x94\xeb\xc2\xc2\x83\xd2\x1a\x16\x04\x58\x7b\x2e\xd1\x2b\x81\x5a\x6f\xa1\xe2\xaa\xd6\xe8\x49\xc6\x13\x00\x61\x54\xde\x81\xc9\x5b\xaf\x14\xfe\x8e\x9a\x3d\xfc\x68\x7e\x01\xa6\xc2\xf4\x24\x4d\x53\x98\xfe\x27\xfe\x6f\xfc\x66\x7a\xd6\x2f\x06\x3a\xc2\xe7\x7e\xb3\xcf\x2b\x7e\x5b\x9d\x58\xd1\xbc\xca\x35\x6d\x48\x87\x65\x65\x96\xfc\xbc\x14\x28\xb5\x86\x3c\xb9\x69\xba\x43\xb0\x5b\x69\x11\x06\xaf\x3c\xbf\xba\x7f\x77\x31\xfb\x9c\x7d\x98\x5f\xe6\x1f\xe6\x9f\x2e\x6e\xce\xbf\x7c\xcc\xf3\x5d\xa0\x1e\x78\xbe\x50\x26\x97\xca\x06\x9f\x64\x83\x36\xd1\x6a\x91\x08\xa3\x92\x85\x32\x63\x63\x7a\x14\xba\x96\x94\xef\xea\x1b\x10\x7c\x6d\xf3\x76\x45\x9e\xc2\xb7\xce\xe3\x69\xd2\xfe\xee\xf7\xb2\x5d\xa0\x88\xb1\xf6\x05\x5b\xf5\xbd\x29\x6a\xbc\x7e\xeb\x62\xc5\xc9\xae\xcb\x67\xba\x76\x9e\xec\x2d\x6b\x7a\xb9\xc5\x4f\xf7\x93\xad\x35\x35\x0b\x11\x60\xa5\x2e\x2d\xd7\x95\x4b\xe1\xeb\x74\xda\xc2\xb3\xe4\xb8\xb6\x82\x3a\xdf\x60\x56\xb1\x74\xbb\x97\xd0\x43\xed\xdb\x86\xec\x62\x60\xb5\x22\xff\x2f\x77\xf4\x4e\x19\xa9\xcc\xea\xb7\x37\xc6\x9a\x6e\x69\x19\x96\xfa\x8d\xbd\x80\x60\x02\x70\x48\xe9\x41\x3e\x57\x2f\xfe\x22\xe1\x3b\xbe\x8e\x2a\x4d\x00\x72\x80\xf2\xe4\x49\x7f\xd6\x91\xf7\x48\x25\x9b\x3b\xf2\x23\xc6\xb0\xaa\x5c\xf2\xb2\x98\x84\x0a\xfc\xaa\x94\xac\xdf\xba\x68\xc4\x52\xeb\x1d\x4e\x7f\x30\x70\xa4\x49\x78\xb6\xad\x71\x89\x5e\x14\x9f\x06\xde\x27\xfd\x01\xea\x4a\xa2\xa7\x3b\x6f\xd1\xd3\x6a\xdb\x9a\x87\x33\x9b\xc2\x2d\x6b\xad\xcc\xea\xbe\x31\x68\x5b\x6a\xf8\xa5\x8f\x5c\xe2\xe3\xbd\xc1\x0d\x2a\x8d\x0b\x4d\x29\xbc\x99\x00\x78\x2a\x2b\xbd\xb3\x19\x52\x10\x1e\x3d\x42\xf6\x02\xb6\xa6\x35\x8c\x61\xdf\xd4\x7b\xe0\x11\x24\x54\xb9\x33\x40\xcd\x26\x08\x9c\x2f\x1a\xad\x9c\x59\xd5\xc8\xdb\xb9\x94\x6c\xdc\x67\xa3\xb7\xe0\x59\x53\xa7\xab\x0b\xd2\xfc\x70\x36\x88\x51\xa2\x5d\xbb\x56\x64\x59\x02\x3a\x40\x10\x5d\x84\xa0\xc0\x11\x9b\x33\x20\xe3\x6a\xab\xcc\x0a\x94\x0f\x07\xc3\x0d\xdc\x2b\xab\xd8\x2a\xbf\x05\x27\x0a\x92\x75\x60\x06\xd0\x48\xf0\x05\x7a\x50\xde\x3d\x9f\x40\x40\x4b\xe1\x8d\xec\x86\xe4\x20\x82\x5a\x86\xb0\xb4\x21\xdb\xc4\x06\xda\x28\xd1\x29\x72\xfb\x74\x91\xc9\xc6\xa8\xab\x02\xe3\x67\x5d\x0c\x47\xaf\x07\x1b\x55\x2c\x53\x78\xfd\xba\x71\xeb\x3b\xa2\x69\x5d\x96\x74\x37\xea\x8c\xf0\x2c\xc8\xef\x47\x62\x97\x82\x56\xa6\x7e\xec\x8c\x0a\x76\x3e\x6b\xef\x83\x14\xbc\xad\xfb\x62\x3c\xb3\x39\x2a\xc6\x35\xae\x09\x5c\x6d\x69\x5c\xc1\x76\x53\xfd\x1e\x64\xb8\xbd\x50\xeb\x56\x78\x9e\xf7\x18\x01\x2d\x97\x24\x7c\x0a\x19\xdf\x75\xb6\x03\x45\xe6\x2a\x64\x64\x9b\xc2\xc5\xa3\x72\xa3\x02\x5c\xa3\x5d\xbf\x58\x3e\x58\xb2\x0d\xbc\xef\xea\x33\xcc\xba\xa6\x6d\x7a\xa4\x63\x7e\x25\xf5\x10\xf2\xc5\x23\x89\xda\xff\x02\xe2\xbe\x5d\x66\x1a\x9d\xcb\x1a\x25\x68\x4f\x7a\x24\x5a\xe1\x8a\x7a\xf4\x9d\x83\x1b\xc9\x53\x76\xa8\x4c\x0d\x07\xca\xa8\x52\x7d\x27\x90\xfc\x60\xbc\x2a\x09\x64\xdb\xaf\xd8\x9f\x56\xa8\xab\x95\x45\x49\xc0\x16\x24\x69\x0a\xd5\xfb\x3f\x78\xd2\x1a\xae\x76\x4d\x10\xa6\x0d\xc9\x80\x30\x5d\xb2\x15\xb4\x0b\xdf\x3b\x4c\x53\x28\xbc\xaf\x5c\x9a\x24\xe3\xce\x91\x2c\x5c\x22\xd8\x08\xaa\xbc\x4b\x42\xc3\x68\x46\xe9\x92\x70\xd5\x84\x9f\xe4\x95\x27\x5b\x2a\xd3\x34\x4d\xc4\xcb\xd0\xab\xbb\xe2\x0f\x96\x2e\x2d\x0a\xba\x21\xab\x58\xde\x85\x0b\x5e\xba\x14\xfe\xd7\x99\x09\x36\x1e\x95\x21\x3b\x68\xba\xa8\x13\x53\x65\x9c\x47\xad\x07\x9c\x84\x47\x95\xb8\xa2\x14\x7e\xfc\x80\x78\x96\xcd\xe7\xe1\x0d\x9e\x9e\xd2\xee\xbd\xd3\x68\x78\x7a\xda\x77\xb9\xa9\xb5\xbe\x61\xad\xc4\x36\x85\x73\xfd\x80\x5b\x37\xb0\x10\x5c\x96\x18\x04\xff\xeb\x34\x19\xa4\x8d\x5d\x31\xfd\x36\x30\x23\xb3\x49\x07\xaf\x81\xc5\x50\x3b\xe0\x65\xab\x51\xd9\xbc\x1f\xcc\x96\x4a\x53\x20\x5e\x58\x42\x4f\xf1\xc8\xa9\xdf\xdf\x2c\x9b\xe7\x61\xbe\xc9\xb3\xf3\xeb\x8b\x91\x05\xb4\xe3\xde\x60\xb4\x8a\x43\xdc\xe9\x5e\xee\xe3\xb3\x66\x48\xdb\xed\x61\x3c\x54\x9e\x04\x91\x5d\x7c\xf9\xf3\xf3\xed\x55\xde\x0e\x5b\xc7\x90\x7c\xb0\x5c\xa6\x7b\x0b\xd0\xe5\xbb\xc6\xea\x8a\xb6\xdd\xa5\xbe\xff\x9c\x9a\xb1\xf7\x9f\xe6\xc4\x1e\x8e\xaa\x2f\x41\xce\xdf\xcf\x6f\x8f\xb3\x96\x90\x17\xcd\x08\x58\xd6\xda\xd7\x2e\x31\xe4\x63\xb9\xc7\xdd\x7c\xd9\x88\xdf\x19\x48\xaa\x34\x6f\x3b\x8d\x09\x93\x38\xc9\x86\xd4\x76\x38\x3f\x03\xf6\x05\xd9\x07\xe5\x68\x64\xe9\x3c\x1a\x19\xae\xa8\xa6\x02\xc7\x61\x7e\x3c\x9f\x67\x17\xef\xf3\x00\xf7\xe6\xd3\xfd\xe5\x3c\x3b\x51\xe3\x25\x6a\x47\xc3\xda\x6e\x58\xd7\x25\x5d\x07\x69\x70\xe9\x5e\xec\x32\x7c\xbd\x41\x5f\xa4\x90\x04\x29\x4f\xb8\xf2\xfd\xb8\x3b\x39\xc6\x7d\xa0\x7d\xa1\x4c\x24\x95\xfd\x59\xa8\x9e\xb6\x43\xbe\x86\xc1\x0c\xf9\x41\xb0\x16\xeb\xe8\xca\xb8\x77\x24\x87\x4d\x38\xcb\xe6\xf1\xc1\xe1\x3e\x0e\x2b\xc0\x68\x10\x8d\xb2\x57\x2d\xc6\xbd\xe1\xfe\x68\xc8\x31\xb8\x9f\x86\x3c\xda\x28\xff\x04\x00\x00\xff\xff\xa8\x78\x41\xa5\xbf\x0e\x00\x00"),
+			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x02\xff\xa4\x56\x4b\x6f\xdb\xba\x12\xde\xfb\x57\x0c\xdc\x45\x37\x91\x74\x8b\x8b\x0b\x14\xba\xab\xd4\x4d\x53\x23\x8d\x1a\x24\xcd\x39\x8b\xa2\x10\xc6\xe4\xd8\xe2\x31\xc5\x11\x48\xca\x89\xdb\x93\xff\x7e\x40\x3d\x1c\xc9\x8f\xb4\xe8\xd1\xc2\x86\xc4\x79\x7c\xfc\x66\xf8\x71\xa2\x28\x9a\x60\xa5\xfe\x20\xeb\x14\x9b\x14\x36\x6f\x26\x6b\x65\x64\x0a\x77\x64\x37\x4a\xd0\xb9\x10\x5c\x1b\x3f\x29\xc9\xa3\x44\x8f\xe9\x04\xc0\x60\x49\x29\xac\xeb\x12\x23\x61\x54\xf7\xc1\x55\x28\x9a\xaf\x0b\x8a\xdc\xd6\x79\x2a\x27\x00\x1a\x17\xa4\x5d\xf0\x01\xc0\xaa\x1a\x38\x85\xbc\x6d\xa2\x19\x9b\xa5\x5a\x5d\x63\xb5\x8f\xe3\x74\xca\x48\x34\x3e\xbf\x97\xb9\x0f\xf9\x0a\xbe\x14\x04\xb3\x6c\x0e\x86\xfc\x03\xdb\x35\xb4\x51\x6b\x8b\x5e\xb1\x01\xcf\x80\x52\x86\x3f\x5f\x10\x54\xba\x5e\x29\x03\xa2\x40\x65\x80\x0d\x10\x8a\x02\x0c\x4b\x8a\xa1\x89\xe3\x2a\x12\x0a\x75\x13\x77\x83\xba\x26\x07\xca\x80\x2f\x94\xeb\xc2\xc2\x83\xd2\x1a\x16\x04\x58\x7b\x2e\xd1\x2b\x81\x5a\x6f\xa1\xe2\xaa\xd6\xe8\x49\xc6\x13\x00\x61\x54\xde\x81\xc9\x5b\xaf\x14\xfe\x8e\x9a\x3d\xfc\x68\x7e\x01\xa6\xc2\xf4\x24\x4d\x53\x98\xfe\x27\xfe\x6f\xfc\x66\x7a\xd6\x2f\x06\x3a\xc2\xe7\x7e\xb3\xcf\x2b\x7e\x5b\x9d\x58\xd1\xbc\xca\x35\x6d\x48\x87\x65\x65\x96\xfc\xbc\x14\x28\xb5\x86\x3c\xb9\x69\xba\x43\xb0\x5b\x69\x11\x06\xaf\x3c\xbf\xba\x7f\x77\x31\xfb\x9c\x7d\x98\x5f\xe6\x1f\xe6\x9f\x2e\x6e\xce\xbf\x7c\xcc\xf3\x5d\xa0\x1e\x78\xbe\x50\x26\x97\xca\x06\x9f\x64\x83\x36\xd1\x6a\x91\x08\xa3\x92\x85\x32\x63\x63\x7a\x14\xba\x96\x94\xef\xea\x1b\x10\x7c\x6d\xf3\x76\x45\x9e\xc2\xb7\xce\xe3\x69\xd2\xfe\xee\xf7\xb2\x5d\xa0\x88\xb1\xf6\x05\x5b\xf5\xbd\x29\x6a\xbc\x7e\xeb\x62\xc5\xc9\xae\xcb\x67\xba\x76\x9e\xec\x2d\x6b\x7a\xb9\xc5\x4f\xf7\x93\xad\x35\x35\x0b\x11\x60\xa5\x2e\x2d\xd7\x95\x4b\xe1\xeb\x74\xda\xc2\xb3\xe4\xb8\xb6\x82\x3a\xdf\x60\x56\xb1\x74\xbb\x97\xd0\x43\xed\xdb\x86\xec\x62\x60\xb5\x22\xff\x2f\x77\xf4\x4e\x19\xa9\xcc\xea\xb7\x37\xc6\x9a\x6e\x69\x19\x96\xfa\x8d\xbd\x80\x60\x02\x70\x48\xe9\x41\x3e\x57\x2f\xfe\x22\xe1\x3b\xbe\x8e\x2a\x4d\x00\x72\x80\xf2\xe4\x49\x7f\xd6\x91\xf7\x48\x25\x9b\x3b\xf2\x23\xc6\xb0\xaa\x5c\xf2\xb2\x98\x84\x0a\xfc\xaa\x94\xac\xdf\xba\x68\xc4\x52\xeb\x1d\x4e\x7f\x30\x70\xa4\x49\x78\xb6\xad\x71\x89\x5e\x14\x9f\x06\xde\x27\xfd\x01\xea\x4a\xa2\xa7\x3b\x6f\xd1\xd3\x6a\xdb\x9a\x87\x33\x9b\xc2\x2d\x6b\xad\xcc\xea\xbe\x31\x68\x5b\x6a\xf8\xa5\x8f\x5c\xe2\xe3\xbd\xc1\x0d\x2a\x8d\x0b\x4d\x29\xbc\x99\x00\x78\x2a\x2b\xbd\xb3\x19\x52\x10\x1e\x3d\x42\xf6\x02\xb6\xa6\x35\x8c\x61\xdf\xd4\x7b\xe0\x11\x24\x54\xb9\x33\x40\xcd\x26\x08\x9c\x2f\x1a\xad\x9c\x59\xd5\xc8\xdb\xb9\x94\x6c\xdc\x67\xa3\xb7\xe0\x59\x53\xa7\xab\x0b\xd2\xfc\x70\x36\x88\x51\xa2\x5d\xbb\x56\x64\x59\x02\x3a\x40\x10\x5d\x84\xa0\xc0\x11\x9b\x33\x20\xe3\x6a\xab\xcc\x0a\x94\x0f\x07\xc3\x0d\xdc\x2b\xab\xd8\x2a\xbf\x05\x27\x0a\x92\x75\x60\x06\xd0\x48\xf0\x05\x7a\x50\xde\x3d\x9f\x40\x40\x4b\xe1\x8d\xec\x86\xe4\x20\x82\x5a\x86\xb0\xb4\x21\xdb\xc4\x06\xda\x28\xd1\x29\x72\xfb\x74\x91\xc9\xc6\xa8\xab\x02\xe3\x67\x5d\x0c\x47\xaf\x07\x1b\x55\x2c\x53\x78\xfd\xba\x71\xeb\x3b\xa2\x69\x5d\x96\x74\x37\xea\x8c\xf0\x2c\xc8\xef\x47\x62\x97\x82\x56\xa6\x7e\xec\x8c\x0a\x76\x3e\x6b\xef\x83\x14\xbc\xad\xfb\x62\x3c\xb3\x39\x2a\xc6\x35\xae\x09\x5c\x6d\x69\x5c\xc1\x76\x53\xfd\x1e\x64\xb8\xbd\x50\xeb\x56\x78\x9e\xf7\x18\x01\x2d\x97\x24\x7c\x0a\x19\xdf\x75\xb6\x03\x45\xe6\x2a\x64\x64\x9b\xc2\xc5\xa3\x72\xa3\x02\x5c\xa3\x5d\xbf\x58\x3e\x58\xb2\x0d\xbc\xef\xea\x33\xcc\xba\xa6\x6d\x7a\xa4\x63\x7e\x25\xf5\x10\xf2\xc5\x23\x89\xda\xff\x02\xe2\xbe\x5d\x66\x1a\x9d\xcb\x1a\x25\x68\x4f\x7a\x24\x5a\xe1\x8a\x7a\xf4\x9d\x83\x1b\xc9\x53\x76\xa8\x4c\x0d\x07\xca\xa8\x52\x7d\x27\x90\xfc\x60\xbc\x2a\x09\x64\xdb\xaf\xd8\x9f\x56\xa8\xab\x95\x45\x49\xc0\x16\x24\x69\x0a\xd5\xfb\x3f\x78\xd2\x1a\xae\x76\x4d\x10\xa6\x0d\xc9\x80\x30\x5d\xb2\x15\xb4\x0b\xdf\x3b\x4c\x53\x28\xbc\xaf\x5c\x9a\x24\xe3\xce\x91\x2c\x5c\x22\xd8\x08\xaa\xbc\x4b\x42\xc3\x68\x46\xe9\x92\x70\xd5\x84\x9f\xe4\x95\x27\x5b\x2a\xd3\x34\x4d\xc4\xcb\xd0\xab\xbb\xe2\x0f\x96\x2e\x2d\x0a\xba\x21\xab\x58\xde\x85\x0b\x5e\xba\x14\xfe\xd7\x99\x09\x36\x1e\x95\x21\x3b\x68\xba\xa8\x13\x53\x65\x9c\x47\xad\x07\x9c\x84\x47\x95\xb8\xa2\x14\x7e\xfc\x80\x78\x96\xcd\xe7\xe1\x0d\x9e\x9e\xd2\xee\xbd\xd3\x68\x78\x7a\xda\x77\xb9\xa9\xb5\xbe\x61\xad\xc4\x36\x85\x73\xfd\x80\x5b\x37\xb0\x10\x5c\x96\x18\x04\xff\xeb\x34\x19\xa4\x8d\x5d\x31\xfd\x36\x30\x23\xb3\x49\x07\xaf\x81\xc5\x50\x3b\xe0\x65\xab\x51\xd9\xbc\x1f\xcc\x96\x4a\x53\x20\x5e\x58\x42\x4f\xf1\xc8\xa9\xdf\xdf\x2c\x9b\xe7\x61\xbe\xc9\xb3\xf3\xeb\x8b\x91\x05\xb4\xe3\xde\x60\xb4\x8a\x43\xdc\xe9\x5e\xee\xe3\xb3\x66\x48\xdb\xed\x61\x3c\x54\x9e\x04\x91\x5d\x7c\xf9\xf3\xf3\xed\x55\xde\x0e\x5b\xc7\x90\x7c\xb0\x5c\xa6\x7b\x0b\xd0\xe5\xbb\xc6\xea\x8a\xb6\xdd\xa5\xbe\xff\x9c\x9a\xb1\xf7\x9f\xe6\xc4\x1e\x8e\xaa\x2f\x41\xce\xdf\xcf\x6f\x8f\xb3\x96\x90\x17\xcd\x08\x58\xd6\xda\xd7\x2e\x31\xe4\x63\xb9\xc7\xdd\x7c\xd9\x88\xdf\x19\x48\xaa\x34\x6f\x3b\x8d\x09\x93\x38\xc9\x86\xd4\x76\x38\x3f\x03\xf6\x05\xd9\x07\xe5\x68\x64\xe9\x3c\x1a\x19\xae\xa8\xa6\x02\xc7\x61\x7e\x3c\x9f\x67\x17\xef\xf3\x00\xf7\xe6\xd3\xfd\xe5\x3c\x3b\x51\xe3\x25\x6a\x47\xc3\xda\x6e\x58\xd7\x25\x5d\x07\x69\x70\xe9\x5e\xec\x32\x7c\xbd\x41\x5f\xa4\x90\x04\x29\x4f\xb8\xf2\xfd\xb8\x3b\x39\xc6\x7d\xa0\x7d\xa1\x4c\x24\x95\xfd\x59\xa8\x9e\xb6\x43\xbe\x86\xc1\x0c\xf9\x41\xb0\x16\xeb\xe8\xca\xb8\x77\x24\x87\x4d\x38\xcb\xe6\xf1\xc1\xe1\x3e\x0e\x2b\xc0\x68\x10\x8d\xb2\x57\x2d\xc6\xbd\xe1\xfe\x68\xc8\x31\xb8\x9f\x86\x3c\xda\x28\xff\x04\x00\x00\xff\xff\xa8\x78\x41\xa5\xbf\x0e\x00\x00"),
 		},
 	}
 	fs["/"].(*vfsgen۰DirInfo).entries = []os.FileInfo{
diff --git a/deployments/charts/kuma/templates/cp-rbac.yaml b/deployments/charts/kuma/templates/cp-rbac.yaml
index 44e42371b..81a0134de 100644
--- a/deployments/charts/kuma/templates/cp-rbac.yaml
+++ b/deployments/charts/kuma/templates/cp-rbac.yaml
@@ -86,6 +86,18 @@ rules:
       - patch
       - delete
   {{- end }}
+{{- if .Values.cni.enabled }}
+  - apiGroups:
+      - k8s.cni.cncf.io
+    resources:
+      - network-attachment-definitions
+    verbs:
+      - get
+      - list
+      - watch
+      - create
+      - delete
+{{- end }}
   - apiGroups:
       - ""
     resources:
diff --git a/pkg/plugins/runtime/k8s/controllers/namespace_controller.go b/pkg/plugins/runtime/k8s/controllers/namespace_controller.go
index d28703682..f86ffc4eb 100644
--- a/pkg/plugins/runtime/k8s/controllers/namespace_controller.go
+++ b/pkg/plugins/runtime/k8s/controllers/namespace_controller.go
@@ -8,17 +8,12 @@ import (
 	kube_core "k8s.io/api/core/v1"
 	kube_apierrs "k8s.io/apimachinery/pkg/api/errors"
 	kube_meta "k8s.io/apimachinery/pkg/apis/meta/v1"
-	kube_types "k8s.io/apimachinery/pkg/types"
+	"k8s.io/apimachinery/pkg/types"
 	kube_ctrl "sigs.k8s.io/controller-runtime"
 	kube_client "sigs.k8s.io/controller-runtime/pkg/client"
 	kube_controllerutil "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
-	kube_handler "sigs.k8s.io/controller-runtime/pkg/handler"
-	kube_reconcile "sigs.k8s.io/controller-runtime/pkg/reconcile"
-	kube_source "sigs.k8s.io/controller-runtime/pkg/source"
 
-	mesh_proto "github.com/kumahq/kuma/api/mesh/v1alpha1"
 	core_manager "github.com/kumahq/kuma/pkg/core/resources/manager"
-	mesh_k8s "github.com/kumahq/kuma/pkg/plugins/resources/k8s/native/api/v1alpha1"
 	k8scnicncfio "github.com/kumahq/kuma/pkg/plugins/runtime/k8s/apis/k8s.cni.cncf.io"
 	network_v1 "github.com/kumahq/kuma/pkg/plugins/runtime/k8s/apis/k8s.cni.cncf.io/v1"
 	"github.com/kumahq/kuma/pkg/plugins/runtime/k8s/metadata"
@@ -29,11 +24,8 @@ type NamespaceReconciler struct {
 	kube_client.Client
 	Log logr.Logger
 
-	SystemNamespace         string
-	CNIEnabled              bool
-	SkipDefaultMeshCreation bool
-	ResourceManager         core_manager.ResourceManager
-	DefaultMeshTemplate     mesh_proto.Mesh
+	CNIEnabled      bool
+	ResourceManager core_manager.ResourceManager
 }
 
 // Reconcile is in charge of creating NetworkAttachmentDefinition if CNI enabled and namespace has label 'kuma.io/sidecar-injection: enabled'
@@ -44,21 +36,33 @@ func (r *NamespaceReconciler) Reconcile(req kube_ctrl.Request) (kube_ctrl.Result
 	log := r.Log.WithValues("namespace", req.Name)
 	ctx := context.Background()
 
-	// Fetch the Namespace instance
 	ns := &kube_core.Namespace{}
 	if err := r.Get(ctx, req.NamespacedName, ns); err != nil {
 		if kube_apierrs.IsNotFound(err) {
 			return kube_ctrl.Result{}, nil
 		}
-		log.Error(err, "unable to fetch Namespace")
-		return kube_ctrl.Result{}, err
+		return kube_ctrl.Result{}, errors.Wrapf(err, "unable to fetch Namespace %s", req.NamespacedName.Name)
+	}
+
+	if ns.Status.Phase == kube_core.NamespaceTerminating {
+		// we should not try to create or delete resources on namespace with Terminating state, it will result in errors
+		log.V(1).Info("namespace is Terminating")
+		return kube_ctrl.Result{}, nil
 	}
 
-	if label, ok := ns.Labels["kuma.io/sidecar-injection"]; ok && label == "enabled" {
+	injected, _, err := metadata.Annotations(ns.Annotations).GetEnabled(metadata.KumaSidecarInjectionAnnotation)
+	if err != nil {
+		return kube_ctrl.Result{}, errors.Wrapf(err, "unable to check sidecar injection annotation on namespace %s", ns.Name)
+	}
+	if injected {
+		log.Info("creating NetworkAttachmentDefinition for CNI support")
 		err := r.createOrUpdateNetworkAttachmentDefinition(req.Name)
 		return kube_ctrl.Result{}, err
+	} else {
+		// either a namespace that just had its kuma.io/sidecar-injection annotation removed or a namespace that never had this annotation
+		err := r.deleteNetworkAttachmentDefinition(log, req.Name)
+		return kube_ctrl.Result{}, err
 	}
-	return kube_ctrl.Result{}, nil
 }
 
 func (r *NamespaceReconciler) createOrUpdateNetworkAttachmentDefinition(namespace string) error {
@@ -75,24 +79,32 @@ func (r *NamespaceReconciler) createOrUpdateNetworkAttachmentDefinition(namespac
 	return err
 }
 
+func (r *NamespaceReconciler) deleteNetworkAttachmentDefinition(log logr.Logger, namespace string) error {
+	nad := &network_v1.NetworkAttachmentDefinition{}
+	key := types.NamespacedName{
+		Namespace: namespace,
+		Name:      metadata.KumaCNI,
+	}
+	err := r.Client.Get(context.Background(), key, nad)
+	switch {
+	case err == nil:
+		log.Info("deleting NetworkAttachmentDefinition")
+		return r.Client.Delete(context.Background(), nad)
+	case kube_apierrs.IsNotFound(err): // it means that namespace never had Kuma injected
+		return nil
+	default:
+		return errors.Wrap(err, "could not fetch NetworkAttachmentDefinition")
+	}
+}
+
 func (r *NamespaceReconciler) SetupWithManager(mgr kube_ctrl.Manager) error {
 	if err := kube_core.AddToScheme(mgr.GetScheme()); err != nil {
 		return errors.Wrapf(err, "could not add %q to scheme", kube_core.SchemeGroupVersion)
 	}
-	if err := mesh_k8s.AddToScheme(mgr.GetScheme()); err != nil {
-		return errors.Wrapf(err, "could not add %q to scheme", mesh_k8s.GroupVersion)
-	}
 	if err := k8scnicncfio.AddToScheme(mgr.GetScheme()); err != nil {
 		return errors.Wrapf(err, "could not add %q to scheme", k8scnicncfio.GroupVersion)
 	}
 	return kube_ctrl.NewControllerManagedBy(mgr).
 		For(&kube_core.Namespace{}).
-		Watches(&kube_source.Kind{Type: &mesh_k8s.Mesh{}}, &kube_handler.EnqueueRequestsFromMapFunc{
-			ToRequests: kube_handler.ToRequestsFunc(func(obj kube_handler.MapObject) []kube_reconcile.Request {
-				return []kube_reconcile.Request{{
-					NamespacedName: kube_types.NamespacedName{Name: obj.Meta.GetNamespace()},
-				}}
-			}),
-		}).
 		Complete(r)
 }
diff --git a/pkg/plugins/runtime/k8s/plugin.go b/pkg/plugins/runtime/k8s/plugin.go
index 156c85b80..e281236a2 100644
--- a/pkg/plugins/runtime/k8s/plugin.go
+++ b/pkg/plugins/runtime/k8s/plugin.go
@@ -8,8 +8,6 @@ import (
 
 	config_core "github.com/kumahq/kuma/pkg/config/core"
 
-	"github.com/kumahq/kuma/api/mesh/v1alpha1"
-
 	"github.com/kumahq/kuma/pkg/core/secrets/manager"
 
 	"github.com/pkg/errors"
@@ -79,13 +77,10 @@ func addControllers(mgr kube_ctrl.Manager, rt core_runtime.Runtime) error {
 
 func addNamespaceReconciler(mgr kube_ctrl.Manager, rt core_runtime.Runtime) error {
 	reconciler := &k8s_controllers.NamespaceReconciler{
-		Client:                  mgr.GetClient(),
-		Log:                     core.Log.WithName("controllers").WithName("Namespace"),
-		SystemNamespace:         rt.Config().Store.Kubernetes.SystemNamespace,
-		CNIEnabled:              rt.Config().Runtime.Kubernetes.Injector.CNIEnabled,
-		ResourceManager:         rt.ResourceManager(),
-		SkipDefaultMeshCreation: rt.Config().Defaults.SkipMeshCreation,
-		DefaultMeshTemplate:     v1alpha1.Mesh{},
+		Client:          mgr.GetClient(),
+		Log:             core.Log.WithName("controllers").WithName("Namespace"),
+		CNIEnabled:      rt.Config().Runtime.Kubernetes.Injector.CNIEnabled,
+		ResourceManager: rt.ResourceManager(),
 	}
 	return reconciler.SetupWithManager(mgr)
 }


Test patch:
diff --git a/app/kumactl/cmd/install/testdata/install-control-plane.cni-enabled.golden.yaml b/app/kumactl/cmd/install/testdata/install-control-plane.cni-enabled.golden.yaml
index 816f2d728..330cb093b 100644
--- a/app/kumactl/cmd/install/testdata/install-control-plane.cni-enabled.golden.yaml
+++ b/app/kumactl/cmd/install/testdata/install-control-plane.cni-enabled.golden.yaml
@@ -5290,6 +5290,16 @@ rules:
       - get
       - list
       - watch
+  - apiGroups:
+      - k8s.cni.cncf.io
+    resources:
+      - network-attachment-definitions
+    verbs:
+      - get
+      - list
+      - watch
+      - create
+      - delete
   - apiGroups:
       - ""
     resources:
diff --git a/pkg/plugins/runtime/k8s/controllers/namespace_controller_test.go b/pkg/plugins/runtime/k8s/controllers/namespace_controller_test.go
index 39cc157fe..6b0fe4dae 100644
--- a/pkg/plugins/runtime/k8s/controllers/namespace_controller_test.go
+++ b/pkg/plugins/runtime/k8s/controllers/namespace_controller_test.go
@@ -17,6 +17,7 @@ import (
 	"github.com/kumahq/kuma/pkg/core/resources/manager"
 	"github.com/kumahq/kuma/pkg/plugins/resources/memory"
 	"github.com/kumahq/kuma/pkg/plugins/runtime/k8s/controllers"
+	"github.com/kumahq/kuma/pkg/plugins/runtime/k8s/metadata"
 
 	v1 "github.com/kumahq/kuma/pkg/plugins/runtime/k8s/apis/k8s.cni.cncf.io/v1"
 )
@@ -37,7 +38,7 @@ var _ = Describe("NamespaceReconciler", func() {
 				ObjectMeta: kube_meta.ObjectMeta{
 					Name:      "non-system-ns-with-sidecar-injection",
 					Namespace: "non-system-ns-with-sidecar-injection",
-					Labels: map[string]string{
+					Annotations: map[string]string{
 						"kuma.io/sidecar-injection": "enabled",
 					},
 				},
@@ -48,17 +49,10 @@ var _ = Describe("NamespaceReconciler", func() {
 					Namespace: "non-system-ns-without-sidecar-injection",
 				},
 			},
-			&kube_core.Namespace{
-				ObjectMeta: kube_meta.ObjectMeta{
-					Name:      "kuma-system",
-					Namespace: "kuma-system",
-				},
-			},
 		)
 
 		reconciler = &controllers.NamespaceReconciler{
 			Client:          kubeClient,
-			SystemNamespace: "kuma-system",
 			CNIEnabled:      true,
 			Log:             core.Log.WithName("test"),
 			ResourceManager: resManager,
@@ -76,44 +70,50 @@ var _ = Describe("NamespaceReconciler", func() {
 
 		// when
 		result, err := reconciler.Reconcile(req)
+
 		// then
 		Expect(err).ToNot(HaveOccurred())
-		// and
 		Expect(result).To(BeZero())
 
-		// when
+		// and NetworkAttachmentDefinition is created
 		nads := &v1.NetworkAttachmentDefinitionList{}
 		err = kubeClient.List(context.Background(), nads)
-		// then
 		Expect(err).ToNot(HaveOccurred())
-		// and
 		Expect(nads.Items).To(HaveLen(1))
 		Expect(nads.Items[0].Namespace).To(Equal("non-system-ns-with-sidecar-injection"))
 		Expect(nads.Items[0].Name).To(Equal("kuma-cni"))
 	})
 
-	It("should ignore system namespace", func() {
-		// given
+	It("should delete NetworkAttachmentDefinition when injection annotation is no longer on the namespace", func() {
+		// setup NetworkAttachmentDefinition in the namespace
+		nad := &v1.NetworkAttachmentDefinition{
+			ObjectMeta: kube_meta.ObjectMeta{
+				Namespace: "non-system-ns-without-sidecar-injection",
+				Name:      metadata.KumaCNI,
+			},
+		}
+		err := kubeClient.Create(context.Background(), nad)
+		Expect(err).ToNot(HaveOccurred())
+
+		// given namespace without kuma.io/sidecar-injection annotation
 		req := kube_ctrl.Request{
 			NamespacedName: kube_types.NamespacedName{
-				Namespace: "kuma-system",
-				Name:      "kuma-system",
+				Namespace: "non-system-ns-without-sidecar-injection",
+				Name:      "non-system-ns-without-sidecar-injection",
 			},
 		}
 
 		// when
 		result, err := reconciler.Reconcile(req)
+
 		// then
 		Expect(err).ToNot(HaveOccurred())
-		// and
 		Expect(result).To(BeZero())
 
-		// when
+		// and NetworkAttachmentDefinition is deleted
 		nads := &v1.NetworkAttachmentDefinitionList{}
 		err = kubeClient.List(context.Background(), nads)
-		// then
 		Expect(err).ToNot(HaveOccurred())
-		// and
 		Expect(nads.Items).To(HaveLen(0))
 	})
 
@@ -128,17 +128,15 @@ var _ = Describe("NamespaceReconciler", func() {
 
 		// when
 		result, err := reconciler.Reconcile(req)
+
 		// then
 		Expect(err).ToNot(HaveOccurred())
-		// and
 		Expect(result).To(BeZero())
 
-		// when
+		// and NetworkAttachmentDefinition is not created
 		nads := &v1.NetworkAttachmentDefinitionList{}
 		err = kubeClient.List(context.Background(), nads)
-		// then
 		Expect(err).ToNot(HaveOccurred())
-		// and
 		Expect(nads.Items).To(HaveLen(0))
 	})