modification for controller-runtime 0.15.3

Signed-off-by: Shelley-BaoYue <baoyue2@huawei.com>

4 files changed, 14 insertions, 8 deletions

diff --git a/edge/pkg/edged/config/config.go b/edge/pkg/edged/config/config.go
index 26fad60d2..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
 }
 
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 0e3db307a..9dbe33522 100644
--- a/edge/pkg/metamanager/metaserver/auth/auth_test.go
+++ b/edge/pkg/metamanager/metaserver/auth/auth_test.go
@@ -365,7 +365,7 @@ 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())
+		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)
 		}
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)