diff options
| author | Shelley-BaoYue <baoyue2@huawei.com> | 2023-11-15 09:48:13 +0800 |
|---|---|---|
| committer | Shelley-BaoYue <baoyue2@huawei.com> | 2023-11-20 14:15:51 +0800 |
| commit | cc0337d336a85aa9be1aa5a6917f00e7213e5af0 (patch) | |
| tree | 7fac11f5c04a3608c413cd49355c0d06f548feca /keadm | |
| parent | bump helm to v1.12.3 (diff) | |
| download | kubeedge-cc0337d336a85aa9be1aa5a6917f00e7213e5af0.tar.gz | |
modification for kubernetes v1.27.7
Signed-off-by: Shelley-BaoYue <baoyue2@huawei.com>
Diffstat (limited to 'keadm')
| -rw-r--r-- | keadm/cmd/keadm/app/cmd/config.go | 7 | ||||
| -rw-r--r-- | keadm/cmd/keadm/app/cmd/edge/join.go | 3 | ||||
| -rw-r--r-- | keadm/cmd/keadm/app/cmd/reset_others.go | 4 |
3 files changed, 6 insertions, 8 deletions
diff --git a/keadm/cmd/keadm/app/cmd/config.go b/keadm/cmd/keadm/app/cmd/config.go index 5d97726e0..02e1806fd 100644 --- a/keadm/cmd/keadm/app/cmd/config.go +++ b/keadm/cmd/keadm/app/cmd/config.go @@ -18,14 +18,13 @@ package cmd import ( "fmt" + "github.com/kubeedge/kubeedge/common/constants" "strings" - "github.com/spf13/cobra" - kubetypes "k8s.io/kubernetes/pkg/kubelet/types" - cmdcommon "github.com/kubeedge/kubeedge/keadm/cmd/keadm/app/cmd/common" "github.com/kubeedge/kubeedge/keadm/cmd/keadm/app/cmd/util" "github.com/kubeedge/kubeedge/pkg/image" + "github.com/spf13/cobra" ) // Configuration represent keadm config options @@ -45,7 +44,7 @@ func newDefaultConfiguration() *Configuration { return &Configuration{ ImageRepository: "kubeedge", Part: "", - RuntimeType: kubetypes.RemoteContainerRuntime, + RuntimeType: constants.DefaultRuntimeType, } } diff --git a/keadm/cmd/keadm/app/cmd/edge/join.go b/keadm/cmd/keadm/app/cmd/edge/join.go index 08eb8c4dd..373683501 100644 --- a/keadm/cmd/keadm/app/cmd/edge/join.go +++ b/keadm/cmd/keadm/app/cmd/edge/join.go @@ -22,7 +22,6 @@ import ( "strings" "github.com/spf13/cobra" - kubetypes "k8s.io/kubernetes/pkg/kubelet/types" "github.com/kubeedge/kubeedge/common/constants" "github.com/kubeedge/kubeedge/keadm/cmd/keadm/app/cmd/common" @@ -108,7 +107,7 @@ func newOption() *common.JoinOptions { joinOptions.WithMQTT = true joinOptions.CGroupDriver = v1alpha2.CGroupDriverCGroupFS joinOptions.CertPath = common.DefaultCertPath - joinOptions.RuntimeType = kubetypes.RemoteContainerRuntime + joinOptions.RuntimeType = constants.DefaultRuntimeType joinOptions.RemoteRuntimeEndpoint = constants.DefaultRemoteRuntimeEndpoint return joinOptions } diff --git a/keadm/cmd/keadm/app/cmd/reset_others.go b/keadm/cmd/keadm/app/cmd/reset_others.go index c6d50c583..cc444a36a 100644 --- a/keadm/cmd/keadm/app/cmd/reset_others.go +++ b/keadm/cmd/keadm/app/cmd/reset_others.go @@ -21,6 +21,7 @@ package cmd import ( "bufio" "fmt" + "github.com/kubeedge/kubeedge/common/constants" "os" "strings" "time" @@ -28,7 +29,6 @@ import ( "github.com/spf13/cobra" phases "k8s.io/kubernetes/cmd/kubeadm/app/cmd/phases/reset" utilruntime "k8s.io/kubernetes/cmd/kubeadm/app/util/runtime" - kubetypes "k8s.io/kubernetes/pkg/kubelet/types" utilsexec "k8s.io/utils/exec" "github.com/kubeedge/kubeedge/keadm/cmd/keadm/app/cmd/common" @@ -54,7 +54,7 @@ keadm reset func newResetOptions() *common.ResetOptions { opts := &common.ResetOptions{} opts.Kubeconfig = common.DefaultKubeConfig - opts.RuntimeType = kubetypes.RemoteContainerRuntime + opts.RuntimeType = constants.DefaultRuntimeType return opts } |