Skip to content

Commit 6b4e4a8

Browse files
committed
Update flux pkg components
Signed-off-by: Aurel Canciu <aurelcanciu@gmail.com>
1 parent 62aea40 commit 6b4e4a8

File tree

6 files changed

+443
-214
lines changed

6 files changed

+443
-214
lines changed

Dockerfile

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
ARG XX_VERSION=1.0.0-rc.2
1+
ARG GO_VERSION=1.17
2+
ARG XX_VERSION=1.1.0
23

34
FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx
45

56
# Docker buildkit multi-arch build requires golang alpine
6-
FROM --platform=$BUILDPLATFORM golang:1.17-alpine as builder
7+
FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-alpine as builder
78

89
# Copy the build utilities.
910
COPY --from=xx / /
@@ -31,7 +32,7 @@ COPY internal/ internal/
3132
ENV CGO_ENABLED=0
3233
RUN xx-go build -a -o helm-controller main.go
3334

34-
FROM alpine:3.14
35+
FROM alpine:3.15
3536

3637
# link repo to the GitHub Container Registry image
3738
LABEL org.opencontainers.image.source="https://github.com/fluxcd/helm-controller"

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ docker-push:
105105
CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
106106
.PHONY: controller-gen
107107
controller-gen: ## Download controller-gen locally if necessary.
108-
$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.5.0)
108+
$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.7.0)
109109

110110
# Find or download gen-crd-api-reference-docs
111111
gen-crd-api-reference-docs:

api/go.mod

+17-16
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,28 @@ module github.com/fluxcd/helm-controller/api
33
go 1.17
44

55
require (
6-
github.com/fluxcd/pkg/apis/kustomize v0.3.0
7-
github.com/fluxcd/pkg/apis/meta v0.10.1
8-
github.com/fluxcd/pkg/runtime v0.12.2
9-
k8s.io/apiextensions-apiserver v0.22.2
10-
k8s.io/apimachinery v0.22.2
11-
sigs.k8s.io/controller-runtime v0.10.2
6+
github.com/fluxcd/pkg/apis/kustomize v0.3.1
7+
github.com/fluxcd/pkg/apis/meta v0.10.2
8+
github.com/fluxcd/pkg/runtime v0.12.3
9+
k8s.io/apiextensions-apiserver v0.23.1
10+
k8s.io/apimachinery v0.23.1
11+
sigs.k8s.io/controller-runtime v0.11.0
1212
)
1313

1414
require (
15-
github.com/go-logr/logr v0.4.0 // indirect
15+
github.com/go-logr/logr v1.2.2 // indirect
1616
github.com/gogo/protobuf v1.3.2 // indirect
17-
github.com/google/go-cmp v0.5.5 // indirect
18-
github.com/google/gofuzz v1.1.0 // indirect
19-
github.com/json-iterator/go v1.1.11 // indirect
17+
github.com/google/go-cmp v0.5.6 // indirect
18+
github.com/google/gofuzz v1.2.0 // indirect
19+
github.com/json-iterator/go v1.1.12 // indirect
2020
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
21-
github.com/modern-go/reflect2 v1.0.1 // indirect
22-
golang.org/x/net v0.0.0-20210520170846-37e1c6afe023 // indirect
23-
golang.org/x/text v0.3.6 // indirect
21+
github.com/modern-go/reflect2 v1.0.2 // indirect
22+
golang.org/x/net v0.0.0-20211215060638-4ddde0e984e9 // indirect
23+
golang.org/x/text v0.3.7 // indirect
2424
gopkg.in/inf.v0 v0.9.1 // indirect
2525
gopkg.in/yaml.v2 v2.4.0 // indirect
26-
k8s.io/klog/v2 v2.9.0 // indirect
27-
k8s.io/utils v0.0.0-20210722164352-7f3ee0f31471 // indirect
28-
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
26+
k8s.io/klog/v2 v2.30.0 // indirect
27+
k8s.io/utils v0.0.0-20211208161948-7d6a63dca704 // indirect
28+
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
29+
sigs.k8s.io/structured-merge-diff/v4 v4.2.0 // indirect
2930
)

0 commit comments

Comments
 (0)