From 9dcb91318ac2c4c36b9aa3c9f6adb80d5b431fde Mon Sep 17 00:00:00 2001 From: Deng Yun Date: Wed, 6 Dec 2023 16:37:36 +0800 Subject: [PATCH] Update githubaction workflow branch Update githubaction workflow branch to v4.1.0 --- .github/workflows/makefile.yml | 6 +++--- pkg/controllers/securitypolicy_controller_test.go | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml index 9e67376b6..061cfa1ba 100644 --- a/.github/workflows/makefile.yml +++ b/.github/workflows/makefile.yml @@ -2,9 +2,9 @@ name: Makefile CI on: push: - branches: [ main ] + branches: [ v4.1.0 ] pull_request: - branches: [ main ] + branches: [ v4.1.0 ] jobs: build: @@ -16,7 +16,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.17 + go-version: 1.19 - name: Run build run: make build diff --git a/pkg/controllers/securitypolicy_controller_test.go b/pkg/controllers/securitypolicy_controller_test.go index 871bedad0..ff61a6c1d 100644 --- a/pkg/controllers/securitypolicy_controller_test.go +++ b/pkg/controllers/securitypolicy_controller_test.go @@ -145,7 +145,6 @@ func TestSecurityPolicyController_isCRRequestedInSystemNamespace(t *testing.T) { req = &ctrl.Request{NamespacedName: types.NamespacedName{Namespace: "sys-ns", Name: "dummy"}} isCRInSysNs, err = r.isCRRequestedInSystemNamespace(&ctx, req) - if err != nil { t.Fatalf(err.Error()) } @@ -209,7 +208,7 @@ func TestSecurityPolicyReconciler_Reconcile(t *testing.T) { assert.Equal(t, err, ret) // DeletionTimestamp.IsZero = false, Finalizers doesn't include util.FinalizerName - k8sClient.EXPECT().Get(ctx, gomock.Any(), sp).Return(nil).Do(func(_ context.Context, _ client.ObjectKey, obj client.Object) error { + k8sClient.EXPECT().Get(ctx, gomock.Any(), sp).Return(nil).Do(func(_ context.Context, _ client.ObjectKey, obj client.Object, option ...client.GetOption) error { v1sp := obj.(*v1alpha1.SecurityPolicy) time := metav1.Now() v1sp.ObjectMeta.DeletionTimestamp = &time @@ -225,7 +224,7 @@ func TestSecurityPolicyReconciler_Reconcile(t *testing.T) { patch.Reset() // DeletionTimestamp.IsZero = false, Finalizers include util.FinalizerName - k8sClient.EXPECT().Get(ctx, gomock.Any(), sp).Return(nil).Do(func(_ context.Context, _ client.ObjectKey, obj client.Object) error { + k8sClient.EXPECT().Get(ctx, gomock.Any(), sp).Return(nil).Do(func(_ context.Context, _ client.ObjectKey, obj client.Object, option ...client.GetOption) error { v1sp := obj.(*v1alpha1.SecurityPolicy) time := metav1.Now() v1sp.ObjectMeta.DeletionTimestamp = &time