Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

decouple yurtctl with yurtadm #848

Merged
merged 1 commit into from
May 27, 2022
Merged

decouple yurtctl with yurtadm #848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/node-servant/components/yurthub.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ import (
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/klog/v2"

"github.com/openyurtio/openyurt/pkg/util/templates"
enutil "github.com/openyurtio/openyurt/pkg/yurtadm/util/edgenode"
"github.com/openyurtio/openyurt/pkg/yurtadm/util/templates"
"github.com/openyurtio/openyurt/pkg/yurthub/certificate/hubself"
"github.com/openyurtio/openyurt/pkg/yurthub/storage/disk"
"github.com/openyurtio/openyurt/pkg/yurthub/util"
Expand Down
2 changes: 1 addition & 1 deletion pkg/node-servant/job.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"k8s.io/apimachinery/pkg/runtime/serializer"
"k8s.io/client-go/kubernetes/scheme"

tmplutil "github.com/openyurtio/openyurt/pkg/yurtadm/util/templates"
tmplutil "github.com/openyurtio/openyurt/pkg/util/templates"
)

// RenderNodeServantJob return k8s job
Expand Down
0 ...app/apis/kubeadm/bootstraptokenhelpers.go → ...app/apis/kubeadm/bootstraptokenhelpers.go
View file
Open in desktop
File renamed without changes.
0 ...pis/kubeadm/bootstraptokenhelpers_test.go → ...pis/kubeadm/bootstraptokenhelpers_test.go
View file
Open in desktop
File renamed without changes.
0 .../app/apis/kubeadm/bootstraptokenstring.go → .../app/apis/kubeadm/bootstraptokenstring.go
View file
Open in desktop
File renamed without changes.
0 ...ernetes/kubeadm/app/apis/kubeadm/types.go → ...ernetes/kubeadm/app/apis/kubeadm/types.go
View file
Open in desktop
File renamed without changes.
0 ...netes/kubeadm/app/cmd/options/constant.go → ...netes/kubeadm/app/cmd/options/constant.go
View file
Open in desktop
File renamed without changes.
0 .../kubeadm/app/cmd/phases/workflow/phase.go → .../kubeadm/app/cmd/phases/workflow/phase.go
View file
Open in desktop
File renamed without changes.
0 ...kubeadm/app/cmd/phases/workflow/runner.go → ...kubeadm/app/cmd/phases/workflow/runner.go
View file
Open in desktop
File renamed without changes.
0 ...dm/app/cmd/phases/workflow/runner_test.go → ...dm/app/cmd/phases/workflow/runner_test.go
View file
Open in desktop
File renamed without changes.
0 ...rnetes/kubeadm/app/constants/constants.go → ...rnetes/kubeadm/app/constants/constants.go
View file
Open in desktop
File renamed without changes.
0 ...s/kubeadm/app/constants/constants_unix.go → ...s/kubeadm/app/constants/constants_unix.go
View file
Open in desktop
File renamed without changes.
0 ...ubeadm/app/constants/constants_windows.go → ...ubeadm/app/constants/constants_windows.go
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions ...etes/kubeadm/app/discovery/token/token.go → ...etes/kubeadm/app/discovery/token/token.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ import (
bootstrap "k8s.io/cluster-bootstrap/token/jws"
"k8s.io/klog/v2"

kubeadmapi "github.com/openyurtio/openyurt/pkg/util/kubernetes/kubeadm/app/apis/kubeadm"
"github.com/openyurtio/openyurt/pkg/util/kubernetes/kubeadm/app/constants"
kubeconfigutil "github.com/openyurtio/openyurt/pkg/util/kubernetes/kubeadm/app/util/kubeconfig"
"github.com/openyurtio/openyurt/pkg/util/kubernetes/kubeadm/app/util/pubkeypin"
"github.com/openyurtio/openyurt/pkg/yurtadm/cmd/join/joindata"
kubeadmapi "github.com/openyurtio/openyurt/pkg/yurtadm/kubernetes/kubeadm/app/apis/kubeadm"
"github.com/openyurtio/openyurt/pkg/yurtadm/kubernetes/kubeadm/app/constants"
kubeconfigutil "github.com/openyurtio/openyurt/pkg/yurtadm/kubernetes/kubeadm/app/util/kubeconfig"
"github.com/openyurtio/openyurt/pkg/yurtadm/kubernetes/kubeadm/app/util/pubkeypin"
)

