summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cloud/pkg/devicecontroller/manager/common.go2
-rw-r--r--cloud/pkg/edgecontroller/manager/common.go2
-rw-r--r--cloud/pkg/nodeupgradejobcontroller/manager/common.go2
-rw-r--r--edge/cmd/edgemark/hollow_edgecore.go4
-rw-r--r--edge/pkg/edged/config/config.go4
-rw-r--r--edge/pkg/metamanager/metaserver/auth/auth_test.go6
-rw-r--r--keadm/cmd/keadm/app/cmd/config.go7
-rw-r--r--keadm/cmd/keadm/app/cmd/edge/join.go3
-rw-r--r--keadm/cmd/keadm/app/cmd/reset_others.go4
-rw-r--r--pkg/apis/componentconfig/edgecore/v1alpha2/default_kubelet_configuration.go2
-rw-r--r--pkg/apis/componentconfig/edgecore/v1alpha2/types.go14
11 files changed, 32 insertions, 18 deletions
diff --git a/cloud/pkg/devicecontroller/manager/common.go b/cloud/pkg/devicecontroller/manager/common.go
index 95969a30b..3954a0704 100644
--- a/cloud/pkg/devicecontroller/manager/common.go
+++ b/cloud/pkg/devicecontroller/manager/common.go
@@ -26,7 +26,7 @@ func (c *CommonResourceEventHandler) obj2Event(t watch.EventType, obj interface{
}
// OnAdd handle Add event
-func (c *CommonResourceEventHandler) OnAdd(obj interface{}) {
+func (c *CommonResourceEventHandler) OnAdd(obj interface{}, isInInitialList bool) {
c.obj2Event(watch.Added, obj)
}
diff --git a/cloud/pkg/edgecontroller/manager/common.go b/cloud/pkg/edgecontroller/manager/common.go
index 01628c720..b20f84dd5 100644
--- a/cloud/pkg/edgecontroller/manager/common.go
+++ b/cloud/pkg/edgecontroller/manager/common.go
@@ -36,7 +36,7 @@ func (c *CommonResourceEventHandler) obj2Event(t watch.EventType, obj interface{
}
// OnAdd handle Add event
-func (c *CommonResourceEventHandler) OnAdd(obj interface{}) {
+func (c *CommonResourceEventHandler) OnAdd(obj interface{}, isInInitialList bool) {
if c.eventFilter != nil && !c.eventFilter.Create(obj) {
return
}
diff --git a/cloud/pkg/nodeupgradejobcontroller/manager/common.go b/cloud/pkg/nodeupgradejobcontroller/manager/common.go
index 522b5ce51..6e8008abf 100644
--- a/cloud/pkg/nodeupgradejobcontroller/manager/common.go
+++ b/cloud/pkg/nodeupgradejobcontroller/manager/common.go
@@ -42,7 +42,7 @@ func (c *CommonResourceEventHandler) obj2Event(t watch.EventType, obj interface{
}
// OnAdd handle Add event
-func (c *CommonResourceEventHandler) OnAdd(obj interface{}) {
+func (c *CommonResourceEventHandler) OnAdd(obj interface{}, isInInitialList bool) {
c.obj2Event(watch.Added, obj)
}
diff --git a/edge/cmd/edgemark/hollow_edgecore.go b/edge/cmd/edgemark/hollow_edgecore.go
index 7420f95ff..fa5dbde1f 100644
--- a/edge/cmd/edgemark/hollow_edgecore.go
+++ b/edge/cmd/edgemark/hollow_edgecore.go
@@ -37,7 +37,6 @@ import (
containertest "k8s.io/kubernetes/pkg/kubelet/container/testing"
"k8s.io/kubernetes/pkg/kubelet/cri/remote"
fakeremote "k8s.io/kubernetes/pkg/kubelet/cri/remote/fake"
- kubetypes "k8s.io/kubernetes/pkg/kubelet/types"
"k8s.io/kubernetes/pkg/util/oom"
"k8s.io/kubernetes/pkg/volume"
"k8s.io/kubernetes/pkg/volume/configmap"
@@ -52,6 +51,7 @@ import (
"k8s.io/mount-utils"
"github.com/kubeedge/beehive/pkg/core"
+ "github.com/kubeedge/kubeedge/common/constants"
"github.com/kubeedge/kubeedge/edge/pkg/common/dbm"
"github.com/kubeedge/kubeedge/edge/pkg/edged"
"github.com/kubeedge/kubeedge/edge/pkg/edgehub"
@@ -150,7 +150,7 @@ func EdgeCoreConfig(config *hollowEdgeNodeConfig) *v1alpha2.EdgeCoreConfig {
edgeCoreConfig.Modules.Edged.NodeLabels = config.NodeLabels
edgeCoreConfig.Modules.Edged.TailoredKubeletConfig.RegisterNode = &trueFlag
edgeCoreConfig.Modules.Edged.TailoredKubeletConfig.CgroupsPerQOS = &falseFlag
- edgeCoreConfig.Modules.Edged.ContainerRuntime = kubetypes.RemoteContainerRuntime
+ edgeCoreConfig.Modules.Edged.ContainerRuntime = constants.DefaultRuntimeType
edgeCoreConfig.Modules.Edged.TailoredKubeletConfig.EnableControllerAttachDetach = &falseFlag
edgeCoreConfig.Modules.Edged.TailoredKubeletConfig.ProtectKernelDefaults = false
diff --git a/edge/pkg/edged/config/config.go b/edge/pkg/edged/config/config.go
index 7d217dbae..26fad60d2 100644
--- a/edge/pkg/edged/config/config.go
+++ b/edge/pkg/edged/config/config.go
@@ -173,15 +173,12 @@ func ConvertConfigEdgedFlagToConfigKubeletFlag(in *v1alpha2.TailoredKubeletFlag,
out.HostnameOverride = in.HostnameOverride
out.NodeIP = in.NodeIP
out.RootDirectory = in.RootDirectory
- out.RemoteRuntimeEndpoint = in.RemoteRuntimeEndpoint
- out.RemoteImageEndpoint = in.RemoteImageEndpoint
out.ExperimentalMounterPath = in.ExperimentalMounterPath
out.ExperimentalNodeAllocatableIgnoreEvictionThreshold = in.ExperimentalNodeAllocatableIgnoreEvictionThreshold
out.NodeLabels = in.NodeLabels
out.MinimumGCAge = in.MinimumGCAge
out.MaxPerPodContainerCount = in.MaxPerPodContainerCount
out.MaxContainerCount = in.MaxContainerCount
- out.MasterServiceNamespace = in.MasterServiceNamespace
out.RegisterSchedulable = in.RegisterSchedulable
out.KeepTerminatedPodVolumes = in.KeepTerminatedPodVolumes
out.SeccompDefault = in.SeccompDefault
@@ -190,7 +187,6 @@ func ConvertConfigEdgedFlagToConfigKubeletFlag(in *v1alpha2.TailoredKubeletFlag,
// out.WindowsService = in.WindowsService
// container-runtime-specific options
- out.ContainerRuntime = in.ContainerRuntime
out.RuntimeCgroups = in.RuntimeCgroups
out.PodSandboxImage = in.PodSandboxImage
}
diff --git a/edge/pkg/metamanager/metaserver/auth/auth_test.go b/edge/pkg/metamanager/metaserver/auth/auth_test.go
index 5d6eea0ca..0e3db307a 100644
--- a/edge/pkg/metamanager/metaserver/auth/auth_test.go
+++ b/edge/pkg/metamanager/metaserver/auth/auth_test.go
@@ -365,9 +365,13 @@ func TestTokenGenerateAndValidate(t *testing.T) {
ormerMock.EXPECT().QueryTable(gomock.Any()).Return(querySeterMock).Times(1)
}
auds := authenticator.Audiences{"api"}
+ serviceaccountValidator, err := serviceaccount.NewLegacyValidator(tc.Client != nil, client.NewGetterFromClient(tc.Client), tc.Client.CoreV1())
+ if err != nil {
+ t.Errorf("%s: Expected err=nil, , got %v", k, err)
+ }
authn := JWTTokenAuthenticator(nil,
[]string{serviceaccount.LegacyIssuer, "bar"}, tc.Keys, auds,
- serviceaccount.NewLegacyValidator(tc.Client != nil, client.NewGetterFromClient(tc.Client), nil))
+ serviceaccountValidator)
// An invalid, non-JWT token should always fail
ctx := authenticator.WithAudiences(context.Background(), auds)
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
}
diff --git a/pkg/apis/componentconfig/edgecore/v1alpha2/default_kubelet_configuration.go b/pkg/apis/componentconfig/edgecore/v1alpha2/default_kubelet_configuration.go
index ce382c6b6..11bf0eb55 100644
--- a/pkg/apis/componentconfig/edgecore/v1alpha2/default_kubelet_configuration.go
+++ b/pkg/apis/componentconfig/edgecore/v1alpha2/default_kubelet_configuration.go
@@ -100,4 +100,6 @@ func SetDefaultsKubeletConfiguration(obj *TailoredKubeletConfiguration) {
obj.CPUCFSQuota = utilpointer.Bool(DefaultCPUCFSQuota)
// Add static pod default path
obj.StaticPodPath = constants.DefaultManifestsDir
+ obj.ContainerRuntimeEndpoint = constants.DefaultRemoteRuntimeEndpoint
+ obj.ImageServiceEndpoint = constants.DefaultRemoteImageEndpoint
}
diff --git a/pkg/apis/componentconfig/edgecore/v1alpha2/types.go b/pkg/apis/componentconfig/edgecore/v1alpha2/types.go
index 377d0cddc..10083a981 100644
--- a/pkg/apis/componentconfig/edgecore/v1alpha2/types.go
+++ b/pkg/apis/componentconfig/edgecore/v1alpha2/types.go
@@ -701,6 +701,17 @@ type TailoredKubeletConfiguration struct {
// Default: "/etc/kubeedge/manifests"
// +optional
StaticPodPath string `json:"staticPodPath,omitempty"`
+ // ContainerRuntimeEndpoint is the endpoint of container runtime.
+ // Unix Domain Sockets are supported on Linux, while npipe and tcp endpoints are supported on Windows.
+ // Examples:'unix:///path/to/runtime.sock', 'npipe:////./pipe/runtime'
+ ContainerRuntimeEndpoint string `json:"containerRuntimeEndpoint"`
+
+ // ImageServiceEndpoint is the endpoint of container image service.
+ // Unix Domain Socket are supported on Linux, while npipe and tcp endpoints are supported on Windows.
+ // Examples:'unix:///path/to/runtime.sock', 'npipe:////./pipe/runtime'.
+ // If not specified, the value in containerRuntimeEndpoint is used.
+ // +optional
+ ImageServiceEndpoint string `json:"imageServiceEndpoint,omitempty"`
}
// TailoredKubeletFlag indicates the tailored kubelet flag
@@ -738,9 +749,11 @@ type TailoredKubeletFlag struct {
WindowsPriorityClass string `json:"windowsPriorityClass,omitempty"`
// remoteRuntimeEndpoint is the endpoint of remote runtime service
// default "unix:///run/containerd/containerd.sock"
+ // DEPRECATED and will be remove in KubeEdge v1.17
RemoteRuntimeEndpoint string `json:"remoteRuntimeEndpoint,omitempty"`
// remoteImageEndpoint is the endpoint of remote image service
// default "unix:///run/containerd/containerd.sock"
+ // DEPRECATED and will be remove in KubeEdge v1.17
RemoteImageEndpoint string `json:"remoteImageEndpoint,omitempty"`
// experimentalMounterPath is the path of mounter binary. Leave empty to use the default mount path
ExperimentalMounterPath string `json:"experimentalMounterPath,omitempty"`
@@ -780,6 +793,7 @@ type ContainerRuntimeOptions struct {
// ContainerRuntime is the container runtime to use.
// only valid value "remote"
+ // ContainerRuntime is deprecated and will be removed at v1.17
ContainerRuntime string `json:"containerRuntime,omitempty"`
// RuntimeCgroups that container runtime is expected to be isolated in.
RuntimeCgroups string `json:"runtimeCgroups,omitempty"`
generated by cgit v1.2.3 (git 2.52.0) at 2026-08-20 02:03:41 +0000