summaryrefslogtreecommitdiff
path: root/edge
diff options
context:
space:
mode:
Diffstat (limited to 'edge')
-rw-r--r--edge/cmd/edgemark/hollow_edgecore.go4
-rw-r--r--edge/pkg/edged/config/config.go11
-rw-r--r--edge/pkg/edged/edged.go2
-rw-r--r--edge/pkg/metamanager/metaserver/auth/auth_test.go6
-rw-r--r--edge/pkg/metamanager/metaserver/auth/claims_test.go11
5 files changed, 20 insertions, 14 deletions
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..41137d755 100644
--- a/edge/pkg/edged/config/config.go
+++ b/edge/pkg/edged/config/config.go
@@ -32,7 +32,7 @@ func InitConfigure(e *v1alpha2.Edged) {
})
}
-func ConvertEdgedKubeletConfigurationToConfigKubeletConfiguration(in *v1alpha2.TailoredKubeletConfiguration, out *kubeletconfig.KubeletConfiguration, s conversion.Scope) error {
+func ConvertEdgedKubeletConfigurationToConfigKubeletConfiguration(in *v1alpha2.TailoredKubeletConfiguration, inFlag *v1alpha2.TailoredKubeletFlag, out *kubeletconfig.KubeletConfiguration, s conversion.Scope) error {
out.StaticPodPath = in.StaticPodPath
out.SyncFrequency = in.SyncFrequency
out.Address = in.Address
@@ -166,6 +166,11 @@ func ConvertEdgedKubeletConfigurationToConfigKubeletConfiguration(in *v1alpha2.T
if err := v1.Convert_Pointer_bool_To_bool(&in.RegisterNode, &out.RegisterNode, s); err != nil {
return err
}
+ if in.ContainerRuntimeEndpoint == "" {
+ out.ContainerRuntimeEndpoint = inFlag.RemoteRuntimeEndpoint
+ }
+ out.ContainerRuntimeEndpoint = in.ContainerRuntimeEndpoint
+ out.ImageServiceEndpoint = in.ImageServiceEndpoint
return nil
}
@@ -173,15 +178,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 +192,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/edged/edged.go b/edge/pkg/edged/edged.go
index 66e477b72..68cc00a42 100644
--- a/edge/pkg/edged/edged.go
+++ b/edge/pkg/edged/edged.go
@@ -154,7 +154,7 @@ func newEdged(enable bool, nodeName, namespace string) (*edged, error) {
var kubeletConfig kubeletconfig.KubeletConfiguration
var kubeletFlags kubeletoptions.KubeletFlags
- err = edgedconfig.ConvertEdgedKubeletConfigurationToConfigKubeletConfiguration(edgedconfig.Config.TailoredKubeletConfig, &kubeletConfig, nil)
+ err = edgedconfig.ConvertEdgedKubeletConfigurationToConfigKubeletConfiguration(edgedconfig.Config.TailoredKubeletConfig, &edgedconfig.Config.TailoredKubeletFlag, &kubeletConfig, nil)
if err != nil {
klog.ErrorS(err, "Failed to convert kubelet config")
return nil, fmt.Errorf("failed to construct kubelet configuration")
diff --git a/edge/pkg/metamanager/metaserver/auth/auth_test.go b/edge/pkg/metamanager/metaserver/auth/auth_test.go
index 5d6eea0ca..9dbe33522 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), fake.NewSimpleClientset(rsaSecret).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/edge/pkg/metamanager/metaserver/auth/claims_test.go b/edge/pkg/metamanager/metaserver/auth/claims_test.go
index 55ed76309..64eb37fff 100644
--- a/edge/pkg/metamanager/metaserver/auth/claims_test.go
+++ b/edge/pkg/metamanager/metaserver/auth/claims_test.go
@@ -83,14 +83,14 @@ func TestValidatePrivateClaims(t *testing.T) {
name: "expired",
getter: fakeGetter{serviceAccount, nil, nil},
private: &privateClaims{Kubernetes: kubernetes{Svcacct: ref{Name: "saname", UID: "sauid"}, Namespace: "ns"}},
- expiry: jwt.NewNumericDate(now().Add(-1_000 * time.Hour)),
+ expiry: *jwt.NewNumericDate(now().Add(-1_000 * time.Hour)),
expectErr: "service account token has expired",
},
{
name: "not yet valid",
getter: fakeGetter{serviceAccount, nil, nil},
private: &privateClaims{Kubernetes: kubernetes{Svcacct: ref{Name: "saname", UID: "sauid"}, Namespace: "ns"}},
- notBefore: jwt.NewNumericDate(now().Add(1_000 * time.Hour)),
+ notBefore: *jwt.NewNumericDate(now().Add(1_000 * time.Hour)),
expectErr: "service account token is not valid yet",
},
{
@@ -173,10 +173,11 @@ func TestValidatePrivateClaims(t *testing.T) {
t.Run(tc.name, func(t *testing.T) {
v := &validator{tc.getter}
expiry := jwt.NumericDate(nowUnix)
- if tc.expiry != 0 {
- expiry = tc.expiry
+ tcExpiry := tc.expiry
+ if tcExpiry != 0 {
+ expiry = tcExpiry
}
- _, err := v.Validate(context.Background(), "", &jwt.Claims{Expiry: expiry, NotBefore: tc.notBefore}, tc.private)
+ _, err := v.Validate(context.Background(), "", &jwt.Claims{Expiry: &expiry, NotBefore: &tc.notBefore}, tc.private)
if len(tc.expectErr) > 0 {
if errStr := errString(err); tc.expectErr != errStr {
t.Fatalf("expected error %q but got %q", tc.expectErr, errStr)
generated by cgit v1.2.3 (git 2.52.0) at 2026-08-20 01:13:20 +0000