// BootstrapUser defines bootstrap user name
Expand Down
2 changes: 1 addition & 1 deletion ...bootstraptoken/clusterinfo/clusterinfo.go → ...bootstraptoken/clusterinfo/clusterinfo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import (
bootstrapapi "k8s.io/cluster-bootstrap/token/api"
"k8s.io/klog/v2"

"github.com/openyurtio/openyurt/pkg/yurtadm/kubernetes/kubeadm/app/util/apiclient"
"github.com/openyurtio/openyurt/pkg/util/kubernetes/kubeadm/app/util/apiclient"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions ...m/app/phases/bootstraptoken/node/token.go → ...m/app/phases/bootstraptoken/node/token.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import (
clientset "k8s.io/client-go/kubernetes"
bootstraputil "k8s.io/cluster-bootstrap/token/util"

kubeadmapi "github.com/openyurtio/openyurt/pkg/yurtadm/kubernetes/kubeadm/app/apis/kubeadm"
"github.com/openyurtio/openyurt/pkg/yurtadm/kubernetes/kubeadm/app/util/apiclient"
kubeadmapi "github.com/openyurtio/openyurt/pkg/util/kubernetes/kubeadm/app/apis/kubeadm"
"github.com/openyurtio/openyurt/pkg/util/kubernetes/kubeadm/app/util/apiclient"
)

// TODO(mattmoyer): Move CreateNewTokens, UpdateOrCreateTokens out of this package to client-go for a generic abstraction and client for a Bootstrap Token
Expand Down
4 changes: 2 additions & 2 deletions ...netes/kubeadm/app/phases/kubelet/flags.go → ...netes/kubeadm/app/phases/kubelet/flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ import (
"k8s.io/klog/v2"

"github.com/openyurtio/openyurt/pkg/projectinfo"
"github.com/openyurtio/openyurt/pkg/util/kubernetes/kubeadm/app/constants"
kubeadmutil "github.com/openyurtio/openyurt/pkg/util/kubernetes/kubeadm/app/util"
"github.com/openyurtio/openyurt/pkg/yurtadm/cmd/join/joindata"
"github.com/openyurtio/openyurt/pkg/yurtadm/kubernetes/kubeadm/app/constants"
kubeadmutil "github.com/openyurtio/openyurt/pkg/yurtadm/kubernetes/kubeadm/app/util"
)

// WriteKubeletDynamicEnvFile writes an environment file with dynamic flags to the kubelet.
Expand Down
0 .../kubeadm/app/phases/kubelet/flags_test.go → .../kubeadm/app/phases/kubelet/flags_test.go
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions .../kubeadm/app/phases/kubelet/flags_unix.go → .../kubeadm/app/phases/kubelet/flags_unix.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ import (
"k8s.io/klog/v2"
utilsexec "k8s.io/utils/exec"

"github.com/openyurtio/openyurt/pkg/util/kubernetes/kubeadm/app/constants"
kubeadmutil "github.com/openyurtio/openyurt/pkg/util/kubernetes/kubeadm/app/util"
"github.com/openyurtio/openyurt/pkg/util/kubernetes/kubeadm/app/util/initsystem"
"github.com/openyurtio/openyurt/pkg/yurtadm/cmd/join/joindata"
"github.com/openyurtio/openyurt/pkg/yurtadm/kubernetes/kubeadm/app/constants"
kubeadmutil "github.com/openyurtio/openyurt/pkg/yurtadm/kubernetes/kubeadm/app/util"
"github.com/openyurtio/openyurt/pkg/yurtadm/kubernetes/kubeadm/app/util/initsystem"
)

// buildKubeletArgMap takes a kubeletFlagsOpts object and builds based on that a string-string map with flags
Expand Down
0 ...beadm/app/phases/kubelet/flags_windows.go → ...beadm/app/phases/kubelet/flags_windows.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...tes/kubeadm/app/phases/kubelet/kubelet.go → ...tes/kubeadm/app/phases/kubelet/kubelet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package kubelet
import (
"fmt"

"github.com/openyurtio/openyurt/pkg/yurtadm/kubernetes/kubeadm/app/util/initsystem"
"github.com/openyurtio/openyurt/pkg/util/kubernetes/kubeadm/app/util/initsystem"
)

// TryStartKubelet attempts to bring up kubelet service
Expand Down
6 changes: 3 additions & 3 deletions ...ubernetes/kubeadm/app/preflight/checks.go → ...ubernetes/kubeadm/app/preflight/checks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ import (
system "k8s.io/system-validators/validators"
utilsexec "k8s.io/utils/exec"

kubeadmconstants "github.com/openyurtio/openyurt/pkg/util/kubernetes/kubeadm/app/constants"
"github.com/openyurtio/openyurt/pkg/util/kubernetes/kubeadm/app/util/initsystem"
utilruntime "github.com/openyurtio/openyurt/pkg/util/kubernetes/kubeadm/app/util/runtime"
"github.com/openyurtio/openyurt/pkg/yurtadm/cmd/join/joindata"
kubeadmconstants "github.com/openyurtio/openyurt/pkg/yurtadm/kubernetes/kubeadm/app/constants"
"github.com/openyurtio/openyurt/pkg/yurtadm/kubernetes/kubeadm/app/util/initsystem"
utilruntime "github.com/openyurtio/openyurt/pkg/yurtadm/kubernetes/kubeadm/app/util/runtime"
)

const (
Expand Down
0 ...etes/kubeadm/app/preflight/checks_unix.go → ...etes/kubeadm/app/preflight/checks_unix.go
View file
Open in desktop
File renamed without changes.
0 ...s/kubeadm/app/preflight/checks_windows.go → ...s/kubeadm/app/preflight/checks_windows.go
View file
Open in desktop
File renamed without changes.
0 ...kubernetes/kubeadm/app/preflight/utils.go → ...kubernetes/kubeadm/app/preflight/utils.go
View file
Open in desktop
File renamed without changes.
0 ...netes/kubeadm/app/preflight/utils_test.go → ...netes/kubeadm/app/preflight/utils_test.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...kubeadm/app/util/apiclient/idempotency.go → ...kubeadm/app/util/apiclient/idempotency.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import (
clientset "k8s.io/client-go/kubernetes"
clientsetretry "k8s.io/client-go/util/retry"

"github.com/openyurtio/openyurt/pkg/yurtadm/kubernetes/kubeadm/app/constants"
"github.com/openyurtio/openyurt/pkg/util/kubernetes/kubeadm/app/constants"
)

// ConfigMapMutator is a function that mutates the given ConfigMap and optionally returns an error
Expand Down
0 ...dm/app/util/apiclient/idempotency_test.go → ...dm/app/util/apiclient/idempotency_test.go
View file
Open in desktop
File renamed without changes.
0 ...eadm/app/util/apiclient/tryidempotency.go → ...eadm/app/util/apiclient/tryidempotency.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...rnetes/kubeadm/app/util/apiclient/wait.go → ...rnetes/kubeadm/app/util/apiclient/wait.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import (
"k8s.io/apimachinery/pkg/util/wait"
clientset "k8s.io/client-go/kubernetes"

kubeadmconstants "github.com/openyurtio/openyurt/pkg/yurtadm/kubernetes/kubeadm/app/constants"
kubeadmconstants "github.com/openyurtio/openyurt/pkg/util/kubernetes/kubeadm/app/constants"
)

// Waiter is an interface for waiting for criteria in Kubernetes to happen
Expand Down
0 .../kubernetes/kubeadm/app/util/arguments.go → .../kubernetes/kubeadm/app/util/arguments.go
View file
Open in desktop
File renamed without changes.
0 ...bernetes/kubeadm/app/util/cgroupdriver.go → ...bernetes/kubeadm/app/util/cgroupdriver.go
View file
Open in desktop
File renamed without changes.
0 ...kubeadm/app/util/initsystem/initsystem.go → ...kubeadm/app/util/initsystem/initsystem.go
View file
Open in desktop
File renamed without changes.
0 ...dm/app/util/initsystem/initsystem_unix.go → ...dm/app/util/initsystem/initsystem_unix.go
View file
Open in desktop
File renamed without changes.
0 ...app/util/initsystem/initsystem_windows.go → ...app/util/initsystem/initsystem_windows.go
View file
Open in desktop
File renamed without changes.
0 ...kubeadm/app/util/kubeconfig/kubeconfig.go → ...kubeadm/app/util/kubeconfig/kubeconfig.go
View file
Open in desktop
File renamed without changes.
0 ...dm/app/util/kubeconfig/kubeconfig_test.go → ...dm/app/util/kubeconfig/kubeconfig_test.go
View file
Open in desktop
File renamed without changes.
0 ...s/kubeadm/app/util/pubkeypin/pubkeypin.go → ...s/kubeadm/app/util/pubkeypin/pubkeypin.go
View file
Open in desktop
File renamed without changes.
0 ...eadm/app/util/pubkeypin/pubkeypin_test.go → ...eadm/app/util/pubkeypin/pubkeypin_test.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...netes/kubeadm/app/util/runtime/runtime.go → ...netes/kubeadm/app/util/runtime/runtime.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
errorsutil "k8s.io/apimachinery/pkg/util/errors"
utilsexec "k8s.io/utils/exec"

"github.com/openyurtio/openyurt/pkg/yurtadm/kubernetes/kubeadm/app/constants"
"github.com/openyurtio/openyurt/pkg/util/kubernetes/kubeadm/app/constants"
)

// ContainerRuntime is an interface for working with container runtimes
Expand Down
2 changes: 1 addition & 1 deletion .../kubeadm/app/util/runtime/runtime_test.go → .../kubeadm/app/util/runtime/runtime_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
"k8s.io/utils/exec"
fakeexec "k8s.io/utils/exec/testing"

"github.com/openyurtio/openyurt/pkg/yurtadm/kubernetes/kubeadm/app/constants"
"github.com/openyurtio/openyurt/pkg/util/kubernetes/kubeadm/app/constants"
)

