Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update githubaction workflow branch #431

Open
wants to merge 1 commit into
base: v4.1.0
Choose a base branch
from
Open

Update githubaction workflow branch #431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/makefile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -16,7 +16,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: 1.17
go-version: 1.19.10

- name: Run build
run: make build
Expand Down
5 changes: 2 additions & 3 deletions pkg/controllers/securitypolicy_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
}
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down