Merge pull request #183 from fluxcd/update-deps

.github/actions/run-tests/Dockerfile

@@ -1,8 +1,8 @@
-FROM golang:1.15-alpine
+FROM golang:1.16-alpine
 
 # Add any build or testing essential system packages
 RUN apk add --no-cache build-base git pkgconf
-RUN apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/community libgit2-dev~=1.1
+RUN apk add --no-cache libgit2-dev~=1.1
 RUN apk add --no-cache curl
 
 # Use the GitHub Actions uid:gid combination for proper fs permissions

CONTRIBUTING.md

@@ -30,7 +30,7 @@ meeting](https://docs.google.com/document/d/1l_M0om0qUEN_NNiGgpqJ2tvsF2iioHkaARD
 ### How to run the test suite
 
 Prerequisites:
-* go >= 1.15
+* go >= 1.16
 * kubebuilder >= 2.3
 * kustomize >= 3.1
 

Dockerfile

@@ -1,8 +1,7 @@
-FROM golang:1.15-alpine as builder
+FROM golang:1.16-alpine as builder
 
 # These are so as to be able to build with libgit2
-RUN apk add gcc pkgconfig libc-dev
-RUN apk add --no-cache musl~=1.2 libgit2-dev~=1.1
+RUN apk add --no-cache gcc pkgconfig libc-dev musl~=1.2 libgit2-dev~=1.1
 
 WORKDIR /workspace
 # Copy the Go Modules manifests

Makefile

@@ -5,11 +5,11 @@ CRD_OPTIONS ?= crd:crdVersions=v1
 
 # 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.13.2
+SOURCE_VER ?= v0.14.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.9.1
+REFLECTOR_VER ?= v0.10.0
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))
@@ -118,7 +118,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.4.1 ;\
+	go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.5.0 ;\
 	rm -rf $$CONTROLLER_GEN_TMP_DIR ;\
 	}
 CONTROLLER_GEN=$(GOBIN)/controller-gen
@@ -134,7 +134,7 @@ ifeq (, $(shell which gen-crd-api-reference-docs))
 	API_REF_GEN_TMP_DIR=$$(mktemp -d) ;\
 	cd $$API_REF_GEN_TMP_DIR ;\
 	go mod init tmp ;\
-	go get github.com/ahmetb/gen-crd-api-reference-docs@v0.2.0 ;\
+	go get github.com/ahmetb/gen-crd-api-reference-docs@v0.3.0 ;\
 	rm -rf $$API_REF_GEN_TMP_DIR ;\
 	}
 API_REF_GEN=$(GOBIN)/gen-crd-api-reference-docs

api/go.mod

@@ -1,10 +1,10 @@
 module github.com/fluxcd/image-automation-controller/api
 
-go 1.15
+go 1.16
 
 require (
-	github.com/fluxcd/pkg/apis/meta v0.9.0
-	github.com/fluxcd/source-controller/api v0.13.2
-	k8s.io/apimachinery v0.20.4
-	sigs.k8s.io/controller-runtime v0.8.3
+	github.com/fluxcd/pkg/apis/meta v0.10.0
+	github.com/fluxcd/source-controller/api v0.14.0
+	k8s.io/apimachinery v0.21.1
+	sigs.k8s.io/controller-runtime v0.9.0
 )

api/v1alpha2/groupversion_info.go

@@ -14,9 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// Package v1alpha2 contains API Schema definitions for the image v1alpha2 API group
-//+kubebuilder:object:generate=true
-//+groupName=image.toolkit.fluxcd.io
 package v1alpha2
 
 import (

go.mod

@@ -1,6 +1,6 @@
 module github.com/fluxcd/image-automation-controller
 
-go 1.15
+go 1.16
 
 replace github.com/fluxcd/image-automation-controller/api => ./api
 
@@ -9,34 +9,31 @@ require (
 	github.com/cyphar/filepath-securejoin v0.2.2
 	github.com/fluxcd/image-automation-controller/api v0.11.0
 	// If you bump this, change REFLECTOR_VER in the Makefile to match
-	github.com/fluxcd/image-reflector-controller/api v0.9.1
-	github.com/fluxcd/pkg/apis/meta v0.9.0
-	github.com/fluxcd/pkg/gittestserver v0.2.1
-	github.com/fluxcd/pkg/runtime v0.11.0
-	github.com/fluxcd/pkg/ssh v0.0.5
+	github.com/fluxcd/image-reflector-controller/api v0.10.0
+	github.com/fluxcd/pkg/apis/meta v0.10.0
+	github.com/fluxcd/pkg/gittestserver v0.3.0
+	github.com/fluxcd/pkg/runtime v0.12.0
+	github.com/fluxcd/pkg/ssh v0.1.0
 	// If you bump this, change SOURCE_VER in the Makefile to match
-	github.com/fluxcd/source-controller v0.13.2
-	github.com/fluxcd/source-controller/api v0.13.2
+	github.com/fluxcd/source-controller v0.14.0
+	github.com/fluxcd/source-controller/api v0.14.0
 	github.com/go-git/go-billy/v5 v5.3.1
 	github.com/go-git/go-git/v5 v5.4.2
 	github.com/go-logr/logr v0.4.0
 	github.com/google/go-containerregistry v0.1.1
 	github.com/libgit2/git2go/v31 v31.4.14
-	github.com/onsi/ginkgo v1.14.1
-	github.com/onsi/gomega v1.10.2
+	github.com/onsi/ginkgo v1.16.4
+	github.com/onsi/gomega v1.13.0
 	github.com/otiai10/copy v1.2.0
 	github.com/spf13/pflag v1.0.5
-	k8s.io/api v0.20.4
-	k8s.io/apimachinery v0.20.4
-	k8s.io/client-go v0.20.4
+	k8s.io/api v0.21.1
+	k8s.io/apimachinery v0.21.1
+	k8s.io/client-go v0.21.1
 	k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e
-	sigs.k8s.io/controller-runtime v0.8.3
+	sigs.k8s.io/controller-runtime v0.9.0
 	sigs.k8s.io/kustomize/kyaml v0.10.21
 )
 
 // side-effect of depending on source-controller
-// required by https://github.com/helm/helm/blob/v3.5.2/go.mod
-replace (
-	github.com/docker/distribution => github.com/docker/distribution v0.0.0-20191216044856-a8371794149d
-	github.com/docker/docker => github.com/moby/moby v17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible
-)
+// required by https://github.com/helm/helm/blob/v3.6.0/go.mod
+replace github.com/docker/distribution => github.com/docker/distribution v0.0.0-20191216044856-a8371794149d