func TestNewContainerRuntime(t *testing.T) {
Expand Down
0 .../kubeadm/app/util/runtime/runtime_unix.go → .../kubeadm/app/util/runtime/runtime_unix.go
View file
Open in desktop
File renamed without changes.
0 ...beadm/app/util/runtime/runtime_windows.go → ...beadm/app/util/runtime/runtime_windows.go
View file
Open in desktop
File renamed without changes.
0 ...ubernetes/kubelet/apis/config/register.go → ...ubernetes/kubelet/apis/config/register.go
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...etes/kubelet/apis/config/scheme/scheme.go → ...etes/kubelet/apis/config/scheme/scheme.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/serializer"

kubeletconfig "github.com/openyurtio/openyurt/pkg/yurtadm/kubernetes/kubelet/apis/config"
kubeletconfigv1beta1 "github.com/openyurtio/openyurt/pkg/yurtadm/kubernetes/kubelet/apis/config/v1beta1"
kubeletconfig "github.com/openyurtio/openyurt/pkg/util/kubernetes/kubelet/apis/config"
kubeletconfigv1beta1 "github.com/openyurtio/openyurt/pkg/util/kubernetes/kubelet/apis/config/v1beta1"
)

// Utility functions for the Kubelet's kubeletconfig API group
Expand Down
0 ...m/kubernetes/kubelet/apis/config/types.go → ...l/kubernetes/kubelet/apis/config/types.go
View file
Open in desktop
File renamed without changes.
0 ...s/kubelet/apis/config/v1beta1/defaults.go → ...s/kubelet/apis/config/v1beta1/defaults.go
View file
Open in desktop
File renamed without changes.
0 ...let/apis/config/v1beta1/defaults_linux.go → ...let/apis/config/v1beta1/defaults_linux.go
View file
Open in desktop
File renamed without changes.
0 ...et/apis/config/v1beta1/defaults_others.go → ...et/apis/config/v1beta1/defaults_others.go
View file
Open in desktop
File renamed without changes.
0 ...s/kubelet/apis/config/v1beta1/register.go → ...s/kubelet/apis/config/v1beta1/register.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...config/v1beta1/zz_generated.conversion.go → ...config/v1beta1/zz_generated.conversion.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...s/config/v1beta1/zz_generated.deepcopy.go → ...s/config/v1beta1/zz_generated.deepcopy.go
View file
Open in desktop
File renamed without changes.
0 ...s/config/v1beta1/zz_generated.defaults.go → ...s/config/v1beta1/zz_generated.defaults.go
View file
Open in desktop
File renamed without changes.
0 ...elet/apis/config/zz_generated.deepcopy.go → ...elet/apis/config/zz_generated.deepcopy.go
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...kubelet/kubeletconfig/util/codec/codec.go → ...kubelet/kubeletconfig/util/codec/codec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ import (
"k8s.io/klog/v2"
kubeletconfigv1beta1 "k8s.io/kubelet/config/v1beta1"

kubeletconfig "github.com/openyurtio/openyurt/pkg/yurtadm/kubernetes/kubelet/apis/config"
"github.com/openyurtio/openyurt/pkg/yurtadm/kubernetes/kubelet/apis/config/scheme"
kubeletconfig "github.com/openyurtio/openyurt/pkg/util/kubernetes/kubelet/apis/config"
"github.com/openyurtio/openyurt/pkg/util/kubernetes/kubelet/apis/config/scheme"
)

