Remove CNI patching (#1386)

Signed-off-by: Artiom Diomin <[email protected]>
kubermatic · Jun 15, 2021 · c477c5b · c477c5b
1 parent b1e7a7b
commit c477c5b
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 23 deletions.
diff --git a/pkg/state/context.go b/pkg/state/context.go
@@ -90,7 +90,6 @@ type State struct {
 	ForceUpgrade              bool
 	ForceInstall              bool
 	UpgradeMachineDeployments bool
-	PatchCNI                  bool
 	CredentialsFilePath       string
 	ManifestFilePath          string
 	PauseImage                string

diff --git a/pkg/tasks/cni.go b/pkg/tasks/cni.go
@@ -51,12 +51,3 @@ func ensureCNIExternal(s *state.State) error {
 	s.Logger.Infoln("External CNI plugin will be used")
 	return nil
 }
-
-func patchCNI(s *state.State) error {
-	if !s.PatchCNI {
-		return nil
-	}
-
-	s.Logger.Info("Patching CNI...")
-	return ensureCNI(s)
-}
diff --git a/pkg/tasks/tasks.go b/pkg/tasks/tasks.go
@@ -216,10 +216,6 @@ func WithResources(t Tasks) Tasks {
 				Description: "ensure external CCM",
 				Predicate:   func(s *state.State) bool { return s.Cluster.CloudProvider.External },
 			},
-			{
-				Fn:     patchCNI,
-				ErrMsg: "failed to patch CNI",
-			},
 			{
 				Fn:     joinStaticWorkerNodes,
 				ErrMsg: "failed to join worker nodes to the cluster",

diff --git a/pkg/templates/canal/canal.go b/pkg/templates/canal/canal.go
@@ -150,7 +150,7 @@ func Deploy(s *state.State) error {
 		configMap(buf, s.Cluster.ClusterNetwork.CNI.Canal.MTU),
 		daemonsetServiceAccount(),
 		deploymentServiceAccount(),
-		daemonSet(s.PatchCNI, s.Cluster.ClusterNetwork.PodSubnet, calicoCNIImage, calicoNodeImage, flannelImage),
+		daemonSet(s.Cluster.ClusterNetwork.PodSubnet, calicoCNIImage, calicoNodeImage, flannelImage),
 		controllerDeployment(calicoControllerImage),
 	)
 

diff --git a/pkg/templates/canal/daemonset.go b/pkg/templates/canal/daemonset.go
@@ -26,7 +26,7 @@ import (
 
 // daemonSet installs the calico/node container, as well as the Calico CNI plugins and network config on each
 // master and worker node in a Kubernetes cluster
-func daemonSet(ifacePatch bool, clusterCIDR, installCNIImage, calicoImage, flannelImage string) *appsv1.DaemonSet {
+func daemonSet(clusterCIDR, installCNIImage, calicoImage, flannelImage string) *appsv1.DaemonSet {
 	maxUnavailable := intstr.FromInt(1)
 	terminationGracePeriodSeconds := int64(0)
 	privileged := true
@@ -67,17 +67,14 @@ func daemonSet(ifacePatch bool, clusterCIDR, installCNIImage, calicoImage, flann
 				},
 			},
 		},
-	}
-
-	if ifacePatch {
-		flannelEnv = append(flannelEnv, corev1.EnvVar{
+		{
 			Name: "FLANNELD_IFACE",
 			ValueFrom: &corev1.EnvVarSource{
 				FieldRef: &corev1.ObjectFieldSelector{
 					FieldPath: "status.hostIP",
 				},
 			},
-		})
+		},
 	}
 
 	return &appsv1.DaemonSet{

diff --git a/pkg/templates/externalccm/ccm.go b/pkg/templates/externalccm/ccm.go
@@ -44,8 +44,6 @@ func Ensure(s *state.State) error {
 	s.Logger.Info("Ensure external CCM is up to date...")
 	var err error
 
-	s.PatchCNI = true
-
 	switch {
 	case s.Cluster.CloudProvider.Hetzner != nil:
 		err = ensureHetzner(s)