Merge pull request #34 from mrostecki/remove-cilium

Remove Cilium
thkukuk · Jun 30, 2021 · b2ce1e7 · b2ce1e7
2 parents 0f1c376 + cb5ca3b
commit b2ce1e7
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 43 deletions.
diff --git a/README.md b/README.md
@@ -92,8 +92,7 @@ In this case, kubicd will configure the haproxy and add or remove master nodes
 depeding on the kubernetes cluster configuration automatically, if `haproxycfg`
 is installed.
 
-For cilium or flannel instead of weave you have to use `kubicctl init
---pod-network cilium` or `kubicctl init --pod-network flannel`.
+For flannel instead of weave you have to use `kubicctl init --pod-network flannel`.
 
 To deploy kubic without a CNI you have to use `kubicctl init 
 --pod-network none`
@@ -179,7 +178,7 @@ harddisk, install the new node and, if this new node is of type "master" or
 * init - Initialize Kubernetes Master Node
   * `--multi-master=<DNS name>`  	Setup HA masters, the argument must be the DNS name of the load balancer
   * `--haproxy=<salt name>` Adjust haproxy configuration for multi-master setup via salt
-  * `--pod-network=<flannel|cilium>`	Pod network
+  * `--pod-network=<flannel>`	Pod network
   * `--adv-addr=<IPaddr>`	IP address the API Server will advertise on
   * `--apiserver_cert_extra_sans=<IPaddr>`	additional IPs to add to the APIserver certificate
   * `--stage=<official|devel>` Specify to use the official images or from the devel project

diff --git a/etc/kubicd/helm/cilium.yaml b/etc/kubicd/helm/cilium.yaml
diff --git a/pkg/kubeadm/destroyMaster.go b/pkg/kubeadm/destroyMaster.go
@@ -35,7 +35,7 @@ func DestroyMaster(in *pb.Empty, stream pb.Kubeadm_DestroyMasterServer) error {
 			return err
 		}
 	}
-	tools.ExecuteCmd("/bin/sh", "-c", "ip link delete cni0;  ip link delete flannel.1; ip link delete cilium_vxlan")
+	tools.ExecuteCmd("/bin/sh", "-c", "ip link delete cni0; ip link delete flannel.1")
 
 	return nil
 }
diff --git a/pkg/kubeadm/initMaster.go b/pkg/kubeadm/initMaster.go
@@ -28,9 +28,6 @@ import (
 )
 
 const (
-	cilium_chart     = "/usr/share/k8s-helm/cilium/"
-	cilium_values    = "/etc/kubicd/helm/cilium.yaml"
-	cilium_namespace = "kube-system"
 	flannel_yaml     = "/usr/share/k8s-yaml/flannel/kube-flannel.yaml"
 	weave_yaml       = "/usr/share/k8s-yaml/weave/weave.yaml"
 	kured_yaml       = "/usr/share/k8s-yaml/kured/kured.yaml"
@@ -131,16 +128,8 @@ func InitMaster(in *pb.InitRequest, stream pb.Kubeadm_InitMasterServer) error {
 			}
 			return nil
 		}
-	} else if strings.EqualFold(arg_pod_network, "cilium") {
-		found, _ = exists(cilium_chart, "")
-		if found != true {
-			if err := stream.Send(&pb.StatusReply{Success: false, Message: "cilium-k8s-yaml is not installed!"}); err != nil {
-				return err
-			}
-			return nil
-		}
 	} else if !strings.EqualFold(arg_pod_network, "none") {
-		if err := stream.Send(&pb.StatusReply{Success: false, Message: "Unsupported pod network, please use 'cilium', 'flannel', 'weave' or 'none'"}); err != nil {
+		if err := stream.Send(&pb.StatusReply{Success: false, Message: "Unsupported pod network, please use 'flannel', 'weave' or 'none'"}); err != nil {
 			return err
 		}
 		return nil
@@ -383,19 +372,7 @@ func InitMaster(in *pb.InitRequest, stream pb.Kubeadm_InitMasterServer) error {
 			}
 			return nil
 		}
-	} else if strings.EqualFold(arg_pod_network, "cilium") {
-		// Setting up cilium
-		if err := stream.Send(&pb.StatusReply{Success: true, Message: "Deploy cilium"}); err != nil {
-			return err
-		}
-		if err := deployment.DeployHelm(cilium_chart, "cilium", cilium_values, cilium_namespace); err != nil {
-			ResetMaster()
-			if err := stream.Send(&pb.StatusReply{Success: success, Message: err.Error()}); err != nil {
-				return err
-			}
-			return nil
-		}
-	} else if strings.EqualFold(arg_pod_network, "cilium") {
+	} else if strings.EqualFold(arg_pod_network, "none") {
 		if err := stream.Send(&pb.StatusReply{Success: true, Message: "No CNI will be deployed"}); err != nil {
 			return err
 		}

diff --git a/pkg/kubeadm/reset.go b/pkg/kubeadm/reset.go
@@ -117,7 +117,7 @@ func ResetNode(nodeName string, send OutputStream) (bool, string) {
 		"\"iptables -F && iptables -t nat -F && iptables -t mangle -F && iptables -X\"")
 	tools.ExecuteCmd("salt", nodeName, "cmd.run", "\"rm -rf /var/lib/etcd/*\"")
 	tools.ExecuteCmd("salt", nodeName, "cmd.run", "\"rm -rf /var/lib/cni/*\"")
-	tools.ExecuteCmd("salt", nodeName, "cmd.run", "\"ip link delete cni0;  ip link delete flannel.1; ip link delete cilium_vxlan\"")
+	tools.ExecuteCmd("salt", nodeName, "cmd.run", "\"ip link delete cni0;  ip link delete flannel.1\"")
 	tools.ExecuteCmd("salt", nodeName, "service.disable", "kubelet")
 	tools.ExecuteCmd("salt", nodeName, "service.stop", "kubelet")
 	tools.ExecuteCmd("salt", nodeName, "service.disable", "crio")

diff --git a/pkg/kubicctl/initMaster.go b/pkg/kubicctl/initMaster.go
@@ -45,7 +45,7 @@ func InitMasterCmd() *cobra.Command {
 	}
 
 	subCmd.PersistentFlags().StringVar(&multiMaster, "multi-master", multiMaster, "Setup multimaster cluster, argument needs to be the DNS name of the load balancer")
-	subCmd.PersistentFlags().StringVar(&podNetwork, "pod-network", podNetwork, "pod network, valid values are 'cilium', 'flannel', 'weave' or 'none'")
+	subCmd.PersistentFlags().StringVar(&podNetwork, "pod-network", podNetwork, "pod network, valid values are 'flannel', 'weave' or 'none'")
 	subCmd.PersistentFlags().StringVar(&adv_addr, "adv-addr", adv_addr, "IP address the API Server will advertise it's listening on")
 	subCmd.PersistentFlags().StringVar(&apiserver_cert_extra_sans, "apiserver-cert-extra-sans", apiserver_cert_extra_sans, "additional IPs to add to the APIserver certificate")
 	subCmd.PersistentFlags().StringVar(&kubernetesVersion, "kubernetes-version", kubernetesVersion, "Kubernetes version of the control plane to deploy")