// EncodeKubeletConfig encodes an internal KubeletConfiguration to an external YAML representation.
Expand Down
0 pkg/yurtadm/util/strings/util.go → pkg/util/strings/util.go
View file
Open in desktop
File renamed without changes.
0 pkg/yurtadm/util/templates/util.go → pkg/util/templates/util.go
View file
Open in desktop
File renamed without changes.
10 changes: 5 additions & 5 deletions pkg/yurtadm/cmd/join/join.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@ import (
clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
"k8s.io/klog/v2"

"github.com/openyurtio/openyurt/pkg/util/kubernetes/kubeadm/app/cmd/options"
"github.com/openyurtio/openyurt/pkg/util/kubernetes/kubeadm/app/cmd/phases/workflow"
"github.com/openyurtio/openyurt/pkg/util/kubernetes/kubeadm/app/constants"
"github.com/openyurtio/openyurt/pkg/util/kubernetes/kubeadm/app/discovery/token"
kubeconfigutil "github.com/openyurtio/openyurt/pkg/util/kubernetes/kubeadm/app/util/kubeconfig"
"github.com/openyurtio/openyurt/pkg/yurtadm/cmd/join/joindata"
yurtphase "github.com/openyurtio/openyurt/pkg/yurtadm/cmd/join/phases"
yurtconstants "github.com/openyurtio/openyurt/pkg/yurtadm/constants"
"github.com/openyurtio/openyurt/pkg/yurtadm/kubernetes/kubeadm/app/cmd/options"
"github.com/openyurtio/openyurt/pkg/yurtadm/kubernetes/kubeadm/app/cmd/phases/workflow"
"github.com/openyurtio/openyurt/pkg/yurtadm/kubernetes/kubeadm/app/constants"
"github.com/openyurtio/openyurt/pkg/yurtadm/kubernetes/kubeadm/app/discovery/token"
kubeconfigutil "github.com/openyurtio/openyurt/pkg/yurtadm/kubernetes/kubeadm/app/util/kubeconfig"
yurtadmutil "github.com/openyurtio/openyurt/pkg/yurtadm/util/kubernetes"
)

