Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright Contributors to the Open Cluster Management project

# Stage 1: Use image builder to build the target binaries
FROM registry.ci.openshift.org/stolostron/builder:go1.23-linux AS builder
FROM registry.ci.openshift.org/stolostron/builder:go1.24-linux AS builder

ENV COMPONENT=config-policy-controller
ENV REPO_PATH=/go/src/github.com/open-cluster-management/${COMPONENT}
Expand Down
3 changes: 1 addition & 2 deletions controllers/configurationpolicy_controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
package controllers

import (
"context"
"fmt"
"reflect"
"sync"
Expand Down Expand Up @@ -72,7 +71,7 @@ func TestReconcile(t *testing.T) {
},
}

res, err := r.Reconcile(context.TODO(), req)
res, err := r.Reconcile(t.Context(), req)
if err != nil {
t.Fatalf("reconcile: (%v)", err)
}
Expand Down
7 changes: 3 additions & 4 deletions controllers/encryption_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
package controllers

import (
"context"
"crypto/rand"
"testing"

Expand Down Expand Up @@ -75,7 +74,7 @@ func TestGetEncryptionConfig(t *testing.T) {

policy := getEmptyPolicy()

config, err := r.getEncryptionConfig(context.TODO(), &policy)
config, err := r.getEncryptionConfig(t.Context(), &policy)
Expect(err).ToNot(HaveOccurred())
Expect(config).ToNot(BeNil())
Expect(config.AESKey).ToNot(BeNil())
Expand All @@ -100,7 +99,7 @@ func TestGetEncryptionConfigInvalidIV(t *testing.T) {
},
}

_, err := r.getEncryptionConfig(context.TODO(), &policy)
_, err := r.getEncryptionConfig(t.Context(), &policy)
Expect(err.Error()).To(
Equal(
"the policy annotation of \"policy.open-cluster-management.io/encryption-iv\" is not Base64: illegal " +
Expand All @@ -117,7 +116,7 @@ func TestGetEncryptionConfigNoSecret(t *testing.T) {

policy := getEmptyPolicy()

_, err := r.getEncryptionConfig(context.TODO(), &policy)
_, err := r.getEncryptionConfig(t.Context(), &policy)
Expect(err.Error()).To(
Equal(
`failed to get the encryption key from Secret local-cluster/policy-encryption-key: secrets ` +
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module open-cluster-management.io/config-policy-controller

go 1.23.0
go 1.24.0

require (
github.com/Masterminds/sprig/v3 v3.2.3
Expand Down
Loading