diff --git a/0001-mkdir-etcd-work-dir-and-manifest-dir.patch b/0001-mkdir-etcd-work-dir-and-manifest-dir.patch new file mode 100644 index 0000000..c29a5b5 --- /dev/null +++ b/0001-mkdir-etcd-work-dir-and-manifest-dir.patch @@ -0,0 +1,252 @@ +From 75f27f511e5a379bc29e2b9fd524a1bd960d0dae Mon Sep 17 00:00:00 2001 +From: zhangxiaoyu +Date: Wed, 23 Jun 2021 16:25:59 +0800 +Subject: [PATCH 01/14] mkdir etcd work dir and manifest dir + +Signed-off-by: zhangxiaoyu +--- + pkg/clusterdeployment/binary/binary.go | 3 +-- + .../binary/bootstrap/bootstrap.go | 3 ++- + .../binary/commontools/token.go | 14 +++++------ + .../binary/controlplane/controlplane.go | 18 +++++++------ + .../binary/coredns/binarycoredns.go | 12 ++++++--- + .../binary/etcdcluster/etcdcluster.go | 25 ++++++++++++++----- + 6 files changed, 47 insertions(+), 28 deletions(-) + +diff --git a/pkg/clusterdeployment/binary/binary.go b/pkg/clusterdeployment/binary/binary.go +index 70402bd..2e40c44 100644 +--- a/pkg/clusterdeployment/binary/binary.go ++++ b/pkg/clusterdeployment/binary/binary.go +@@ -140,8 +140,7 @@ func (bcp *BinaryClusterDeployment) DeployLoadBalancer() error { + + func (bcp *BinaryClusterDeployment) InitControlPlane() error { + logrus.Info("do init control plane...") +- controlplane.Init(bcp.config) +- return nil ++ return controlplane.Init(bcp.config) + } + + func (bcp *BinaryClusterDeployment) JoinBootstrap() error { +diff --git a/pkg/clusterdeployment/binary/bootstrap/bootstrap.go b/pkg/clusterdeployment/binary/bootstrap/bootstrap.go +index 76423f8..148bdec 100644 +--- a/pkg/clusterdeployment/binary/bootstrap/bootstrap.go ++++ b/pkg/clusterdeployment/binary/bootstrap/bootstrap.go +@@ -57,7 +57,8 @@ func (gt *GetTokenTask) Name() string { + } + + func (gt *GetTokenTask) Run(r runner.Runner, hcg *api.HostConfig) error { +- token, err := commontools.GetBootstrapToken(r, gt.tokenStr, filepath.Join(gt.cluster.GetConfigDir(), constants.KubeConfigFileNameAdmin)) ++ token, err := commontools.GetBootstrapToken(r, gt.tokenStr, ++ filepath.Join(gt.cluster.GetConfigDir(), constants.KubeConfigFileNameAdmin), gt.cluster.GetManifestDir()) + if err != nil { + return err + } +diff --git a/pkg/clusterdeployment/binary/commontools/token.go b/pkg/clusterdeployment/binary/commontools/token.go +index c946a99..f1d4c5d 100644 +--- a/pkg/clusterdeployment/binary/commontools/token.go ++++ b/pkg/clusterdeployment/binary/commontools/token.go +@@ -52,7 +52,7 @@ stringData: + ` + ) + +-func CreateBootstrapToken(r runner.Runner, bconf *api.BootstrapTokenConfig, kubeconfig string) error { ++func CreateBootstrapToken(r runner.Runner, bconf *api.BootstrapTokenConfig, kubeconfig, manifestDir string) error { + var sb strings.Builder + var usages []string + now := time.Now() +@@ -80,10 +80,10 @@ func CreateBootstrapToken(r runner.Runner, bconf *api.BootstrapTokenConfig, kube + return err + } + sb.WriteString("sudo -E /bin/sh -c \"") +- sb.WriteString(fmt.Sprintf("mkdir -p %s", constants.DefaultK8SManifestsDir)) ++ sb.WriteString(fmt.Sprintf("mkdir -p %s", manifestDir)) + tokenYamlBase64 := base64.StdEncoding.EncodeToString([]byte(coreConfig)) +- sb.WriteString(fmt.Sprintf(" && echo %s | base64 -d > %s/bootstrap_token.yaml", tokenYamlBase64, constants.DefaultK8SManifestsDir)) +- sb.WriteString(fmt.Sprintf(" && KUBECONFIG=%s kubectl apply -f %s/bootstrap_token.yaml", kubeconfig, constants.DefaultK8SManifestsDir)) ++ sb.WriteString(fmt.Sprintf(" && echo %s | base64 -d > %s/bootstrap_token.yaml", tokenYamlBase64, manifestDir)) ++ sb.WriteString(fmt.Sprintf(" && KUBECONFIG=%s kubectl apply -f %s/bootstrap_token.yaml", kubeconfig, manifestDir)) + sb.WriteString("\"") + + _, err = r.RunCommand(sb.String()) +@@ -96,7 +96,7 @@ func CreateBootstrapToken(r runner.Runner, bconf *api.BootstrapTokenConfig, kube + + func CreateBootstrapTokensForCluster(r runner.Runner, ccfg *api.ClusterConfig) error { + for _, token := range ccfg.BootStrapTokens { +- if err := CreateBootstrapToken(r, token, filepath.Join(ccfg.GetConfigDir(), constants.KubeConfigFileNameAdmin)); err != nil { ++ if err := CreateBootstrapToken(r, token, filepath.Join(ccfg.GetConfigDir(), constants.KubeConfigFileNameAdmin), ccfg.GetManifestDir()); err != nil { + logrus.Errorf("create bootstrap token failed: %v", err) + return err + } +@@ -104,7 +104,7 @@ func CreateBootstrapTokensForCluster(r runner.Runner, ccfg *api.ClusterConfig) e + return nil + } + +-func GetBootstrapToken(r runner.Runner, tokenStr string, kubeconfig string) (string, error) { ++func GetBootstrapToken(r runner.Runner, tokenStr string, kubeconfig, manifestDir string) (string, error) { + // TODO: check exist token first + token, id, secret, err := ParseBootstrapTokenStr(tokenStr) + if err != nil { +@@ -117,7 +117,7 @@ func GetBootstrapToken(r runner.Runner, tokenStr string, kubeconfig string) (str + Usages: []string{"authentication", "signing"}, + AuthExtraGroups: []string{"system:bootstrappers:worker,system:bootstrappers:ingress"}, + } +- err = CreateBootstrapToken(r, bconf, kubeconfig) ++ err = CreateBootstrapToken(r, bconf, kubeconfig, manifestDir) + + return token, err + } +diff --git a/pkg/clusterdeployment/binary/controlplane/controlplane.go b/pkg/clusterdeployment/binary/controlplane/controlplane.go +index 7d92e16..b8f1ba6 100644 +--- a/pkg/clusterdeployment/binary/controlplane/controlplane.go ++++ b/pkg/clusterdeployment/binary/controlplane/controlplane.go +@@ -512,11 +512,13 @@ func (ct *PostControlPlaneTask) Name() string { + } + + func (ct *PostControlPlaneTask) doAdminRole(r runner.Runner) error { ++ manifestDir := ct.cluster.GetManifestDir() + var sb strings.Builder + sb.WriteString("sudo -E /bin/sh -c \"") ++ sb.WriteString(fmt.Sprintf("mkdir -p %s", manifestDir)) + roleBase64 := base64.StdEncoding.EncodeToString([]byte(AdminRoleConfig)) +- sb.WriteString(fmt.Sprintf(" echo %s | base64 -d > %s/admin_cluster_role.yaml", roleBase64, ct.cluster.GetManifestDir())) +- sb.WriteString(fmt.Sprintf(" && KUBECONFIG=%s/admin.conf kubectl apply -f %s/admin_cluster_role.yaml", ct.cluster.GetConfigDir(), ct.cluster.GetManifestDir())) ++ sb.WriteString(fmt.Sprintf(" && echo %s | base64 -d > %s/admin_cluster_role.yaml", roleBase64, manifestDir)) ++ sb.WriteString(fmt.Sprintf(" && KUBECONFIG=%s/admin.conf kubectl apply -f %s/admin_cluster_role.yaml", ct.cluster.GetConfigDir(), manifestDir)) + sb.WriteString("\"") + _, err := r.RunCommand(sb.String()) + if err != nil { +@@ -531,7 +533,7 @@ func (ct *PostControlPlaneTask) doAdminRole(r runner.Runner) error { + RoleName: "system:kube-apiserver-to-kubelet", + } + +- if err := ct.applyClusterRoleBinding(r, adminRoleBindConfig); err != nil { ++ if err := ct.applyClusterRoleBinding(r, adminRoleBindConfig, manifestDir); err != nil { + logrus.Errorf("apply admin rolebind failed: %v", err) + return err + } +@@ -562,7 +564,7 @@ func (ct *PostControlPlaneTask) createBootstrapCrb() []*api.ClusterRoleBindingCo + return []*api.ClusterRoleBindingConfig{csr, approve, renew} + } + +-func (ct *PostControlPlaneTask) applyClusterRoleBinding(r runner.Runner, crbc *api.ClusterRoleBindingConfig) error { ++func (ct *PostControlPlaneTask) applyClusterRoleBinding(r runner.Runner, crbc *api.ClusterRoleBindingConfig, manifestDir string) error { + datastore := map[string]interface{}{} + datastore["Name"] = crbc.Name + datastore["SubjectName"] = crbc.SubjectName +@@ -575,10 +577,10 @@ func (ct *PostControlPlaneTask) applyClusterRoleBinding(r runner.Runner, crbc *a + + var sb strings.Builder + sb.WriteString("sudo -E /bin/sh -c \"") +- sb.WriteString(fmt.Sprintf("mkdir -p %s", constants.DefaultK8SManifestsDir)) ++ sb.WriteString(fmt.Sprintf("mkdir -p %s", manifestDir)) + crbYamlBase64 := base64.StdEncoding.EncodeToString([]byte(crb)) +- sb.WriteString(fmt.Sprintf(" && echo %s | base64 -d > %s/%s.yaml", crbYamlBase64, constants.DefaultK8SManifestsDir, crbc.Name)) +- sb.WriteString(fmt.Sprintf(" && KUBECONFIG=%s/admin.conf kubectl apply -f %s/%s.yaml", ct.cluster.GetConfigDir(), constants.DefaultK8SManifestsDir, crbc.Name)) ++ sb.WriteString(fmt.Sprintf(" && echo %s | base64 -d > %s/%s.yaml", crbYamlBase64, manifestDir, crbc.Name)) ++ sb.WriteString(fmt.Sprintf(" && KUBECONFIG=%s/admin.conf kubectl apply -f %s/%s.yaml", ct.cluster.GetConfigDir(), manifestDir, crbc.Name)) + sb.WriteString("\"") + + _, err = r.RunCommand(sb.String()) +@@ -592,7 +594,7 @@ func (ct *PostControlPlaneTask) applyClusterRoleBinding(r runner.Runner, crbc *a + func (ct *PostControlPlaneTask) bootstrapClusterRoleBinding(r runner.Runner) error { + crbcs := ct.createBootstrapCrb() + for _, crbc := range crbcs { +- if err := ct.applyClusterRoleBinding(r, crbc); err != nil { ++ if err := ct.applyClusterRoleBinding(r, crbc, ct.cluster.GetManifestDir()); err != nil { + logrus.Errorf("apply ClusterRoleBinding failed: %v", err) + return err + } +diff --git a/pkg/clusterdeployment/binary/coredns/binarycoredns.go b/pkg/clusterdeployment/binary/coredns/binarycoredns.go +index 9ed7d1c..63aa40d 100644 +--- a/pkg/clusterdeployment/binary/coredns/binarycoredns.go ++++ b/pkg/clusterdeployment/binary/coredns/binarycoredns.go +@@ -144,10 +144,12 @@ func createCoreServerTemplate(cluster *api.ClusterConfig, r runner.Runner) error + logrus.Errorf("rend core dns server failed: %v", err) + return err + } ++ manifestDir := cluster.GetManifestDir() + sb.WriteString("sudo -E /bin/sh -c \"") ++ sb.WriteString(fmt.Sprintf("mkdir -p %s && ", manifestDir)) + serverBase64 := base64.StdEncoding.EncodeToString([]byte(serverConfig)) +- sb.WriteString(fmt.Sprintf("echo %s | base64 -d > %s/coredns_server.yaml", serverBase64, cluster.GetManifestDir())) +- sb.WriteString(fmt.Sprintf(" && KUBECONFIG=%s kubectl apply -f %s/coredns_server.yaml", fmt.Sprintf("%s/%s", cluster.GetConfigDir(), constants.KubeConfigFileNameAdmin), cluster.GetManifestDir())) ++ sb.WriteString(fmt.Sprintf("echo %s | base64 -d > %s/coredns_server.yaml", serverBase64, manifestDir)) ++ sb.WriteString(fmt.Sprintf(" && KUBECONFIG=%s kubectl apply -f %s/coredns_server.yaml", fmt.Sprintf("%s/%s", cluster.GetConfigDir(), constants.KubeConfigFileNameAdmin), manifestDir)) + sb.WriteString("\"") + + _, err = r.RunCommand(sb.String()) +@@ -170,10 +172,12 @@ func createCoreEndpointTemplate(cluster *api.ClusterConfig, r runner.Runner, ips + logrus.Errorf("rend core dns endpoint failed: %v", err) + return err + } ++ manifestDir := cluster.GetManifestDir() + sb.WriteString("sudo -E /bin/sh -c \"") ++ sb.WriteString(fmt.Sprintf("mkdir -p %s && ", manifestDir)) + epBase64 := base64.StdEncoding.EncodeToString([]byte(epConfig)) +- sb.WriteString(fmt.Sprintf("echo %s | base64 -d > %s/coredns_ep.yaml", epBase64, cluster.GetManifestDir())) +- sb.WriteString(fmt.Sprintf(" && KUBECONFIG=%s kubectl apply -f %s/coredns_ep.yaml", fmt.Sprintf("%s/%s", cluster.GetConfigDir(), constants.KubeConfigFileNameAdmin), cluster.GetManifestDir())) ++ sb.WriteString(fmt.Sprintf("echo %s | base64 -d > %s/coredns_ep.yaml", epBase64, manifestDir)) ++ sb.WriteString(fmt.Sprintf(" && KUBECONFIG=%s kubectl apply -f %s/coredns_ep.yaml", fmt.Sprintf("%s/%s", cluster.GetConfigDir(), constants.KubeConfigFileNameAdmin), manifestDir)) + sb.WriteString("\"") + + _, err = r.RunCommand(sb.String()) +diff --git a/pkg/clusterdeployment/binary/etcdcluster/etcdcluster.go b/pkg/clusterdeployment/binary/etcdcluster/etcdcluster.go +index 7466c7a..6129d4f 100644 +--- a/pkg/clusterdeployment/binary/etcdcluster/etcdcluster.go ++++ b/pkg/clusterdeployment/binary/etcdcluster/etcdcluster.go +@@ -19,6 +19,7 @@ import ( + "encoding/base64" + "fmt" + "path/filepath" ++ "strings" + "time" + + "gitee.com/openeuler/eggo/pkg/api" +@@ -91,6 +92,12 @@ func (t *EtcdDeployEtcdsTask) Run(r runner.Runner, hostConfig *api.HostConfig) e + return fmt.Errorf("empty host config") + } + ++ // prepare etcd dir ++ if err := prepareEtcdDir(r); err != nil { ++ logrus.Errorf("prepare etcd dir failed: %v", err) ++ return err ++ } ++ + // prepare config + if err := prepareEtcdConfigs(t.ccfg, r, hostConfig, EtcdConfFile, EtcdServiceFile); err != nil { + return err +@@ -105,12 +112,6 @@ func (t *EtcdDeployEtcdsTask) Run(r runner.Runner, hostConfig *api.HostConfig) e + return err + } + +- // create etcd service working dir +- if _, err := r.RunCommand("sudo -E /bin/sh -c \"mkdir -p -m 700 /var/lib/etcd\""); err != nil { +- logrus.Errorf("create etcd working dir failed: %v", err) +- return err +- } +- + shell, err := commontools.GetSystemdServiceShell("etcd", "", true) + if err != nil { + logrus.Errorf("get etcd systemd service shell failed: %v", err) +@@ -152,6 +153,18 @@ func (t *EtcdPostDeployEtcdsTask) Run(r runner.Runner, hostConfig *api.HostConfi + return nil + } + ++func prepareEtcdDir(r runner.Runner) error { ++ dirs := []string{filepath.Dir(EtcdConfFile), filepath.Dir(DefaultEtcdDataDir)} ++ ++ // create etcd working dir ++ join := strings.Join(dirs, " ") ++ if _, err := r.RunCommand(fmt.Sprintf("sudo -E /bin/sh -c \"mkdir -p %s\"", join)); err != nil { ++ return err ++ } ++ ++ return nil ++} ++ + func prepareEtcdConfigs(ccfg *api.ClusterConfig, r runner.Runner, hostConfig *api.HostConfig, + confPath string, servicePath string) error { + var peerAddresses string +-- +2.25.1 + diff --git a/0002-default-open-ports-for-coredns.patch b/0002-default-open-ports-for-coredns.patch new file mode 100644 index 0000000..c222349 --- /dev/null +++ b/0002-default-open-ports-for-coredns.patch @@ -0,0 +1,95 @@ +From eda6e567b9d4f67dccd6f7426cea7d75fb870473 Mon Sep 17 00:00:00 2001 +From: haozi007 +Date: Thu, 24 Jun 2021 14:16:19 +0800 +Subject: [PATCH 02/14] default open ports for coredns + +Signed-off-by: haozi007 +--- + cmd/configs.go | 14 ++++++++++++++ + config/centos.config | 9 +++++++++ + docs/manual.md | 2 ++ + .../binary/infrastructure/infrastructure.go | 3 +-- + 4 files changed, 26 insertions(+), 2 deletions(-) + +diff --git a/cmd/configs.go b/cmd/configs.go +index be91ba9..d52fcb3 100644 +--- a/cmd/configs.go ++++ b/cmd/configs.go +@@ -547,6 +547,20 @@ func createDeployConfigTemplate(file string) error { + Protocol: "tcp", + }, + }, ++ "master": { ++ &api.OpenPorts{ ++ Port: 53, ++ Protocol: "tcp", ++ }, ++ &api.OpenPorts{ ++ Port: 53, ++ Protocol: "udp", ++ }, ++ &api.OpenPorts{ ++ Port: 9153, ++ Protocol: "tcp", ++ }, ++ }, + }, + PackageSrc: api.PackageSrcConfig{ + Type: "tar.gz", +diff --git a/config/centos.config b/config/centos.config +index 6c0ae26..3ea4bc6 100755 +--- a/config/centos.config ++++ b/config/centos.config +@@ -21,6 +21,8 @@ service: + cidr: 10.32.0.0/16 + dnsaddr: 10.32.0.10 + gateway: 10.32.0.1 ++ dns: ++ corednstype: binary + network: + podcidr: 10.244.0.0/16 + plugin: "" +@@ -47,6 +49,13 @@ open-ports: + protocol: tcp + - port: 179 + protocol: tcp ++ master: ++ - port: 53 ++ protocol: tcp ++ - port: 53 ++ protocol: udp ++ - port: 9153 ++ protocol: udp + package-src: + type: tar.gz + distpath: "" +diff --git a/docs/manual.md b/docs/manual.md +index 1a6aedd..1e9ee65 100644 +--- a/docs/manual.md ++++ b/docs/manual.md +@@ -63,6 +63,8 @@ $ tree + ``` + $ docker save -o images.tar calico/node:v3.19.1 calico/cni:v3.19.1 calico/kube-controllers:v3.19.1 calico/pod2daemon-flexvol:v3.19.1 k8s.gcr.io/pause:3.2 + ++- 如果coredns使用pod的方式部署，则images.tar里面需要包含coredns的镜像，而coredns对应的二进制包可以删除。 ++ + 3) 准备eggo部署时使用的yaml配置文件。可以使用下面的命令生成一个模板配置，并打开yaml文件对其进行增删改来满足不同的部署需求。 + + ``` +diff --git a/pkg/clusterdeployment/binary/infrastructure/infrastructure.go b/pkg/clusterdeployment/binary/infrastructure/infrastructure.go +index 1a490ea..46c9629 100644 +--- a/pkg/clusterdeployment/binary/infrastructure/infrastructure.go ++++ b/pkg/clusterdeployment/binary/infrastructure/infrastructure.go +@@ -35,8 +35,7 @@ import ( + var itask *task.TaskInstance + + var ( +- // TODO: coredns open ports should be config by user +- MasterPorts = []string{"6443/tcp", "10252/tcp", "10251/tcp", "53/tcp", "53/udp", "9153/tcp"} ++ MasterPorts = []string{"6443/tcp", "10252/tcp", "10251/tcp"} + WorkPorts = []string{"10250/tcp", "10256/tcp"} + EtcdPosts = []string{"2379-2381/tcp"} + ) +-- +2.25.1 + diff --git a/0003-change-package-path-to-isula.org.patch b/0003-change-package-path-to-isula.org.patch new file mode 100644 index 0000000..d71f43e --- /dev/null +++ b/0003-change-package-path-to-isula.org.patch @@ -0,0 +1,902 @@ +From ec855ff2b21b7ea40b70437c59590b8f08879c46 Mon Sep 17 00:00:00 2001 +From: haozi007 +Date: Thu, 24 Jun 2021 14:23:25 +0800 +Subject: [PATCH 03/14] change package path to isula.org + +Signed-off-by: haozi007 +--- + cmd/cleanup.go | 4 +-- + cmd/configs.go | 6 ++-- + cmd/deploy.go | 4 +-- + cmd/modules.go | 2 +- + go.mod | 2 +- + pkg/api/types.go | 2 +- + pkg/clusterdeployment/binary/addons/addons.go | 2 +- + .../binary/addons/runner_addons.go | 12 ++++---- + pkg/clusterdeployment/binary/binary.go | 28 +++++++++---------- + .../binary/bootstrap/bootstrap.go | 20 ++++++------- + .../binary/bootstrap/bootstrap_test.go | 6 ++-- + .../binary/cleanupcluster/cleanupcluster.go | 24 ++++++++-------- + .../cleanupcluster/cleanupcluster_test.go | 2 +- + .../binary/commontools/copycacerts.go | 4 +-- + .../binary/commontools/systemdservices.go | 8 +++--- + .../binary/commontools/token.go | 6 ++-- + .../binary/controlplane/controlplane.go | 22 +++++++-------- + .../binary/controlplane/controlplane_test.go | 6 ++-- + .../binary/coredns/binarycoredns.go | 18 ++++++------ + .../binary/coredns/coredns.go | 2 +- + .../binary/coredns/podcoredns.go | 12 ++++---- + .../binary/etcdcluster/etcdcerts.go | 8 +++--- + .../binary/etcdcluster/etcdcluster.go | 12 ++++---- + .../binary/etcdcluster/etcdcluster_test.go | 6 ++-- + .../binary/infrastructure/dependences.go | 8 +++--- + .../binary/infrastructure/infrastructure.go | 12 ++++---- + .../infrastructure/infrastructure_test.go | 4 +-- + .../binary/loadbalance/loadbalance.go | 16 +++++------ + .../binary/network/network.go | 12 ++++---- + pkg/clusterdeployment/clusterdeploy.go | 6 ++-- + pkg/clusterdeployment/clusterdeploy_test.go | 4 +-- + pkg/clusterdeployment/manager/manager.go | 2 +- + pkg/clusterdeployment/runtime/runtime.go | 10 +++---- + pkg/utils/certs/certs.go | 4 +-- + pkg/utils/certs/certs_test.go | 2 +- + pkg/utils/certs/localcerts.go | 2 +- + pkg/utils/endpoint/endpoint.go | 2 +- + pkg/utils/endpoint/endpoint_test.go | 2 +- + pkg/utils/kubectl/kubectl.go | 8 +++--- + pkg/utils/kubectl/taint.go | 4 +-- + pkg/utils/nodemanager/node.go | 6 ++-- + pkg/utils/nodemanager/nodemanager.go | 6 ++-- + pkg/utils/nodemanager/nodemanager_test.go | 6 ++-- + pkg/utils/runner/runner.go | 4 +-- + pkg/utils/task/task.go | 4 +-- + pkg/utils/utils.go | 2 +- + 46 files changed, 172 insertions(+), 172 deletions(-) + +diff --git a/cmd/cleanup.go b/cmd/cleanup.go +index 3d965aa..05b0651 100644 +--- a/cmd/cleanup.go ++++ b/cmd/cleanup.go +@@ -20,8 +20,8 @@ import ( + + "github.com/spf13/cobra" + +- "gitee.com/openeuler/eggo/pkg/api" +- "gitee.com/openeuler/eggo/pkg/clusterdeployment" ++ "isula.org/eggo/pkg/api" ++ "isula.org/eggo/pkg/clusterdeployment" + ) + + func cleanup(ccfg *api.ClusterConfig) error { +diff --git a/cmd/configs.go b/cmd/configs.go +index d52fcb3..1bd3ff4 100644 +--- a/cmd/configs.go ++++ b/cmd/configs.go +@@ -25,9 +25,9 @@ import ( + + "gopkg.in/yaml.v1" + +- "gitee.com/openeuler/eggo/pkg/api" +- "gitee.com/openeuler/eggo/pkg/constants" +- "gitee.com/openeuler/eggo/pkg/utils" ++ "isula.org/eggo/pkg/api" ++ "isula.org/eggo/pkg/constants" ++ "isula.org/eggo/pkg/utils" + "github.com/sirupsen/logrus" + ) + +diff --git a/cmd/deploy.go b/cmd/deploy.go +index a884947..6ee5643 100644 +--- a/cmd/deploy.go ++++ b/cmd/deploy.go +@@ -20,8 +20,8 @@ import ( + + "github.com/spf13/cobra" + +- "gitee.com/openeuler/eggo/pkg/api" +- "gitee.com/openeuler/eggo/pkg/clusterdeployment" ++ "isula.org/eggo/pkg/api" ++ "isula.org/eggo/pkg/clusterdeployment" + ) + + func deploy(ccfg *api.ClusterConfig) error { +diff --git a/cmd/modules.go b/cmd/modules.go +index d13ffa9..d72a712 100644 +--- a/cmd/modules.go ++++ b/cmd/modules.go +@@ -1,5 +1,5 @@ + package main + + import ( +- _ "gitee.com/openeuler/eggo/pkg/clusterdeployment/binary" ++ _ "isula.org/eggo/pkg/clusterdeployment/binary" + ) +diff --git a/go.mod b/go.mod +index 4fb1901..b73b6d0 100644 +--- a/go.mod ++++ b/go.mod +@@ -1,4 +1,4 @@ +-module gitee.com/openeuler/eggo ++module isula.org/eggo + + require ( + github.com/kubesphere/kubekey v1.1.0 +diff --git a/pkg/api/types.go b/pkg/api/types.go +index ebc7196..eddc70c 100644 +--- a/pkg/api/types.go ++++ b/pkg/api/types.go +@@ -19,7 +19,7 @@ import ( + "path/filepath" + "time" + +- "gitee.com/openeuler/eggo/pkg/constants" ++ "isula.org/eggo/pkg/constants" + "github.com/sirupsen/logrus" + ) + +diff --git a/pkg/clusterdeployment/binary/addons/addons.go b/pkg/clusterdeployment/binary/addons/addons.go +index d6c4219..83c0c38 100644 +--- a/pkg/clusterdeployment/binary/addons/addons.go ++++ b/pkg/clusterdeployment/binary/addons/addons.go +@@ -1,6 +1,6 @@ + package addons + +-import "gitee.com/openeuler/eggo/pkg/api" ++import "isula.org/eggo/pkg/api" + + // TODO: support run apply addons in eggo, not run in master + +diff --git a/pkg/clusterdeployment/binary/addons/runner_addons.go b/pkg/clusterdeployment/binary/addons/runner_addons.go +index 5ada8c4..ef1a555 100644 +--- a/pkg/clusterdeployment/binary/addons/runner_addons.go ++++ b/pkg/clusterdeployment/binary/addons/runner_addons.go +@@ -5,12 +5,12 @@ import ( + "path/filepath" + "time" + +- "gitee.com/openeuler/eggo/pkg/api" +- "gitee.com/openeuler/eggo/pkg/constants" +- "gitee.com/openeuler/eggo/pkg/utils/nodemanager" +- "gitee.com/openeuler/eggo/pkg/utils/runner" +- "gitee.com/openeuler/eggo/pkg/utils/task" +- "gitee.com/openeuler/eggo/pkg/utils/template" ++ "isula.org/eggo/pkg/api" ++ "isula.org/eggo/pkg/constants" ++ "isula.org/eggo/pkg/utils/nodemanager" ++ "isula.org/eggo/pkg/utils/runner" ++ "isula.org/eggo/pkg/utils/task" ++ "isula.org/eggo/pkg/utils/template" + "github.com/sirupsen/logrus" + ) + +diff --git a/pkg/clusterdeployment/binary/binary.go b/pkg/clusterdeployment/binary/binary.go +index 2e40c44..c2455fc 100644 +--- a/pkg/clusterdeployment/binary/binary.go ++++ b/pkg/clusterdeployment/binary/binary.go +@@ -17,20 +17,20 @@ package binary + import ( + "sync" + +- "gitee.com/openeuler/eggo/pkg/api" +- "gitee.com/openeuler/eggo/pkg/clusterdeployment/binary/addons" +- "gitee.com/openeuler/eggo/pkg/clusterdeployment/binary/bootstrap" +- "gitee.com/openeuler/eggo/pkg/clusterdeployment/binary/cleanupcluster" +- "gitee.com/openeuler/eggo/pkg/clusterdeployment/binary/controlplane" +- "gitee.com/openeuler/eggo/pkg/clusterdeployment/binary/coredns" +- "gitee.com/openeuler/eggo/pkg/clusterdeployment/binary/etcdcluster" +- "gitee.com/openeuler/eggo/pkg/clusterdeployment/binary/infrastructure" +- "gitee.com/openeuler/eggo/pkg/clusterdeployment/binary/loadbalance" +- "gitee.com/openeuler/eggo/pkg/clusterdeployment/binary/network" +- "gitee.com/openeuler/eggo/pkg/clusterdeployment/manager" +- "gitee.com/openeuler/eggo/pkg/utils/kubectl" +- "gitee.com/openeuler/eggo/pkg/utils/nodemanager" +- "gitee.com/openeuler/eggo/pkg/utils/runner" ++ "isula.org/eggo/pkg/api" ++ "isula.org/eggo/pkg/clusterdeployment/binary/addons" ++ "isula.org/eggo/pkg/clusterdeployment/binary/bootstrap" ++ "isula.org/eggo/pkg/clusterdeployment/binary/cleanupcluster" ++ "isula.org/eggo/pkg/clusterdeployment/binary/controlplane" ++ "isula.org/eggo/pkg/clusterdeployment/binary/coredns" ++ "isula.org/eggo/pkg/clusterdeployment/binary/etcdcluster" ++ "isula.org/eggo/pkg/clusterdeployment/binary/infrastructure" ++ "isula.org/eggo/pkg/clusterdeployment/binary/loadbalance" ++ "isula.org/eggo/pkg/clusterdeployment/binary/network" ++ "isula.org/eggo/pkg/clusterdeployment/manager" ++ "isula.org/eggo/pkg/utils/kubectl" ++ "isula.org/eggo/pkg/utils/nodemanager" ++ "isula.org/eggo/pkg/utils/runner" + + "github.com/sirupsen/logrus" + ) +diff --git a/pkg/clusterdeployment/binary/bootstrap/bootstrap.go b/pkg/clusterdeployment/binary/bootstrap/bootstrap.go +index 148bdec..2295408 100644 +--- a/pkg/clusterdeployment/binary/bootstrap/bootstrap.go ++++ b/pkg/clusterdeployment/binary/bootstrap/bootstrap.go +@@ -23,16 +23,16 @@ import ( + "strings" + "time" + +- "gitee.com/openeuler/eggo/pkg/api" +- "gitee.com/openeuler/eggo/pkg/clusterdeployment/binary/commontools" +- "gitee.com/openeuler/eggo/pkg/clusterdeployment/binary/controlplane" +- "gitee.com/openeuler/eggo/pkg/clusterdeployment/runtime" +- "gitee.com/openeuler/eggo/pkg/constants" +- "gitee.com/openeuler/eggo/pkg/utils/certs" +- "gitee.com/openeuler/eggo/pkg/utils/endpoint" +- "gitee.com/openeuler/eggo/pkg/utils/nodemanager" +- "gitee.com/openeuler/eggo/pkg/utils/runner" +- "gitee.com/openeuler/eggo/pkg/utils/task" ++ "isula.org/eggo/pkg/api" ++ "isula.org/eggo/pkg/clusterdeployment/binary/commontools" ++ "isula.org/eggo/pkg/clusterdeployment/binary/controlplane" ++ "isula.org/eggo/pkg/clusterdeployment/runtime" ++ "isula.org/eggo/pkg/constants" ++ "isula.org/eggo/pkg/utils/certs" ++ "isula.org/eggo/pkg/utils/endpoint" ++ "isula.org/eggo/pkg/utils/nodemanager" ++ "isula.org/eggo/pkg/utils/runner" ++ "isula.org/eggo/pkg/utils/task" + "github.com/sirupsen/logrus" + ) + +diff --git a/pkg/clusterdeployment/binary/bootstrap/bootstrap_test.go b/pkg/clusterdeployment/binary/bootstrap/bootstrap_test.go +index f984da8..60636c2 100644 +--- a/pkg/clusterdeployment/binary/bootstrap/bootstrap_test.go ++++ b/pkg/clusterdeployment/binary/bootstrap/bootstrap_test.go +@@ -19,9 +19,9 @@ import ( + "fmt" + "testing" + +- "gitee.com/openeuler/eggo/pkg/api" +- "gitee.com/openeuler/eggo/pkg/utils/nodemanager" +- "gitee.com/openeuler/eggo/pkg/utils/runner" ++ "isula.org/eggo/pkg/api" ++ "isula.org/eggo/pkg/utils/nodemanager" ++ "isula.org/eggo/pkg/utils/runner" + "github.com/sirupsen/logrus" + ) + +diff --git a/pkg/clusterdeployment/binary/cleanupcluster/cleanupcluster.go b/pkg/clusterdeployment/binary/cleanupcluster/cleanupcluster.go +index 29ad51d..e7d4848 100644 +--- a/pkg/clusterdeployment/binary/cleanupcluster/cleanupcluster.go ++++ b/pkg/clusterdeployment/binary/cleanupcluster/cleanupcluster.go +@@ -23,18 +23,18 @@ import ( + + "github.com/sirupsen/logrus" + +- "gitee.com/openeuler/eggo/pkg/api" +- "gitee.com/openeuler/eggo/pkg/clusterdeployment/binary/addons" +- "gitee.com/openeuler/eggo/pkg/clusterdeployment/binary/coredns" +- "gitee.com/openeuler/eggo/pkg/clusterdeployment/binary/etcdcluster" +- "gitee.com/openeuler/eggo/pkg/clusterdeployment/binary/infrastructure" +- "gitee.com/openeuler/eggo/pkg/clusterdeployment/binary/network" +- "gitee.com/openeuler/eggo/pkg/clusterdeployment/runtime" +- "gitee.com/openeuler/eggo/pkg/constants" +- "gitee.com/openeuler/eggo/pkg/utils" +- "gitee.com/openeuler/eggo/pkg/utils/nodemanager" +- "gitee.com/openeuler/eggo/pkg/utils/runner" +- "gitee.com/openeuler/eggo/pkg/utils/task" ++ "isula.org/eggo/pkg/api" ++ "isula.org/eggo/pkg/clusterdeployment/binary/addons" ++ "isula.org/eggo/pkg/clusterdeployment/binary/coredns" ++ "isula.org/eggo/pkg/clusterdeployment/binary/etcdcluster" ++ "isula.org/eggo/pkg/clusterdeployment/binary/infrastructure" ++ "isula.org/eggo/pkg/clusterdeployment/binary/network" ++ "isula.org/eggo/pkg/clusterdeployment/runtime" ++ "isula.org/eggo/pkg/constants" ++ "isula.org/eggo/pkg/utils" ++ "isula.org/eggo/pkg/utils/nodemanager" ++ "isula.org/eggo/pkg/utils/runner" ++ "isula.org/eggo/pkg/utils/task" + ) + + var ( +diff --git a/pkg/clusterdeployment/binary/cleanupcluster/cleanupcluster_test.go b/pkg/clusterdeployment/binary/cleanupcluster/cleanupcluster_test.go +index 02fc000..d77af3e 100644 +--- a/pkg/clusterdeployment/binary/cleanupcluster/cleanupcluster_test.go ++++ b/pkg/clusterdeployment/binary/cleanupcluster/cleanupcluster_test.go +@@ -21,7 +21,7 @@ import ( + + "github.com/sirupsen/logrus" + +- "gitee.com/openeuler/eggo/pkg/api" ++ "isula.org/eggo/pkg/api" + ) + + const ( +diff --git a/pkg/clusterdeployment/binary/commontools/copycacerts.go b/pkg/clusterdeployment/binary/commontools/copycacerts.go +index 6495b8f..aa778d6 100644 +--- a/pkg/clusterdeployment/binary/commontools/copycacerts.go ++++ b/pkg/clusterdeployment/binary/commontools/copycacerts.go +@@ -19,8 +19,8 @@ import ( + "os" + "path/filepath" + +- "gitee.com/openeuler/eggo/pkg/api" +- "gitee.com/openeuler/eggo/pkg/utils/runner" ++ "isula.org/eggo/pkg/api" ++ "isula.org/eggo/pkg/utils/runner" + "github.com/sirupsen/logrus" + ) + +diff --git a/pkg/clusterdeployment/binary/commontools/systemdservices.go b/pkg/clusterdeployment/binary/commontools/systemdservices.go +index bab55a1..1e6164d 100644 +--- a/pkg/clusterdeployment/binary/commontools/systemdservices.go ++++ b/pkg/clusterdeployment/binary/commontools/systemdservices.go +@@ -18,10 +18,10 @@ import ( + "encoding/base64" + "fmt" + +- "gitee.com/openeuler/eggo/pkg/api" +- "gitee.com/openeuler/eggo/pkg/clusterdeployment/runtime" +- "gitee.com/openeuler/eggo/pkg/utils/runner" +- "gitee.com/openeuler/eggo/pkg/utils/template" ++ "isula.org/eggo/pkg/api" ++ "isula.org/eggo/pkg/clusterdeployment/runtime" ++ "isula.org/eggo/pkg/utils/runner" ++ "isula.org/eggo/pkg/utils/template" + "github.com/sirupsen/logrus" + ) + +diff --git a/pkg/clusterdeployment/binary/commontools/token.go b/pkg/clusterdeployment/binary/commontools/token.go +index f1d4c5d..005efcc 100644 +--- a/pkg/clusterdeployment/binary/commontools/token.go ++++ b/pkg/clusterdeployment/binary/commontools/token.go +@@ -22,9 +22,9 @@ import ( + "text/template" + "time" + +- "gitee.com/openeuler/eggo/pkg/api" +- "gitee.com/openeuler/eggo/pkg/constants" +- "gitee.com/openeuler/eggo/pkg/utils/runner" ++ "isula.org/eggo/pkg/api" ++ "isula.org/eggo/pkg/constants" ++ "isula.org/eggo/pkg/utils/runner" + kkutil "github.com/kubesphere/kubekey/pkg/util" + "github.com/lithammer/dedent" + "github.com/sirupsen/logrus" +diff --git a/pkg/clusterdeployment/binary/controlplane/controlplane.go b/pkg/clusterdeployment/binary/controlplane/controlplane.go +index b8f1ba6..14ddc56 100644 +--- a/pkg/clusterdeployment/binary/controlplane/controlplane.go ++++ b/pkg/clusterdeployment/binary/controlplane/controlplane.go +@@ -26,17 +26,17 @@ import ( + "strings" + "time" + +- "gitee.com/openeuler/eggo/pkg/api" +- "gitee.com/openeuler/eggo/pkg/clusterdeployment/binary/commontools" +- "gitee.com/openeuler/eggo/pkg/clusterdeployment/binary/infrastructure" +- "gitee.com/openeuler/eggo/pkg/constants" +- "gitee.com/openeuler/eggo/pkg/utils" +- "gitee.com/openeuler/eggo/pkg/utils/certs" +- "gitee.com/openeuler/eggo/pkg/utils/endpoint" +- "gitee.com/openeuler/eggo/pkg/utils/nodemanager" +- "gitee.com/openeuler/eggo/pkg/utils/runner" +- "gitee.com/openeuler/eggo/pkg/utils/task" +- "gitee.com/openeuler/eggo/pkg/utils/template" ++ "isula.org/eggo/pkg/api" ++ "isula.org/eggo/pkg/clusterdeployment/binary/commontools" ++ "isula.org/eggo/pkg/clusterdeployment/binary/infrastructure" ++ "isula.org/eggo/pkg/constants" ++ "isula.org/eggo/pkg/utils" ++ "isula.org/eggo/pkg/utils/certs" ++ "isula.org/eggo/pkg/utils/endpoint" ++ "isula.org/eggo/pkg/utils/nodemanager" ++ "isula.org/eggo/pkg/utils/runner" ++ "isula.org/eggo/pkg/utils/task" ++ "isula.org/eggo/pkg/utils/template" + "github.com/sirupsen/logrus" + ) + +diff --git a/pkg/clusterdeployment/binary/controlplane/controlplane_test.go b/pkg/clusterdeployment/binary/controlplane/controlplane_test.go +index c89866a..c2d710c 100644 +--- a/pkg/clusterdeployment/binary/controlplane/controlplane_test.go ++++ b/pkg/clusterdeployment/binary/controlplane/controlplane_test.go +@@ -18,9 +18,9 @@ import ( + "fmt" + "testing" + +- "gitee.com/openeuler/eggo/pkg/api" +- "gitee.com/openeuler/eggo/pkg/utils/nodemanager" +- "gitee.com/openeuler/eggo/pkg/utils/runner" ++ "isula.org/eggo/pkg/api" ++ "isula.org/eggo/pkg/utils/nodemanager" ++ "isula.org/eggo/pkg/utils/runner" + "github.com/sirupsen/logrus" + ) + +diff --git a/pkg/clusterdeployment/binary/coredns/binarycoredns.go b/pkg/clusterdeployment/binary/coredns/binarycoredns.go +index 63aa40d..eb02a18 100644 +--- a/pkg/clusterdeployment/binary/coredns/binarycoredns.go ++++ b/pkg/clusterdeployment/binary/coredns/binarycoredns.go +@@ -21,15 +21,15 @@ import ( + "strings" + "time" + +- "gitee.com/openeuler/eggo/pkg/api" +- "gitee.com/openeuler/eggo/pkg/clusterdeployment/binary/commontools" +- "gitee.com/openeuler/eggo/pkg/constants" +- "gitee.com/openeuler/eggo/pkg/utils" +- "gitee.com/openeuler/eggo/pkg/utils/endpoint" +- "gitee.com/openeuler/eggo/pkg/utils/nodemanager" +- "gitee.com/openeuler/eggo/pkg/utils/runner" +- "gitee.com/openeuler/eggo/pkg/utils/task" +- "gitee.com/openeuler/eggo/pkg/utils/template" ++ "isula.org/eggo/pkg/api" ++ "isula.org/eggo/pkg/clusterdeployment/binary/commontools" ++ "isula.org/eggo/pkg/constants" ++ "isula.org/eggo/pkg/utils" ++ "isula.org/eggo/pkg/utils/endpoint" ++ "isula.org/eggo/pkg/utils/nodemanager" ++ "isula.org/eggo/pkg/utils/runner" ++ "isula.org/eggo/pkg/utils/task" ++ "isula.org/eggo/pkg/utils/template" + "github.com/sirupsen/logrus" + ) + +diff --git a/pkg/clusterdeployment/binary/coredns/coredns.go b/pkg/clusterdeployment/binary/coredns/coredns.go +index 83f57a5..36446ac 100644 +--- a/pkg/clusterdeployment/binary/coredns/coredns.go ++++ b/pkg/clusterdeployment/binary/coredns/coredns.go +@@ -17,7 +17,7 @@ package coredns + import ( + "fmt" + +- "gitee.com/openeuler/eggo/pkg/api" ++ "isula.org/eggo/pkg/api" + ) + + const ( +diff --git a/pkg/clusterdeployment/binary/coredns/podcoredns.go b/pkg/clusterdeployment/binary/coredns/podcoredns.go +index c7d876d..cd7e5cf 100644 +--- a/pkg/clusterdeployment/binary/coredns/podcoredns.go ++++ b/pkg/clusterdeployment/binary/coredns/podcoredns.go +@@ -21,12 +21,12 @@ import ( + "strings" + "time" + +- "gitee.com/openeuler/eggo/pkg/api" +- "gitee.com/openeuler/eggo/pkg/utils/kubectl" +- "gitee.com/openeuler/eggo/pkg/utils/nodemanager" +- "gitee.com/openeuler/eggo/pkg/utils/runner" +- "gitee.com/openeuler/eggo/pkg/utils/task" +- "gitee.com/openeuler/eggo/pkg/utils/template" ++ "isula.org/eggo/pkg/api" ++ "isula.org/eggo/pkg/utils/kubectl" ++ "isula.org/eggo/pkg/utils/nodemanager" ++ "isula.org/eggo/pkg/utils/runner" ++ "isula.org/eggo/pkg/utils/task" ++ "isula.org/eggo/pkg/utils/template" + "github.com/sirupsen/logrus" + ) + +diff --git a/pkg/clusterdeployment/binary/etcdcluster/etcdcerts.go b/pkg/clusterdeployment/binary/etcdcluster/etcdcerts.go +index f986dea..f08f389 100644 +--- a/pkg/clusterdeployment/binary/etcdcluster/etcdcerts.go ++++ b/pkg/clusterdeployment/binary/etcdcluster/etcdcerts.go +@@ -19,10 +19,10 @@ import ( + "crypto/x509" + "path/filepath" + +- "gitee.com/openeuler/eggo/pkg/api" +- "gitee.com/openeuler/eggo/pkg/utils" +- "gitee.com/openeuler/eggo/pkg/utils/certs" +- "gitee.com/openeuler/eggo/pkg/utils/runner" ++ "isula.org/eggo/pkg/api" ++ "isula.org/eggo/pkg/utils" ++ "isula.org/eggo/pkg/utils/certs" ++ "isula.org/eggo/pkg/utils/runner" + ) + + func genEtcdServerCerts(savePath string, hostname string, ip string, cg certs.CertGenerator, +diff --git a/pkg/clusterdeployment/binary/etcdcluster/etcdcluster.go b/pkg/clusterdeployment/binary/etcdcluster/etcdcluster.go +index 6129d4f..0b38128 100644 +--- a/pkg/clusterdeployment/binary/etcdcluster/etcdcluster.go ++++ b/pkg/clusterdeployment/binary/etcdcluster/etcdcluster.go +@@ -22,12 +22,12 @@ import ( + "strings" + "time" + +- "gitee.com/openeuler/eggo/pkg/api" +- "gitee.com/openeuler/eggo/pkg/clusterdeployment/binary/commontools" +- "gitee.com/openeuler/eggo/pkg/utils" +- "gitee.com/openeuler/eggo/pkg/utils/nodemanager" +- "gitee.com/openeuler/eggo/pkg/utils/runner" +- "gitee.com/openeuler/eggo/pkg/utils/task" ++ "isula.org/eggo/pkg/api" ++ "isula.org/eggo/pkg/clusterdeployment/binary/commontools" ++ "isula.org/eggo/pkg/utils" ++ "isula.org/eggo/pkg/utils/nodemanager" ++ "isula.org/eggo/pkg/utils/runner" ++ "isula.org/eggo/pkg/utils/task" + "github.com/sirupsen/logrus" + ) + +diff --git a/pkg/clusterdeployment/binary/etcdcluster/etcdcluster_test.go b/pkg/clusterdeployment/binary/etcdcluster/etcdcluster_test.go +index ace14df..c975e2b 100644 +--- a/pkg/clusterdeployment/binary/etcdcluster/etcdcluster_test.go ++++ b/pkg/clusterdeployment/binary/etcdcluster/etcdcluster_test.go +@@ -23,9 +23,9 @@ import ( + "strings" + "testing" + +- "gitee.com/openeuler/eggo/pkg/api" +- "gitee.com/openeuler/eggo/pkg/utils" +- "gitee.com/openeuler/eggo/pkg/utils/runner" ++ "isula.org/eggo/pkg/api" ++ "isula.org/eggo/pkg/utils" ++ "isula.org/eggo/pkg/utils/runner" + ) + + func TestDeployEtcd(t *testing.T) { +diff --git a/pkg/clusterdeployment/binary/infrastructure/dependences.go b/pkg/clusterdeployment/binary/infrastructure/dependences.go +index 0eb0ee6..742a3ec 100644 +--- a/pkg/clusterdeployment/binary/infrastructure/dependences.go ++++ b/pkg/clusterdeployment/binary/infrastructure/dependences.go +@@ -20,10 +20,10 @@ import ( + "path/filepath" + "strings" + +- "gitee.com/openeuler/eggo/pkg/api" +- "gitee.com/openeuler/eggo/pkg/constants" +- "gitee.com/openeuler/eggo/pkg/utils" +- "gitee.com/openeuler/eggo/pkg/utils/runner" ++ "isula.org/eggo/pkg/api" ++ "isula.org/eggo/pkg/constants" ++ "isula.org/eggo/pkg/utils" ++ "isula.org/eggo/pkg/utils/runner" + "github.com/sirupsen/logrus" + ) + +diff --git a/pkg/clusterdeployment/binary/infrastructure/infrastructure.go b/pkg/clusterdeployment/binary/infrastructure/infrastructure.go +index 46c9629..1608ba3 100644 +--- a/pkg/clusterdeployment/binary/infrastructure/infrastructure.go ++++ b/pkg/clusterdeployment/binary/infrastructure/infrastructure.go +@@ -22,12 +22,12 @@ import ( + "strings" + "time" + +- "gitee.com/openeuler/eggo/pkg/api" +- "gitee.com/openeuler/eggo/pkg/utils" +- "gitee.com/openeuler/eggo/pkg/utils/nodemanager" +- "gitee.com/openeuler/eggo/pkg/utils/runner" +- "gitee.com/openeuler/eggo/pkg/utils/task" +- "gitee.com/openeuler/eggo/pkg/utils/template" ++ "isula.org/eggo/pkg/api" ++ "isula.org/eggo/pkg/utils" ++ "isula.org/eggo/pkg/utils/nodemanager" ++ "isula.org/eggo/pkg/utils/runner" ++ "isula.org/eggo/pkg/utils/task" ++ "isula.org/eggo/pkg/utils/template" + + "github.com/sirupsen/logrus" + ) +diff --git a/pkg/clusterdeployment/binary/infrastructure/infrastructure_test.go b/pkg/clusterdeployment/binary/infrastructure/infrastructure_test.go +index c030293..a362ba6 100644 +--- a/pkg/clusterdeployment/binary/infrastructure/infrastructure_test.go ++++ b/pkg/clusterdeployment/binary/infrastructure/infrastructure_test.go +@@ -18,8 +18,8 @@ package infrastructure + import ( + "testing" + +- "gitee.com/openeuler/eggo/pkg/api" +- "gitee.com/openeuler/eggo/pkg/utils/nodemanager" ++ "isula.org/eggo/pkg/api" ++ "isula.org/eggo/pkg/utils/nodemanager" + "github.com/sirupsen/logrus" + ) + +diff --git a/pkg/clusterdeployment/binary/loadbalance/loadbalance.go b/pkg/clusterdeployment/binary/loadbalance/loadbalance.go +index 392c7cb..12f723f 100644 +--- a/pkg/clusterdeployment/binary/loadbalance/loadbalance.go ++++ b/pkg/clusterdeployment/binary/loadbalance/loadbalance.go +@@ -21,14 +21,14 @@ import ( + "strings" + "time" + +- "gitee.com/openeuler/eggo/pkg/api" +- "gitee.com/openeuler/eggo/pkg/clusterdeployment/binary/commontools" +- "gitee.com/openeuler/eggo/pkg/clusterdeployment/binary/infrastructure" +- "gitee.com/openeuler/eggo/pkg/utils" +- "gitee.com/openeuler/eggo/pkg/utils/nodemanager" +- "gitee.com/openeuler/eggo/pkg/utils/runner" +- "gitee.com/openeuler/eggo/pkg/utils/task" +- "gitee.com/openeuler/eggo/pkg/utils/template" ++ "isula.org/eggo/pkg/api" ++ "isula.org/eggo/pkg/clusterdeployment/binary/commontools" ++ "isula.org/eggo/pkg/clusterdeployment/binary/infrastructure" ++ "isula.org/eggo/pkg/utils" ++ "isula.org/eggo/pkg/utils/nodemanager" ++ "isula.org/eggo/pkg/utils/runner" ++ "isula.org/eggo/pkg/utils/task" ++ "isula.org/eggo/pkg/utils/template" + "github.com/sirupsen/logrus" + ) + +diff --git a/pkg/clusterdeployment/binary/network/network.go b/pkg/clusterdeployment/binary/network/network.go +index a729304..e955b2a 100644 +--- a/pkg/clusterdeployment/binary/network/network.go ++++ b/pkg/clusterdeployment/binary/network/network.go +@@ -19,12 +19,12 @@ import ( + "path/filepath" + "time" + +- "gitee.com/openeuler/eggo/pkg/api" +- "gitee.com/openeuler/eggo/pkg/constants" +- "gitee.com/openeuler/eggo/pkg/utils/kubectl" +- "gitee.com/openeuler/eggo/pkg/utils/nodemanager" +- "gitee.com/openeuler/eggo/pkg/utils/runner" +- "gitee.com/openeuler/eggo/pkg/utils/task" ++ "isula.org/eggo/pkg/api" ++ "isula.org/eggo/pkg/constants" ++ "isula.org/eggo/pkg/utils/kubectl" ++ "isula.org/eggo/pkg/utils/nodemanager" ++ "isula.org/eggo/pkg/utils/runner" ++ "isula.org/eggo/pkg/utils/task" + "github.com/sirupsen/logrus" + ) + +diff --git a/pkg/clusterdeployment/clusterdeploy.go b/pkg/clusterdeployment/clusterdeploy.go +index 79c0741..13045d5 100644 +--- a/pkg/clusterdeployment/clusterdeploy.go ++++ b/pkg/clusterdeployment/clusterdeploy.go +@@ -18,9 +18,9 @@ package clusterdeployment + import ( + "fmt" + +- "gitee.com/openeuler/eggo/pkg/api" +- _ "gitee.com/openeuler/eggo/pkg/clusterdeployment/binary" +- "gitee.com/openeuler/eggo/pkg/clusterdeployment/manager" ++ "isula.org/eggo/pkg/api" ++ _ "isula.org/eggo/pkg/clusterdeployment/binary" ++ "isula.org/eggo/pkg/clusterdeployment/manager" + "github.com/sirupsen/logrus" + ) + +diff --git a/pkg/clusterdeployment/clusterdeploy_test.go b/pkg/clusterdeployment/clusterdeploy_test.go +index cba1670..6f3686d 100644 +--- a/pkg/clusterdeployment/clusterdeploy_test.go ++++ b/pkg/clusterdeployment/clusterdeploy_test.go +@@ -18,8 +18,8 @@ package clusterdeployment + import ( + "testing" + +- "gitee.com/openeuler/eggo/pkg/api" +- "gitee.com/openeuler/eggo/pkg/clusterdeployment/manager" ++ "isula.org/eggo/pkg/api" ++ "isula.org/eggo/pkg/clusterdeployment/manager" + ) + + func TestRegisterControlPlaneDriver(t *testing.T) { +diff --git a/pkg/clusterdeployment/manager/manager.go b/pkg/clusterdeployment/manager/manager.go +index cabd09e..1194525 100644 +--- a/pkg/clusterdeployment/manager/manager.go ++++ b/pkg/clusterdeployment/manager/manager.go +@@ -18,7 +18,7 @@ import ( + "fmt" + "sync" + +- "gitee.com/openeuler/eggo/pkg/api" ++ "isula.org/eggo/pkg/api" + ) + + type ClusterDeploymentCreator func(*api.ClusterConfig) (api.ClusterDeploymentAPI, error) +diff --git a/pkg/clusterdeployment/runtime/runtime.go b/pkg/clusterdeployment/runtime/runtime.go +index d1eb141..83ff599 100644 +--- a/pkg/clusterdeployment/runtime/runtime.go ++++ b/pkg/clusterdeployment/runtime/runtime.go +@@ -6,11 +6,11 @@ import ( + "path/filepath" + "strings" + +- "gitee.com/openeuler/eggo/pkg/api" +- "gitee.com/openeuler/eggo/pkg/clusterdeployment/binary/infrastructure" +- "gitee.com/openeuler/eggo/pkg/constants" +- "gitee.com/openeuler/eggo/pkg/utils/runner" +- "gitee.com/openeuler/eggo/pkg/utils/template" ++ "isula.org/eggo/pkg/api" ++ "isula.org/eggo/pkg/clusterdeployment/binary/infrastructure" ++ "isula.org/eggo/pkg/constants" ++ "isula.org/eggo/pkg/utils/runner" ++ "isula.org/eggo/pkg/utils/template" + "github.com/sirupsen/logrus" + ) + +diff --git a/pkg/utils/certs/certs.go b/pkg/utils/certs/certs.go +index 0083a01..b68c618 100644 +--- a/pkg/utils/certs/certs.go ++++ b/pkg/utils/certs/certs.go +@@ -21,8 +21,8 @@ import ( + "path/filepath" + "strings" + +- "gitee.com/openeuler/eggo/pkg/utils/runner" +- "gitee.com/openeuler/eggo/pkg/utils/template" ++ "isula.org/eggo/pkg/utils/runner" ++ "isula.org/eggo/pkg/utils/template" + "github.com/sirupsen/logrus" + ) + +diff --git a/pkg/utils/certs/certs_test.go b/pkg/utils/certs/certs_test.go +index 0f8649b..7d6c241 100644 +--- a/pkg/utils/certs/certs_test.go ++++ b/pkg/utils/certs/certs_test.go +@@ -7,7 +7,7 @@ import ( + "path/filepath" + "testing" + +- "gitee.com/openeuler/eggo/pkg/constants" ++ "isula.org/eggo/pkg/constants" + ) + + func TestNewLocalCertGenerator(t *testing.T) { +diff --git a/pkg/utils/certs/localcerts.go b/pkg/utils/certs/localcerts.go +index 120cb02..8d56f1d 100644 +--- a/pkg/utils/certs/localcerts.go ++++ b/pkg/utils/certs/localcerts.go +@@ -12,7 +12,7 @@ import ( + "path/filepath" + "time" + +- "gitee.com/openeuler/eggo/pkg/utils/runner" ++ "isula.org/eggo/pkg/utils/runner" + "github.com/pkg/errors" + "github.com/sirupsen/logrus" + "k8s.io/client-go/tools/clientcmd" +diff --git a/pkg/utils/endpoint/endpoint.go b/pkg/utils/endpoint/endpoint.go +index 2a1aa1b..85d932a 100644 +--- a/pkg/utils/endpoint/endpoint.go ++++ b/pkg/utils/endpoint/endpoint.go +@@ -20,7 +20,7 @@ import ( + "net/url" + "strconv" + +- "gitee.com/openeuler/eggo/pkg/api" ++ "isula.org/eggo/pkg/api" + "github.com/sirupsen/logrus" + validation "k8s.io/apimachinery/pkg/util/validation" + ) +diff --git a/pkg/utils/endpoint/endpoint_test.go b/pkg/utils/endpoint/endpoint_test.go +index 26fb13a..e824601 100644 +--- a/pkg/utils/endpoint/endpoint_test.go ++++ b/pkg/utils/endpoint/endpoint_test.go +@@ -3,7 +3,7 @@ package endpoint + import ( + "testing" + +- "gitee.com/openeuler/eggo/pkg/api" ++ "isula.org/eggo/pkg/api" + ) + + func TestGetAPIServerEndpoint(t *testing.T) { +diff --git a/pkg/utils/kubectl/kubectl.go b/pkg/utils/kubectl/kubectl.go +index 9835518..b2d30cc 100644 +--- a/pkg/utils/kubectl/kubectl.go ++++ b/pkg/utils/kubectl/kubectl.go +@@ -19,10 +19,10 @@ import ( + "path/filepath" + "strings" + +- "gitee.com/openeuler/eggo/pkg/api" +- "gitee.com/openeuler/eggo/pkg/constants" +- "gitee.com/openeuler/eggo/pkg/utils/runner" +- "gitee.com/openeuler/eggo/pkg/utils/template" ++ "isula.org/eggo/pkg/api" ++ "isula.org/eggo/pkg/constants" ++ "isula.org/eggo/pkg/utils/runner" ++ "isula.org/eggo/pkg/utils/template" + ) + + var ops map[string]string +diff --git a/pkg/utils/kubectl/taint.go b/pkg/utils/kubectl/taint.go +index 28ed9e2..e8e776b 100644 +--- a/pkg/utils/kubectl/taint.go ++++ b/pkg/utils/kubectl/taint.go +@@ -3,8 +3,8 @@ package kubectl + import ( + "fmt" + +- "gitee.com/openeuler/eggo/pkg/api" +- "gitee.com/openeuler/eggo/pkg/utils/runner" ++ "isula.org/eggo/pkg/api" ++ "isula.org/eggo/pkg/utils/runner" + "github.com/sirupsen/logrus" + ) + +diff --git a/pkg/utils/nodemanager/node.go b/pkg/utils/nodemanager/node.go +index c0772e2..995194d 100644 +--- a/pkg/utils/nodemanager/node.go ++++ b/pkg/utils/nodemanager/node.go +@@ -19,9 +19,9 @@ import ( + "fmt" + "sync" + +- "gitee.com/openeuler/eggo/pkg/api" +- "gitee.com/openeuler/eggo/pkg/utils/runner" +- "gitee.com/openeuler/eggo/pkg/utils/task" ++ "isula.org/eggo/pkg/api" ++ "isula.org/eggo/pkg/utils/runner" ++ "isula.org/eggo/pkg/utils/task" + "github.com/sirupsen/logrus" + ) + +diff --git a/pkg/utils/nodemanager/nodemanager.go b/pkg/utils/nodemanager/nodemanager.go +index 867064a..53dc098 100644 +--- a/pkg/utils/nodemanager/nodemanager.go ++++ b/pkg/utils/nodemanager/nodemanager.go +@@ -21,9 +21,9 @@ import ( + "sync" + "time" + +- "gitee.com/openeuler/eggo/pkg/api" +- "gitee.com/openeuler/eggo/pkg/utils/runner" +- "gitee.com/openeuler/eggo/pkg/utils/task" ++ "isula.org/eggo/pkg/api" ++ "isula.org/eggo/pkg/utils/runner" ++ "isula.org/eggo/pkg/utils/task" + "github.com/sirupsen/logrus" + ) + +diff --git a/pkg/utils/nodemanager/nodemanager_test.go b/pkg/utils/nodemanager/nodemanager_test.go +index 2faf2b4..302ad26 100644 +--- a/pkg/utils/nodemanager/nodemanager_test.go ++++ b/pkg/utils/nodemanager/nodemanager_test.go +@@ -21,9 +21,9 @@ import ( + "testing" + "time" + +- "gitee.com/openeuler/eggo/pkg/api" +- "gitee.com/openeuler/eggo/pkg/utils/runner" +- "gitee.com/openeuler/eggo/pkg/utils/task" ++ "isula.org/eggo/pkg/api" ++ "isula.org/eggo/pkg/utils/runner" ++ "isula.org/eggo/pkg/utils/task" + "github.com/sirupsen/logrus" + ) + +diff --git a/pkg/utils/runner/runner.go b/pkg/utils/runner/runner.go +index 89e59ca..641dbe5 100644 +--- a/pkg/utils/runner/runner.go ++++ b/pkg/utils/runner/runner.go +@@ -26,8 +26,8 @@ import ( + "strings" + "time" + +- "gitee.com/openeuler/eggo/pkg/api" +- "gitee.com/openeuler/eggo/pkg/constants" ++ "isula.org/eggo/pkg/api" ++ "isula.org/eggo/pkg/constants" + kkv1alpha1 "github.com/kubesphere/kubekey/apis/kubekey/v1alpha1" + "github.com/kubesphere/kubekey/pkg/util/ssh" + "github.com/sirupsen/logrus" +diff --git a/pkg/utils/task/task.go b/pkg/utils/task/task.go +index 75e0b79..745e5e4 100644 +--- a/pkg/utils/task/task.go ++++ b/pkg/utils/task/task.go +@@ -19,8 +19,8 @@ import ( + "strings" + "sync" + +- "gitee.com/openeuler/eggo/pkg/api" +- "gitee.com/openeuler/eggo/pkg/utils/runner" ++ "isula.org/eggo/pkg/api" ++ "isula.org/eggo/pkg/utils/runner" + ) + + const ( +diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go +index ca1d8a3..296b918 100644 +--- a/pkg/utils/utils.go ++++ b/pkg/utils/utils.go +@@ -19,7 +19,7 @@ import ( + "os/user" + "strings" + +- "gitee.com/openeuler/eggo/pkg/api" ++ "isula.org/eggo/pkg/api" + ) + + func IsX86Arch(arch string) bool { +-- +2.25.1 + diff --git a/eggo.spec b/eggo.spec new file mode 100644 index 0000000..7461772 --- /dev/null +++ b/eggo.spec @@ -0,0 +1,57 @@ +%global _version 0.9.0 +%global _release 20210712.150722.gitddf3d38e + +Name: eggo +Version: %{_version} +Release: %{_release} +Summary: Eggo is a tool built to provide standard multi-ways for creating Kubernetes clusters. +License: Mulan PSL V2 +URL: https://gitee.com/openeuler/eggo +Source0: https://gitee.com/openeuler/eggo/repository/archive/v%{version}.tar.gz + +Patch1: 0001-mkdir-etcd-work-dir-and-manifest-dir.patch +Patch2: 0002-default-open-ports-for-coredns.patch +Patch3: 0003-change-package-path-to-isula.org.patch + +BuildRequires: make +BuildRequires: git +BuildRequires: golang >= 1.13 + +%description +Eggo is a tool built to provide standard multi-ways for creating Kubernetes clusters. + +%prep +%autosetup -n eggo -Sgit -p1 + +%build +export GO111MODULE=off +rm -f go.mod go.sum +cp -rf vendor src +mkdir -p src/isula.org/eggo +cp -rf api cmd pkg src/isula.org/eggo/ +export GOPATH=$(pwd):$GOPATH +%{make_build} + +%install +rm -rf %{buildroot} +install -d %{buildroot}%{_bindir} +# install binary +install -p ./bin/eggo %{buildroot}%{_bindir}/eggo + +%clean +rm -rf %{buildroot} +rm -rf src + +%post + +%files +# default perm for files and folder +%defattr(0640,root,root,0550) +%attr(551,root,root) %{_bindir}/eggo + +%changelog +* Mon Jul 12 2021 wangfengtu - 0.9.0-20210712.150722.gitddf3d38e +- Type:add +- CVE:NA +- SUG:restart +- DESC:init repo diff --git a/v0.9.0.tar.gz b/v0.9.0.tar.gz new file mode 100644 index 0000000..29298e1 Binary files /dev/null and b/v0.9.0.tar.gz differ