Expand Down
18 changes: 9 additions & 9 deletions pkg/yurtadm/cmd/join/phases/joinnode.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,18 @@ import (
"k8s.io/klog/v2"
kubeletconfigv1beta1 "k8s.io/kubelet/config/v1beta1"

"github.com/openyurtio/openyurt/pkg/util/kubernetes/kubeadm/app/cmd/options"
"github.com/openyurtio/openyurt/pkg/util/kubernetes/kubeadm/app/cmd/phases/workflow"
"github.com/openyurtio/openyurt/pkg/util/kubernetes/kubeadm/app/constants"
kubeutil "github.com/openyurtio/openyurt/pkg/util/kubernetes/kubeadm/app/phases/kubelet"
"github.com/openyurtio/openyurt/pkg/util/kubernetes/kubeadm/app/util/apiclient"
kubeletconfig "github.com/openyurtio/openyurt/pkg/util/kubernetes/kubelet/apis/config"
kubeletscheme "github.com/openyurtio/openyurt/pkg/util/kubernetes/kubelet/apis/config/scheme"
kubeletcodec "github.com/openyurtio/openyurt/pkg/util/kubernetes/kubelet/kubeletconfig/util/codec"
"github.com/openyurtio/openyurt/pkg/util/templates"
"github.com/openyurtio/openyurt/pkg/yurtadm/cmd/join/joindata"
yurtconstants "github.com/openyurtio/openyurt/pkg/yurtadm/constants"
"github.com/openyurtio/openyurt/pkg/yurtadm/kubernetes/kubeadm/app/cmd/options"
"github.com/openyurtio/openyurt/pkg/yurtadm/kubernetes/kubeadm/app/cmd/phases/workflow"
"github.com/openyurtio/openyurt/pkg/yurtadm/kubernetes/kubeadm/app/constants"
kubeutil "github.com/openyurtio/openyurt/pkg/yurtadm/kubernetes/kubeadm/app/phases/kubelet"
"github.com/openyurtio/openyurt/pkg/yurtadm/kubernetes/kubeadm/app/util/apiclient"
kubeletconfig "github.com/openyurtio/openyurt/pkg/yurtadm/kubernetes/kubelet/apis/config"
kubeletscheme "github.com/openyurtio/openyurt/pkg/yurtadm/kubernetes/kubelet/apis/config/scheme"
kubeletcodec "github.com/openyurtio/openyurt/pkg/yurtadm/kubernetes/kubelet/kubeletconfig/util/codec"
"github.com/openyurtio/openyurt/pkg/yurtadm/util/edgenode"
"github.com/openyurtio/openyurt/pkg/yurtadm/util/templates"
)

