903 lines
32 KiB
Diff
903 lines
32 KiB
Diff
|
|
From ec855ff2b21b7ea40b70437c59590b8f08879c46 Mon Sep 17 00:00:00 2001
|
||
|
|
From: haozi007 <liuhao27@huawei.com>
|
||
|
|
Date: Thu, 24 Jun 2021 14:23:25 +0800
|
||
|
|
Subject: [PATCH 03/14] change package path to isula.org
|
||
|
|
|
||
|
|
Signed-off-by: haozi007 <liuhao27@huawei.com>
|
||
|
|
---
|
||
|
|
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
|
||
|
|
|