Update flux pkg components

Signed-off-by: Aurel Canciu <[email protected]>

Dockerfile

@@ -1,9 +1,10 @@
-ARG XX_VERSION=1.0.0-rc.2
+ARG GO_VERSION=1.17
+ARG XX_VERSION=1.1.0
 
 FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx
 
 # Docker buildkit multi-arch build requires golang alpine
-FROM --platform=$BUILDPLATFORM golang:1.17-alpine as builder
+FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-alpine as builder
 
 # Copy the build utilities.
 COPY --from=xx / /
@@ -31,7 +32,7 @@ COPY internal/ internal/
 ENV CGO_ENABLED=0
 RUN xx-go build -a -o helm-controller main.go
 
-FROM alpine:3.14
+FROM alpine:3.15
 
 # link repo to the GitHub Container Registry image
 LABEL org.opencontainers.image.source="https:/fluxcd/helm-controller"

Makefile

@@ -105,7 +105,7 @@ docker-push:
 CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
 .PHONY: controller-gen
 controller-gen: ## Download controller-gen locally if necessary.
- $(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.5.0)
+ $(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.7.0)
 
 # Find or download gen-crd-api-reference-docs
 gen-crd-api-reference-docs:

api/go.mod

@@ -3,27 +3,28 @@ module github.com/fluxcd/helm-controller/api
 go 1.17
 
 require (
- github.com/fluxcd/pkg/apis/kustomize v0.3.0
- github.com/fluxcd/pkg/apis/meta v0.10.1
- github.com/fluxcd/pkg/runtime v0.12.2
- k8s.io/apiextensions-apiserver v0.22.2
- k8s.io/apimachinery v0.22.2
- sigs.k8s.io/controller-runtime v0.10.2
+ github.com/fluxcd/pkg/apis/kustomize v0.3.1
+ github.com/fluxcd/pkg/apis/meta v0.10.2
+ github.com/fluxcd/pkg/runtime v0.12.3
+ k8s.io/apiextensions-apiserver v0.23.1
+ k8s.io/apimachinery v0.23.1
+ sigs.k8s.io/controller-runtime v0.11.0
 )
 
 require (
- github.com/go-logr/logr v0.4.0 // 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.5 // indirect
- github.com/google/gofuzz v1.1.0 // indirect
- github.com/json-iterator/go v1.1.11 // 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.1 // indirect
- golang.org/x/net v0.0.0-20210520170846-37e1c6afe023 // indirect
- golang.org/x/text v0.3.6 // 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.9.0 // indirect
- k8s.io/utils v0.0.0-20210722164352-7f3ee0f31471 // indirect
- sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // 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-20211020170558-c049b76a60c6 // indirect
+ sigs.k8s.io/structured-merge-diff/v4 v4.2.0 // indirect
 )