// NewEdgeNodePhase creates a yurtadm workflow phase that start kubelet on a edge node.
Expand Down
12 changes: 6 additions & 6 deletions pkg/yurtadm/cmd/join/phases/postcheck.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ import (
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/klog/v2"

"github.com/openyurtio/openyurt/pkg/util/kubernetes/kubeadm/app/cmd/options"
"github.com/openyurtio/openyurt/pkg/util/kubernetes/kubeadm/app/cmd/phases/workflow"
"github.com/openyurtio/openyurt/pkg/util/kubernetes/kubeadm/app/constants"
"github.com/openyurtio/openyurt/pkg/util/kubernetes/kubeadm/app/util/apiclient"
"github.com/openyurtio/openyurt/pkg/util/kubernetes/kubeadm/app/util/initsystem"
"github.com/openyurtio/openyurt/pkg/util/kubernetes/kubeadm/app/util/kubeconfig"
"github.com/openyurtio/openyurt/pkg/yurtadm/cmd/join/joindata"
"github.com/openyurtio/openyurt/pkg/yurtadm/kubernetes/kubeadm/app/cmd/options"
"github.com/openyurtio/openyurt/pkg/yurtadm/kubernetes/kubeadm/app/cmd/phases/workflow"
"github.com/openyurtio/openyurt/pkg/yurtadm/kubernetes/kubeadm/app/constants"
"github.com/openyurtio/openyurt/pkg/yurtadm/kubernetes/kubeadm/app/util/apiclient"
"github.com/openyurtio/openyurt/pkg/yurtadm/kubernetes/kubeadm/app/util/initsystem"
"github.com/openyurtio/openyurt/pkg/yurtadm/kubernetes/kubeadm/app/util/kubeconfig"
"github.com/openyurtio/openyurt/pkg/yurtadm/util/edgenode"
)

