Skip to content

Commit 2f67f33

Browse files
darkowlzzdarkowlzz
committed
Update dependencies
- Update controller-gen to v0.11.1 and re-generate the CRDs. - Update controller-runtime to v0.14.4. - Update golang.org/x/crypto to v0.6.0. - Update github.com/go-git/go-billy/v5 to v5.4.1. - Update all the fluxcd/pkg dependencies to the latest. - Update source-controller to v0.35.0. Signed-off-by: Sunny <[email protected]>
1 parent a04d1cd commit 2f67f33

File tree

6 files changed

+84
-85
lines changed

6 files changed

+84
-85
lines changed

‎Makefile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ ifeq ($(shell uname -s),Linux)
4949
endif
5050

5151
# API (doc) generation utilities
52-
CONTROLLER_GEN_VERSION ?= v0.7.0
53-
GEN_API_REF_DOCS_VERSION ?= v0.3.0
52+
CONTROLLER_GEN_VERSION ?= v0.11.1
53+
GEN_API_REF_DOCS_VERSION ?= e327d0730470cbd61b06300f81c5fcf91c23c113
5454

5555
# If gobin not set, create one on ./build and add to path.
5656
ifeq (,$(shell go env GOBIN))
@@ -179,13 +179,13 @@ docker-deploy: ## Set the Docker image in-cluster
179179
CONTROLLER_GEN = $(GOBIN)/controller-gen
180180
.PHONY: controller-gen
181181
controller-gen: ## Download controller-gen locally if necessary.
182-
$(call go-install-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.8.0)
182+
$(call go-install-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_GEN_VERSION))
183183

184184
# Find or download gen-crd-api-reference-docs
185185
GEN_CRD_API_REFERENCE_DOCS = $(GOBIN)/gen-crd-api-reference-docs
186186
.PHONY: gen-crd-api-reference-docs
187187
gen-crd-api-reference-docs:
188-
$(call go-install-tool,$(GEN_CRD_API_REFERENCE_DOCS),github.com/ahmetb/gen-crd-api-reference-docs@v0.3.0)
188+
$(call go-install-tool,$(GEN_CRD_API_REFERENCE_DOCS),github.com/ahmetb/gen-crd-api-reference-docs@$(GEN_API_REF_DOCS_VERSION))
189189

190190
ENVTEST_ASSETS_DIR=$(BUILD_DIR)/testbin
191191
ENVTEST_KUBERNETES_VERSION?=latest

‎api/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ go 1.18
44

55
require (
66
github.com/fluxcd/pkg/apis/meta v0.19.0
7-
github.com/fluxcd/source-controller/api v0.34.0
7+
github.com/fluxcd/source-controller/api v0.35.0
88
k8s.io/apimachinery v0.26.1
9-
sigs.k8s.io/controller-runtime v0.14.2
9+
sigs.k8s.io/controller-runtime v0.14.4
1010
)
1111

1212
// Fix CVE-2022-32149

‎api/go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ github.com/fluxcd/pkg/apis/acl v0.1.0 h1:EoAl377hDQYL3WqanWCdifauXqXbMyFuK82NnX6
55
github.com/fluxcd/pkg/apis/acl v0.1.0/go.mod h1:zfEZzz169Oap034EsDhmCAGgnWlcWmIObZjYMusoXS8=
66
github.com/fluxcd/pkg/apis/meta v0.19.0 h1:CX75e/eaRWZDTzNdMSWomY1InlssLKcS8GQDSg/aopI=
77
github.com/fluxcd/pkg/apis/meta v0.19.0/go.mod h1:7b6prDPsViyAzoY7eRfSPS0/MbXpGGsOMvRq2QrTKa4=
8-
github.com/fluxcd/source-controller/api v0.34.0 h1:M2kD95IdpmHcDNy78K6T6p7niC38LGwSrKq8XAZEJY0=
9-
github.com/fluxcd/source-controller/api v0.34.0/go.mod h1:w3PDdR+FZyq3zyyUDxz6vY3CKByZfYAjkzJUxuUXCuc=
8+
github.com/fluxcd/source-controller/api v0.35.0 h1:vVjUv4vxV3uS8AvdXe6J55TU88NwbpabPxlM72c7HwY=
9+
github.com/fluxcd/source-controller/api v0.35.0/go.mod h1:TImPMy/MEwNpDu6qHsw9LlCznXaB8bSO8mnxBSFsX4Q=
1010
github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
1111
github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0=
1212
github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
@@ -92,8 +92,8 @@ k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4=
9292
k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
9393
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 h1:KTgPnR10d5zhztWptI952TNtt/4u5h3IzDXkdIMuo2Y=
9494
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
95-
sigs.k8s.io/controller-runtime v0.14.2 h1:P6IwDhbsRWsBClt/8/h8Zy36bCuGuW5Op7MHpFrN/60=
96-
sigs.k8s.io/controller-runtime v0.14.2/go.mod h1:WqIdsAY6JBsjfc/CqO0CORmNtoCtE4S6qbPc9s68h+0=
95+
sigs.k8s.io/controller-runtime v0.14.4 h1:Kd/Qgx5pd2XUL08eOV2vwIq3L9GhIbJ5Nxengbd4/0M=
96+
sigs.k8s.io/controller-runtime v0.14.4/go.mod h1:WqIdsAY6JBsjfc/CqO0CORmNtoCtE4S6qbPc9s68h+0=
9797
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
9898
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
9999
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=

