Merge pull request #248 from fluxcd/go-v1.17

Update Go to v1.17

Author: stefanprodan

.github/actions/run-tests/Dockerfile

@@ -1,6 +1,6 @@
 ARG BASE_VARIANT=bullseye
-ARG GO_VERSION=1.16.8
-ARG XX_VERSION=1.0.0-rc.2
+ARG GO_VERSION=1.17
+ARG XX_VERSION=1.1.0
 
 ARG LIBGIT2_IMG=ghcr.io/fluxcd/golang-with-libgit2
 ARG LIBGIT2_TAG=libgit2-1.1.1-1

Dockerfile

@@ -1,6 +1,6 @@
 ARG BASE_VARIANT=bullseye
-ARG GO_VERSION=1.16.8
-ARG XX_VERSION=1.0.0-rc.2
+ARG GO_VERSION=1.17
+ARG XX_VERSION=1.1.0
 
 ARG LIBGIT2_IMG=ghcr.io/fluxcd/golang-with-libgit2
 ARG LIBGIT2_TAG=libgit2-1.1.1-1
@@ -9,7 +9,6 @@ FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx
 FROM ${LIBGIT2_IMG}:${LIBGIT2_TAG} as libgit2
 
 FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-${BASE_VARIANT} as gostable
-FROM --platform=$BUILDPLATFORM golang:1.17rc1-${BASE_VARIANT} AS golatest
 
 FROM gostable AS go-linux
 

Makefile

@@ -21,11 +21,11 @@ CACHE := cache
 
 # Version of the source-controller from which to get the GitRepository CRD.
 # Change this if you bump the source-controller/api version in go.mod.
-SOURCE_VER ?= v0.19.0
+SOURCE_VER ?= v0.20.1
 
 # 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.14.0
+REFLECTOR_VER ?= v0.15.0
 
 # Version of libgit2 the controller should depend on.
 LIBGIT2_VERSION ?= 1.1.1
@@ -203,7 +203,7 @@ ifeq (, $(shell which controller-gen))
 	CONTROLLER_GEN_TMP_DIR=$$(mktemp -d) ;\
 	cd $$CONTROLLER_GEN_TMP_DIR ;\
 	go mod init tmp ;\
-	go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.5.0 ;\
+	go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.7.0 ;\
 	rm -rf $$CONTROLLER_GEN_TMP_DIR ;\
 	}
 CONTROLLER_GEN=$(GOBIN)/controller-gen

api/go.mod

@@ -1,10 +1,29 @@
 module github.com/fluxcd/image-automation-controller/api
 
-go 1.16
+go 1.17
 
 require (
-	github.com/fluxcd/pkg/apis/meta v0.10.1
-	github.com/fluxcd/source-controller/api v0.19.0
-	k8s.io/apimachinery v0.22.2
-	sigs.k8s.io/controller-runtime v0.10.2
+	github.com/fluxcd/pkg/apis/meta v0.10.2
+	github.com/fluxcd/source-controller/api v0.20.1
+	k8s.io/apimachinery v0.23.1
+	sigs.k8s.io/controller-runtime v0.11.0
+)
+
+require (
+	github.com/fluxcd/pkg/apis/acl v0.0.3 // indirect
+	github.com/go-logr/logr v1.2.2 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/google/go-cmp v0.5.6 // indirect
+	github.com/google/gofuzz v1.2.0 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	golang.org/x/net v0.0.0-20211215060638-4ddde0e984e9 // indirect
+	golang.org/x/text v0.3.7 // indirect
+	gopkg.in/inf.v0 v0.9.1 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	k8s.io/klog/v2 v2.30.0 // indirect
+	k8s.io/utils v0.0.0-20211208161948-7d6a63dca704 // indirect
+	sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.2.0 // indirect
 )

api/go.sum

@@ -102,7 +102,7 @@ type ImageUpdateAutomationReconcilerOptions struct {
 // +kubebuilder:rbac:groups=source.toolkit.fluxcd.io,resources=gitrepositories,verbs=get;list;watch
 
 func (r *ImageUpdateAutomationReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
-	log := logr.FromContext(ctx)
+	log := ctrl.LoggerFrom(ctx)
 	debuglog := log.V(logger.DebugLevel)
 	tracelog := log.V(logger.TraceLevel)
 	now := time.Now()
@@ -736,12 +736,12 @@ func (r *ImageUpdateAutomationReconciler) event(ctx context.Context, auto imagev
 	if r.ExternalEventRecorder != nil {
 		objRef, err := reference.GetReference(r.Scheme, &auto)
 		if err != nil {
-			logr.FromContext(ctx).Error(err, "unable to send event")
+			ctrl.LoggerFrom(ctx).Error(err, "unable to send event")
 			return
 		}
 
 		if err := r.ExternalEventRecorder.Eventf(*objRef, nil, severity, severity, msg); err != nil {
-			logr.FromContext(ctx).Error(err, "unable to send event")
+			ctrl.LoggerFrom(ctx).Error(err, "unable to send event")
 			return
 		}
 	}
@@ -754,7 +754,7 @@ func (r *ImageUpdateAutomationReconciler) recordReadinessMetric(ctx context.Cont
 
 	objRef, err := reference.GetReference(r.Scheme, auto)
 	if err != nil {
-		logr.FromContext(ctx).Error(err, "unable to record readiness metric")
+		ctrl.LoggerFrom(ctx).Error(err, "unable to record readiness metric")
 		return
 	}
 	if rc := apimeta.FindStatusCondition(auto.Status.Conditions, meta.ReadyCondition); rc != nil {
@@ -779,7 +779,7 @@ func (r *ImageUpdateAutomationReconciler) recordSuspension(ctx context.Context,
 	if r.MetricsRecorder == nil {
 		return
 	}
-	log := logr.FromContext(ctx)
+	log := ctrl.LoggerFrom(ctx)
 
 	objRef, err := reference.GetReference(r.Scheme, &auto)
 	if err != nil {