Expand Down
6 changes: 3 additions & 3 deletions pkg/yurtadm/cmd/join/phases/preflight.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ import (
"k8s.io/klog/v2"
utilsexec "k8s.io/utils/exec"

"github.com/openyurtio/openyurt/pkg/util/kubernetes/kubeadm/app/cmd/options"
"github.com/openyurtio/openyurt/pkg/util/kubernetes/kubeadm/app/cmd/phases/workflow"
"github.com/openyurtio/openyurt/pkg/util/kubernetes/kubeadm/app/preflight"
"github.com/openyurtio/openyurt/pkg/yurtadm/cmd/join/joindata"
"github.com/openyurtio/openyurt/pkg/yurtadm/kubernetes/kubeadm/app/cmd/options"
"github.com/openyurtio/openyurt/pkg/yurtadm/kubernetes/kubeadm/app/cmd/phases/workflow"
"github.com/openyurtio/openyurt/pkg/yurtadm/kubernetes/kubeadm/app/preflight"
)

// NewPreflightPhase creates a kubeadm workflow phase that implements preflight checks for a new node join
Expand Down
6 changes: 3 additions & 3 deletions pkg/yurtadm/cmd/join/phases/prepare.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ import (

"k8s.io/klog/v2"

"github.com/openyurtio/openyurt/pkg/util/kubernetes/kubeadm/app/cmd/options"
"github.com/openyurtio/openyurt/pkg/util/kubernetes/kubeadm/app/cmd/phases/workflow"
"github.com/openyurtio/openyurt/pkg/util/kubernetes/kubeadm/app/constants"
"github.com/openyurtio/openyurt/pkg/yurtadm/cmd/join/joindata"
"github.com/openyurtio/openyurt/pkg/yurtadm/kubernetes/kubeadm/app/cmd/options"
"github.com/openyurtio/openyurt/pkg/yurtadm/kubernetes/kubeadm/app/cmd/phases/workflow"
"github.com/openyurtio/openyurt/pkg/yurtadm/kubernetes/kubeadm/app/constants"
"github.com/openyurtio/openyurt/pkg/yurtadm/util/kubernetes"
"github.com/openyurtio/openyurt/pkg/yurtadm/util/system"
)
Expand Down
10 changes: 5 additions & 5 deletions pkg/yurtadm/cmd/reset/phases/cleanupnode.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ import (
"k8s.io/klog/v2"
utilsexec "k8s.io/utils/exec"

"github.com/openyurtio/openyurt/pkg/yurtadm/kubernetes/kubeadm/app/cmd/options"
"github.com/openyurtio/openyurt/pkg/yurtadm/kubernetes/kubeadm/app/cmd/phases/workflow"
kubeadmconstants "github.com/openyurtio/openyurt/pkg/yurtadm/kubernetes/kubeadm/app/constants"
kubeutil "github.com/openyurtio/openyurt/pkg/yurtadm/kubernetes/kubeadm/app/phases/kubelet"
utilruntime "github.com/openyurtio/openyurt/pkg/yurtadm/kubernetes/kubeadm/app/util/runtime"
"github.com/openyurtio/openyurt/pkg/util/kubernetes/kubeadm/app/cmd/options"
"github.com/openyurtio/openyurt/pkg/util/kubernetes/kubeadm/app/cmd/phases/workflow"
kubeadmconstants "github.com/openyurtio/openyurt/pkg/util/kubernetes/kubeadm/app/constants"
kubeutil "github.com/openyurtio/openyurt/pkg/util/kubernetes/kubeadm/app/phases/kubelet"
utilruntime "github.com/openyurtio/openyurt/pkg/util/kubernetes/kubeadm/app/util/runtime"
)