‎config/crd/bases/image.toolkit.fluxcd.io_imageupdateautomations.yaml‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.8.0
6+
controller-gen.kubebuilder.io/version: v0.11.1
77
creationTimestamp: null
88
name: imageupdateautomations.image.toolkit.fluxcd.io
99
spec:
@@ -56,17 +56,21 @@ spec:
5656
from the Git repository.
5757
properties:
5858
branch:
59-
description: "Branch to check out, defaults to 'master'
60-
if no other field is defined. \n When GitRepositorySpec.GitImplementation
61-
is set to 'go-git', a shallow clone of the specified
62-
branch is performed."
59+
description: Branch to check out, defaults to 'master'
60+
if no other field is defined.
6361
type: string
6462
commit:
6563
description: "Commit SHA to check out, takes precedence
66-
over all reference fields. \n When GitRepositorySpec.GitImplementation
67-
is set to 'go-git', this can be combined with Branch
68-
to shallow clone the branch, in which the commit is
69-
expected to exist."
64+
over all reference fields. \n This can be combined with
65+
Branch to shallow clone the branch, in which the commit
66+
is expected to exist."
67+
type: string
68+
name:
69+
description: "Name of the reference to check out; takes
70+
precedence over Branch, Tag and SemVer. \n It must be
71+
a valid Git reference: https://git-scm.com/docs/git-check-ref-format#_description
72+
Examples: \"refs/heads/main\", \"refs/tags/v0.1.0\",
73+
\"refs/pull/420/head\", \"refs/merge-requests/1/head\""
7074
type: string
7175
semver:
7276
description: SemVer tag expression to check out, takes
@@ -298,9 +302,3 @@ spec:
298302
storage: true
299303
subresources:
300304
status: {}
301-
status:
302-
acceptedNames:
303-
kind: ""
304-
plural: ""
305-
conditions: []
306-
storedVersions: []

‎go.mod‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7,32 +7,32 @@ replace github.com/fluxcd/image-automation-controller/api => ./api
77
require (
88
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230106234847-43070de90fa1
99
github.com/Masterminds/sprig/v3 v3.2.3
10-
github.com/ProtonMail/go-crypto v0.0.0-20230201104953-d1d05f4e2bfb
10+
github.com/ProtonMail/go-crypto v0.0.0-20230214155104-81033d7f4442
1111
github.com/cyphar/filepath-securejoin v0.2.3
1212
github.com/fluxcd/go-git/v5 v5.0.0-20221219190809-2e5c9d01cfc4
1313
github.com/fluxcd/image-automation-controller/api v0.29.0
1414
github.com/fluxcd/image-reflector-controller/api v0.24.0
1515
github.com/fluxcd/pkg/apis/acl v0.1.0
16-
github.com/fluxcd/pkg/apis/event v0.3.0
16+
github.com/fluxcd/pkg/apis/event v0.4.0
1717
github.com/fluxcd/pkg/apis/meta v0.19.0
18-
github.com/fluxcd/pkg/git v0.8.0
19-
github.com/fluxcd/pkg/git/gogit v0.5.0
20-
github.com/fluxcd/pkg/gittestserver v0.8.0
21-
github.com/fluxcd/pkg/runtime v0.27.0
22-
github.com/fluxcd/pkg/ssh v0.7.0
23-
github.com/fluxcd/source-controller/api v0.34.0
24-
github.com/go-git/go-billy/v5 v5.4.0
18+
github.com/fluxcd/pkg/git v0.10.0
19+
github.com/fluxcd/pkg/git/gogit v0.7.1
20+
github.com/fluxcd/pkg/gittestserver v0.8.1
21+
github.com/fluxcd/pkg/runtime v0.29.0
22+
github.com/fluxcd/pkg/ssh v0.7.1
23+
github.com/fluxcd/source-controller/api v0.35.0
24+
github.com/go-git/go-billy/v5 v5.4.1
2525
github.com/go-logr/logr v1.2.3
2626
github.com/google/go-containerregistry v0.13.0
2727
github.com/onsi/gomega v1.26.0
2828
github.com/otiai10/copy v1.9.0
2929
github.com/spf13/pflag v1.0.5
30-
golang.org/x/crypto v0.5.0
30+
golang.org/x/crypto v0.6.0
3131
k8s.io/api v0.26.1
3232
k8s.io/apimachinery v0.26.1
3333
k8s.io/client-go v0.26.1
3434
k8s.io/kube-openapi v0.0.0-20230131224050-76d406abb92a
35-
sigs.k8s.io/controller-runtime v0.14.2
35+
sigs.k8s.io/controller-runtime v0.14.4
3636
sigs.k8s.io/kustomize/kyaml v0.13.9
3737
)
3838

