Skip to content

Commit 5ad283c

Browse files
committed
Update dependencies
Update controller packages to Kubernetes 1.26 Signed-off-by: Stefan Prodan <[email protected]>
1 parent 36a692c commit 5ad283c

File tree

3 files changed

+123
-267
lines changed

3 files changed

+123
-267
lines changed

Dockerfile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,12 @@ COPY controllers/ controllers/
2727
ENV CGO_ENABLED=0
2828
RUN xx-go build -a -o source-watcher main.go
2929

30-
FROM alpine:3.16
30+
FROM alpine:3.17
3131

3232
RUN apk add --no-cache ca-certificates tini
3333

3434
COPY --from=builder /workspace/source-watcher /usr/local/bin/
3535

36-
# Create minimal nsswitch.conf file to prioritize the usage of /etc/hosts over DNS queries.
37-
# https://github.com/gliderlabs/docker-alpine/issues/367#issuecomment-354316460
38-
RUN [ ! -e /etc/nsswitch.conf ] && echo 'hosts: files dns' > /etc/nsswitch.conf
39-
4036
RUN addgroup -S controller && adduser -S controller -G controller
4137

4238
USER controller

go.mod

Lines changed: 35 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -3,78 +3,75 @@ module github.com/fluxcd/source-watcher
33
go 1.18
44

55
require (
6-
github.com/fluxcd/pkg/http/fetch v0.2.0
7-
github.com/fluxcd/pkg/runtime v0.22.0
6+
github.com/fluxcd/pkg/http/fetch v0.3.0
7+
github.com/fluxcd/pkg/runtime v0.27.0
88
github.com/fluxcd/pkg/tar v0.2.0
9-
github.com/fluxcd/source-controller/api v0.31.0
9+
github.com/fluxcd/source-controller/api v0.34.0
1010
github.com/spf13/pflag v1.0.5
11-
k8s.io/apimachinery v0.25.3
12-
k8s.io/client-go v0.25.3
13-
sigs.k8s.io/controller-runtime v0.13.0
11+
k8s.io/apimachinery v0.26.1
12+
k8s.io/client-go v0.26.1
13+
sigs.k8s.io/controller-runtime v0.14.2
1414
)
1515

1616
require (
17-
cloud.google.com/go v0.97.0 // indirect
18-
github.com/PuerkitoBio/purell v1.1.1 // indirect
19-
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
2017
github.com/beorn7/perks v1.0.1 // indirect
2118
github.com/cespare/xxhash/v2 v2.1.2 // indirect
2219
github.com/cyphar/filepath-securejoin v0.2.3 // indirect
2320
github.com/davecgh/go-spew v1.1.1 // indirect
24-
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
21+
github.com/emicklei/go-restful/v3 v3.10.0 // indirect
2522
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
2623
github.com/fluxcd/pkg/apis/acl v0.1.0 // indirect
27-
github.com/fluxcd/pkg/apis/meta v0.17.0 // indirect
28-
github.com/fsnotify/fsnotify v1.5.4 // indirect
24+
github.com/fluxcd/pkg/apis/meta v0.19.0 // indirect
25+
github.com/fsnotify/fsnotify v1.6.0 // indirect
2926
github.com/go-logr/logr v1.2.3 // indirect
3027
github.com/go-logr/zapr v1.2.3 // indirect
3128
github.com/go-openapi/jsonpointer v0.19.5 // indirect
32-
github.com/go-openapi/jsonreference v0.19.5 // indirect
33-
github.com/go-openapi/swag v0.19.14 // indirect
29+
github.com/go-openapi/jsonreference v0.20.0 // indirect
30+
github.com/go-openapi/swag v0.22.3 // indirect
3431
github.com/gogo/protobuf v1.3.2 // indirect
3532
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
3633
github.com/golang/protobuf v1.5.2 // indirect
37-
github.com/google/gnostic v0.5.7-v3refs // indirect
34+
github.com/google/gnostic v0.6.9 // indirect
3835
github.com/google/go-cmp v0.5.9 // indirect
3936
github.com/google/gofuzz v1.2.0 // indirect
4037
github.com/google/uuid v1.3.0 // indirect
41-
github.com/hashicorp/go-cleanhttp v0.5.1 // indirect
42-
github.com/hashicorp/go-retryablehttp v0.7.1 // indirect
43-
github.com/imdario/mergo v0.3.12 // indirect
38+
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
39+
github.com/hashicorp/go-retryablehttp v0.7.2 // indirect
40+
github.com/imdario/mergo v0.3.13 // indirect
4441
github.com/josharian/intern v1.0.0 // indirect
4542
github.com/json-iterator/go v1.1.12 // indirect
46-
github.com/mailru/easyjson v0.7.6 // indirect
47-
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
43+
github.com/mailru/easyjson v0.7.7 // indirect
44+
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
4845
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4946
github.com/modern-go/reflect2 v1.0.2 // indirect
5047
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
5148
github.com/pkg/errors v0.9.1 // indirect
52-
github.com/prometheus/client_golang v1.13.0 // indirect
53-
github.com/prometheus/client_model v0.2.0 // indirect
49+
github.com/prometheus/client_golang v1.14.0 // indirect
50+
github.com/prometheus/client_model v0.3.0 // indirect
5451
github.com/prometheus/common v0.37.0 // indirect
5552
github.com/prometheus/procfs v0.8.0 // indirect
56-
go.uber.org/atomic v1.7.0 // indirect
57-
go.uber.org/multierr v1.6.0 // indirect
58-
go.uber.org/zap v1.23.0 // indirect
59-
golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
60-
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
61-
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
62-
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
63-
golang.org/x/text v0.3.7 // indirect
64-
golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
53+
go.uber.org/atomic v1.10.0 // indirect
54+
go.uber.org/multierr v1.8.0 // indirect
55+
go.uber.org/zap v1.24.0 // indirect
56+
golang.org/x/net v0.5.0 // indirect
57+
golang.org/x/oauth2 v0.2.0 // indirect
58+
golang.org/x/sys v0.4.0 // indirect
59+
golang.org/x/term v0.4.0 // indirect
60+
golang.org/x/text v0.6.0 // indirect
61+
golang.org/x/time v0.3.0 // indirect
6562
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
6663
google.golang.org/appengine v1.6.7 // indirect
6764
google.golang.org/protobuf v1.28.1 // indirect
6865
gopkg.in/inf.v0 v0.9.1 // indirect
6966
gopkg.in/yaml.v2 v2.4.0 // indirect
7067
gopkg.in/yaml.v3 v3.0.1 // indirect
71-
k8s.io/api v0.25.3 // indirect
72-
k8s.io/apiextensions-apiserver v0.25.0 // indirect
73-
k8s.io/component-base v0.25.2 // indirect
74-
k8s.io/klog/v2 v2.80.1 // indirect
75-
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
76-
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect
77-
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
68+
k8s.io/api v0.26.1 // indirect
69+
k8s.io/apiextensions-apiserver v0.26.1 // indirect
70+
k8s.io/component-base v0.26.1 // indirect
71+
k8s.io/klog/v2 v2.90.0 // indirect
72+
k8s.io/kube-openapi v0.0.0-20221110221610-a28e98eb7c70 // indirect
73+
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 // indirect
74+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
7875
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
7976
sigs.k8s.io/yaml v1.3.0 // indirect
8077
)

0 commit comments

Comments
 (0)