bug fixed

Author: fanux

install/init.go

@@ -84,6 +84,7 @@ func (s *SealosInstaller) InstallMaster0() {
 	}
 	//cmd = `kubectl apply -f /root/kube/conf/net/calico.yaml || true`
 	netyaml := net.NewNetwork(Network, net.MetaData{Interface:Interface,CIDR:PodCIDR}).Manifests("")
-	cmd = fmt.Sprintf(`cat %s | kubectl apply -f -`, netyaml)
+	logger.Info("calico yaml is : \n", netyaml)
+	cmd = fmt.Sprintf(`echo '%s' | kubectl apply -f -`, netyaml)
 	output = Cmd(s.Masters[0], cmd)
 }

net/calico.go

@@ -520,7 +520,6 @@ spec:
         # marks the pod as a critical add-on, ensuring it gets
         # priority scheduling and that its resources are reserved
         # if it ever gets evicted.
-        scheduler.alpha.kubernetes.io/critical-pod: ''
     spec:
       nodeSelector:
         beta.kubernetes.io/os: linux
@@ -767,7 +766,6 @@ spec:
       labels:
         k8s-app: calico-kube-controllers
       annotations:
-        scheduler.alpha.kubernetes.io/critical-pod: ''
     spec:
       nodeSelector:
         beta.kubernetes.io/os: linux

net/net_test.go

@@ -0,0 +1,11 @@
+package net
+
+import (
+	"fmt"
+	"testing"
+)
+
+func TestNewNetwork(t *testing.T) {
+	netyaml := NewNetwork("calico", MetaData{Interface:"en.*|eth.*",CIDR:"10.1.1.1/24"}).Manifests("")
+	fmt.Println(netyaml)
+}