@@ -53,15 +53,15 @@ require (
5353
github.com/beorn7/perks v1.0.1 // indirect
5454
github.com/cespare/xxhash/v2 v2.1.2 // indirect
5555
github.com/chai2010/gettext-go v1.0.2 // indirect
56-
github.com/cloudflare/circl v1.3.0 // indirect
56+
github.com/cloudflare/circl v1.3.2 // indirect
5757
github.com/davecgh/go-spew v1.1.1 // indirect
5858
github.com/emicklei/go-restful/v3 v3.10.0 // indirect
5959
github.com/emirpasic/gods v1.18.1 // indirect
6060
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
6161
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
6262
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
6363
github.com/fluxcd/gitkit v0.6.0 // indirect
64-
github.com/fluxcd/pkg/version v0.2.0 // indirect
64+
github.com/fluxcd/pkg/version v0.2.1 // indirect
6565
github.com/fsnotify/fsnotify v1.6.0 // indirect
6666
github.com/go-errors/errors v1.4.2 // indirect
6767
github.com/go-git/gcfg v1.5.0 // indirect
@@ -115,25 +115,25 @@ require (
115115
github.com/prometheus/procfs v0.8.0 // indirect
116116
github.com/rogpeppe/go-internal v1.8.0 // indirect
117117
github.com/russross/blackfriday v1.6.0 // indirect
118-
github.com/sergi/go-diff v1.2.0 // indirect
118+
github.com/sergi/go-diff v1.3.1 // indirect
119119
github.com/shopspring/decimal v1.2.0 // indirect
120120
github.com/skeema/knownhosts v1.1.0 // indirect
121121
github.com/spf13/cast v1.5.0 // indirect
122122
github.com/spf13/cobra v1.6.1 // indirect
123-
github.com/xanzy/ssh-agent v0.3.2 // indirect
123+
github.com/xanzy/ssh-agent v0.3.3 // indirect
124124
github.com/xlab/treeprint v1.1.0 // indirect
125125
go.starlark.net v0.0.0-20221028183056-acb66ad56dd2 // indirect
126126
go.uber.org/atomic v1.10.0 // indirect
127127
go.uber.org/multierr v1.8.0 // indirect
128128
go.uber.org/zap v1.24.0 // indirect
129-
golang.org/x/mod v0.7.0 // indirect
130-
golang.org/x/net v0.5.0 // indirect
129+
golang.org/x/mod v0.8.0 // indirect
130+
golang.org/x/net v0.7.0 // indirect
131131
golang.org/x/oauth2 v0.2.0 // indirect
132-
golang.org/x/sys v0.4.0 // indirect
133-
golang.org/x/term v0.4.0 // indirect
134-
golang.org/x/text v0.6.0 // indirect
132+
golang.org/x/sys v0.5.0 // indirect
133+
golang.org/x/term v0.5.0 // indirect
134+
golang.org/x/text v0.7.0 // indirect
135135
golang.org/x/time v0.3.0 // indirect
136-
golang.org/x/tools v0.4.0 // indirect
136+
golang.org/x/tools v0.6.0 // indirect
137137
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
138138
google.golang.org/appengine v1.6.7 // indirect
139139
google.golang.org/protobuf v1.28.1 // indirect

0 commit comments

Comments
 (0)