// NewCleanupNodePhase creates a kubeadm workflow phase that cleanup the node
Expand Down
2 changes: 1 addition & 1 deletion pkg/yurtadm/cmd/reset/phases/cleanyurtfile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (

"k8s.io/klog/v2"

"github.com/openyurtio/openyurt/pkg/util/kubernetes/kubeadm/app/cmd/phases/workflow"
"github.com/openyurtio/openyurt/pkg/yurtadm/constants"
"github.com/openyurtio/openyurt/pkg/yurtadm/kubernetes/kubeadm/app/cmd/phases/workflow"
"github.com/openyurtio/openyurt/pkg/yurtadm/util/edgenode"
)

Expand Down
6 changes: 3 additions & 3 deletions pkg/yurtadm/cmd/reset/phases/preflight.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ import (

"k8s.io/klog/v2"

"github.com/openyurtio/openyurt/pkg/yurtadm/kubernetes/kubeadm/app/cmd/options"
"github.com/openyurtio/openyurt/pkg/yurtadm/kubernetes/kubeadm/app/cmd/phases/workflow"
"github.com/openyurtio/openyurt/pkg/yurtadm/kubernetes/kubeadm/app/preflight"
"github.com/openyurtio/openyurt/pkg/util/kubernetes/kubeadm/app/cmd/options"
"github.com/openyurtio/openyurt/pkg/util/kubernetes/kubeadm/app/cmd/phases/workflow"
"github.com/openyurtio/openyurt/pkg/util/kubernetes/kubeadm/app/preflight"
)

// NewPreflightPhase creates a kubeadm workflow phase implements preflight checks for reset
Expand Down
6 changes: 3 additions & 3 deletions pkg/yurtadm/cmd/reset/reset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ import (
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/klog/v2"

"github.com/openyurtio/openyurt/pkg/util/kubernetes/kubeadm/app/cmd/options"
"github.com/openyurtio/openyurt/pkg/util/kubernetes/kubeadm/app/cmd/phases/workflow"
utilruntime "github.com/openyurtio/openyurt/pkg/util/kubernetes/kubeadm/app/util/runtime"
yurtphases "github.com/openyurtio/openyurt/pkg/yurtadm/cmd/reset/phases"
"github.com/openyurtio/openyurt/pkg/yurtadm/kubernetes/kubeadm/app/cmd/options"
"github.com/openyurtio/openyurt/pkg/yurtadm/kubernetes/kubeadm/app/cmd/phases/workflow"
utilruntime "github.com/openyurtio/openyurt/pkg/yurtadm/kubernetes/kubeadm/app/util/runtime"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions pkg/yurtadm/cmd/yurtinit/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ import (
flag "github.com/spf13/pflag"
"k8s.io/klog/v2"

strutil "github.com/openyurtio/openyurt/pkg/util/strings"
tmplutil "github.com/openyurtio/openyurt/pkg/util/templates"
"github.com/openyurtio/openyurt/pkg/yurtadm/constants"
"github.com/openyurtio/openyurt/pkg/yurtadm/util"
"github.com/openyurtio/openyurt/pkg/yurtadm/util/edgenode"
strutil "github.com/openyurtio/openyurt/pkg/yurtadm/util/strings"
tmplutil "github.com/openyurtio/openyurt/pkg/yurtadm/util/templates"
)

const (
Expand Down
Loading