From 27ca639b8e2d3f133adb64b23c20a945732b0c0d Mon Sep 17 00:00:00 2001 From: Hidde Beydals Date: Fri, 8 Oct 2021 17:23:19 +0200 Subject: [PATCH 1/2] Update fluxcd/image-reflector-controller to v0.12.0 Signed-off-by: Hidde Beydals --- Makefile | 2 +- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index a63aafef..7b688cc7 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ SOURCE_VER ?= v0.16.0 # Version of the image-reflector-controller from which to get the ImagePolicy CRD. # Change this if you bump the image-reflector-controller/api version in go.mod. -REFLECTOR_VER ?= v0.11.1 +REFLECTOR_VER ?= v0.12.0 # Version of libgit2 the controller should depend on. LIBGIT2_VER ?= 1.1.1 diff --git a/go.mod b/go.mod index 680b4d22..276196bf 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/cyphar/filepath-securejoin v0.2.2 github.com/fluxcd/image-automation-controller/api v0.14.1 // If you bump this, change REFLECTOR_VER in the Makefile to match - github.com/fluxcd/image-reflector-controller/api v0.11.1 + github.com/fluxcd/image-reflector-controller/api v0.12.0 github.com/fluxcd/pkg/apis/meta v0.10.1 github.com/fluxcd/pkg/gittestserver v0.3.1 github.com/fluxcd/pkg/runtime v0.12.1 diff --git a/go.sum b/go.sum index a08bcbd4..dd04dcd5 100644 --- a/go.sum +++ b/go.sum @@ -337,8 +337,8 @@ github.com/evanphx/json-patch v4.11.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQL github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod h1:ZZMPRZwes7CROmyNKgQzC3XPs6L/G2EJLHddWejkmf4= github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/fluxcd/image-reflector-controller/api v0.11.1 h1:8pmUKL7Pise0JOBFgqw7eWtOK/rs3HNibXqCK9aJ8LE= -github.com/fluxcd/image-reflector-controller/api v0.11.1/go.mod h1:lgQHGFz29OHmDU5Jwg689C/M+P/f9ujt6NS0zCLT0BQ= +github.com/fluxcd/image-reflector-controller/api v0.12.0 h1:ghdbOUmbNaPi/jVfNnI3xzvhudXBZx6xUld/OLNSVXM= +github.com/fluxcd/image-reflector-controller/api v0.12.0/go.mod h1:lgQHGFz29OHmDU5Jwg689C/M+P/f9ujt6NS0zCLT0BQ= github.com/fluxcd/pkg/apis/meta v0.10.0/go.mod h1:CW9X9ijMTpNe7BwnokiUOrLl/h13miwVr/3abEQLbKE= github.com/fluxcd/pkg/apis/meta v0.10.1 h1:zISenRlqNG7WK8TP3HxZTvv+1Z7JZOUIQvZrOr6pQ2w= github.com/fluxcd/pkg/apis/meta v0.10.1/go.mod h1:yUblM2vg+X8TE3A2VvJfdhkGmg+uqBlSPkLk7dxi0UM= From 78b565dc903bbb7edd34752c05943f1e5d6f6486 Mon Sep 17 00:00:00 2001 From: Stefan Prodan Date: Fri, 8 Oct 2021 19:05:54 +0300 Subject: [PATCH 2/2] Use NamespacedObjectReference in tests Signed-off-by: Stefan Prodan --- controllers/update_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/controllers/update_test.go b/controllers/update_test.go index 99bbc614..8e546e16 100644 --- a/controllers/update_test.go +++ b/controllers/update_test.go @@ -194,7 +194,7 @@ Images: Namespace: policyKey.Namespace, }, Spec: imagev1_reflect.ImagePolicySpec{ - ImageRepositoryRef: meta.LocalObjectReference{ + ImageRepositoryRef: meta.NamespacedObjectReference{ Name: "not-expected-to-exist", }, Policy: imagev1_reflect.ImagePolicyChoice{ @@ -334,7 +334,7 @@ Images: Namespace: policyKey.Namespace, }, Spec: imagev1_reflect.ImagePolicySpec{ - ImageRepositoryRef: meta.LocalObjectReference{ + ImageRepositoryRef: meta.NamespacedObjectReference{ Name: "not-expected-to-exist", }, Policy: imagev1_reflect.ImagePolicyChoice{ @@ -463,7 +463,7 @@ Images: Namespace: policyKey.Namespace, }, Spec: imagev1_reflect.ImagePolicySpec{ - ImageRepositoryRef: meta.LocalObjectReference{ + ImageRepositoryRef: meta.NamespacedObjectReference{ Name: "not-expected-to-exist", }, Policy: imagev1_reflect.ImagePolicyChoice{ @@ -684,7 +684,7 @@ Images: Namespace: policyKey.Namespace, }, Spec: imagev1_reflect.ImagePolicySpec{ - ImageRepositoryRef: meta.LocalObjectReference{ + ImageRepositoryRef: meta.NamespacedObjectReference{ Name: "not-expected-to-exist", }, Policy: imagev1_reflect.ImagePolicyChoice{