Merge pull request #1053 from kumahq/chore/cleanup_cni_templates

chore(*) cleanup unneeded CNI templates and the relevant code
kumahq · Oct 8, 2020 · 7f58c62 · 7f58c62
2 parents 78d5d5b + e071802
commit 7f58c62
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 418 deletions.
diff --git a/app/kumactl/cmd/install/install_control_plane.go b/app/kumactl/cmd/install/install_control_plane.go
@@ -14,7 +14,6 @@ import (
 	kumactl_cmd "github.com/kumahq/kuma/app/kumactl/pkg/cmd"
 	"github.com/kumahq/kuma/app/kumactl/pkg/install/data"
 	controlplane "github.com/kumahq/kuma/app/kumactl/pkg/install/k8s/control-plane"
-	kumacni "github.com/kumahq/kuma/app/kumactl/pkg/install/k8s/kuma-cni"
 	kuma_cmd "github.com/kumahq/kuma/pkg/cmd"
 	"github.com/kumahq/kuma/pkg/config/core"
 	"github.com/kumahq/kuma/pkg/tls"
@@ -225,12 +224,6 @@ func InstallCpTemplateFiles(args InstallControlPlaneArgs) (data.FileList, error)
 	if err != nil {
 		return nil, err
 	}
-	if args.Cni_enabled {
-		templateCNI, err := data.ReadFiles(kumacni.Templates)
-		if err != nil {
-			return nil, err
-		}
-		templateFiles = append(templateFiles, templateCNI...)
-	}
+
 	return templateFiles, nil
 }
diff --git a/app/kumactl/data/install/k8s/kuma-cni/all-in-one-template.yaml b/app/kumactl/data/install/k8s/kuma-cni/all-in-one-template.yaml
diff --git a/app/kumactl/pkg/install/k8s/kuma-cni/kumacni_suite_test.go b/app/kumactl/pkg/install/k8s/kuma-cni/kumacni_suite_test.go
diff --git a/app/kumactl/pkg/install/k8s/kuma-cni/templates.go b/app/kumactl/pkg/install/k8s/kuma-cni/templates.go
diff --git a/app/kumactl/pkg/install/k8s/kuma-cni/templates_dev.go b/app/kumactl/pkg/install/k8s/kuma-cni/templates_dev.go
diff --git a/app/kumactl/pkg/install/k8s/kuma-cni/templates_vfsdata.go b/app/kumactl/pkg/install/k8s/kuma-cni/templates_vfsdata.go