Skip to content

Commit 9d65ff8

Browse files
stefanprodanstefanprodan
authored
Merge pull request #1304 from fluxcd/kustomize-v5.5.0
Update Kustomize packages to v5.5.0
2 parents 61fa7da + 9974a49 commit 9d65ff8

File tree

4 files changed

+123
-129
lines changed

4 files changed

+123
-129
lines changed

‎api/go.mod‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
module github.com/fluxcd/kustomize-controller/api
22

3-
go 1.22.0
3+
go 1.22.7
44

55
require (
6-
github.com/fluxcd/pkg/apis/kustomize v1.6.1
7-
github.com/fluxcd/pkg/apis/meta v1.6.1
8-
k8s.io/apiextensions-apiserver v0.31.1
9-
k8s.io/apimachinery v0.31.1
10-
sigs.k8s.io/controller-runtime v0.19.0
6+
github.com/fluxcd/pkg/apis/kustomize v1.7.0
7+
github.com/fluxcd/pkg/apis/meta v1.7.0
8+
k8s.io/apiextensions-apiserver v0.31.3
9+
k8s.io/apimachinery v0.31.3
10+
sigs.k8s.io/controller-runtime v0.19.3
1111
)
1212

1313
// Fix CVE-2022-28948

‎api/go.sum‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
22
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
33
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
44
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
5-
github.com/fluxcd/pkg/apis/kustomize v1.6.1 h1:22FJc69Mq4i8aCxnKPlddHhSMyI4UPkQkqiAdWFcqe0=
6-
github.com/fluxcd/pkg/apis/kustomize v1.6.1/go.mod h1:5dvQ4IZwz0hMGmuj8tTWGtarsuxW0rWsxJOwC6i+0V8=
7-
github.com/fluxcd/pkg/apis/meta v1.6.1 h1:maLhcRJ3P/70ArLCY/LF/YovkxXbX+6sTWZwZQBeNq0=
8-
github.com/fluxcd/pkg/apis/meta v1.6.1/go.mod h1:YndB/gxgGZmKfqpAfFxyCDNFJFP0ikpeJzs66jwq280=
5+
github.com/fluxcd/pkg/apis/kustomize v1.7.0 h1:4N23LccihQ3Ose/1FYZGwhrFSh63C9uOVFhwmSInOfQ=
6+
github.com/fluxcd/pkg/apis/kustomize v1.7.0/go.mod h1:CqWLBcY2ZPW5f3k2sEypSfjIhz2hFs70PTTYIdKTMaY=
7+
github.com/fluxcd/pkg/apis/meta v1.7.0 h1:pDbPrBGgsiWV4bx8j+hodwv1Ysbj/pHP+FH46aTZOfs=
8+
github.com/fluxcd/pkg/apis/meta v1.7.0/go.mod h1:OJGH7I//SNO6zcso80oBRuf5H8oU8etZDeTgCcH7qHo=
99
github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E=
1010
github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ=
1111
github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
@@ -97,18 +97,18 @@ gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
9797
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
9898
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
9999
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
100-
k8s.io/api v0.31.1 h1:Xe1hX/fPW3PXYYv8BlozYqw63ytA92snr96zMW9gWTU=
101-
k8s.io/api v0.31.1/go.mod h1:sbN1g6eY6XVLeqNsZGLnI5FwVseTrZX7Fv3O26rhAaI=
102-
k8s.io/apiextensions-apiserver v0.31.1 h1:L+hwULvXx+nvTYX/MKM3kKMZyei+UiSXQWciX/N6E40=
103-
k8s.io/apiextensions-apiserver v0.31.1/go.mod h1:tWMPR3sgW+jsl2xm9v7lAyRF1rYEK71i9G5dRtkknoQ=
104-
k8s.io/apimachinery v0.31.1 h1:mhcUBbj7KUjaVhyXILglcVjuS4nYXiwC+KKFBgIVy7U=
105-
k8s.io/apimachinery v0.31.1/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
100+
k8s.io/api v0.31.3 h1:umzm5o8lFbdN/hIXbrK9oRpOproJO62CV1zqxXrLgk8=
101+
k8s.io/api v0.31.3/go.mod h1:UJrkIp9pnMOI9K2nlL6vwpxRzzEX5sWgn8kGQe92kCE=
102+
k8s.io/apiextensions-apiserver v0.31.3 h1:+GFGj2qFiU7rGCsA5o+p/rul1OQIq6oYpQw4+u+nciE=
103+
k8s.io/apiextensions-apiserver v0.31.3/go.mod h1:2DSpFhUZZJmn/cr/RweH1cEVVbzFw9YBu4T+U3mf1e4=
104+
k8s.io/apimachinery v0.31.3 h1:6l0WhcYgasZ/wk9ktLq5vLaoXJJr5ts6lkaQzgeYPq4=
105+
k8s.io/apimachinery v0.31.3/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
106106
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
107107
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
108108
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A=
109109
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
110-
sigs.k8s.io/controller-runtime v0.19.0 h1:nWVM7aq+Il2ABxwiCizrVDSlmDcshi9llbaFbC0ji/Q=
111-
sigs.k8s.io/controller-runtime v0.19.0/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4=
110+
sigs.k8s.io/controller-runtime v0.19.3 h1:XO2GvC9OPftRst6xWCpTgBZO04S2cbp0Qqkj8bX1sPw=
111+
sigs.k8s.io/controller-runtime v0.19.3/go.mod h1:j4j87DqtsThvwTv5/Tc5NFRyyF/RF0ip4+62tbTSIUM=
112112
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
113113
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
114114
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4=

‎go.mod‎

Lines changed: 35 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -14,41 +14,41 @@ require (
1414
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.16.0
1515
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.0
1616
github.com/aws/aws-sdk-go-v2/credentials v1.17.47
17-
github.com/cyphar/filepath-securejoin v0.3.2
17+
github.com/cyphar/filepath-securejoin v0.3.5
1818
github.com/dimchansky/utfbom v1.1.1
19-
github.com/fluxcd/cli-utils v0.36.0-flux.9
19+
github.com/fluxcd/cli-utils v0.36.0-flux.10
2020
github.com/fluxcd/kustomize-controller/api v1.4.0
21-
github.com/fluxcd/pkg/apis/acl v0.3.0
22-
github.com/fluxcd/pkg/apis/event v0.10.1
23-
github.com/fluxcd/pkg/apis/kustomize v1.6.1
24-
github.com/fluxcd/pkg/apis/meta v1.6.1
25-
github.com/fluxcd/pkg/http/fetch v0.12.1
26-
github.com/fluxcd/pkg/kustomize v1.13.0
27-
github.com/fluxcd/pkg/runtime v0.49.1
21+
github.com/fluxcd/pkg/apis/acl v0.4.0
22+
github.com/fluxcd/pkg/apis/event v0.11.0
23+
github.com/fluxcd/pkg/apis/kustomize v1.7.0
24+
github.com/fluxcd/pkg/apis/meta v1.7.0
25+
github.com/fluxcd/pkg/http/fetch v0.13.0
26+
github.com/fluxcd/pkg/kustomize v1.14.0
27+
github.com/fluxcd/pkg/runtime v0.50.0
2828
github.com/fluxcd/pkg/ssa v0.41.1
29-
github.com/fluxcd/pkg/tar v0.8.1
30-
github.com/fluxcd/pkg/testserver v0.7.0
29+
github.com/fluxcd/pkg/tar v0.9.0
30+
github.com/fluxcd/pkg/testserver v0.8.0
3131
github.com/fluxcd/source-controller/api v1.4.1
3232
github.com/getsops/sops/v3 v3.9.2
3333
github.com/hashicorp/vault/api v1.15.0
34-
github.com/onsi/gomega v1.34.2
34+
github.com/onsi/gomega v1.36.0
3535
github.com/opencontainers/go-digest v1.0.0
3636
github.com/ory/dockertest/v3 v3.11.0
3737
github.com/spf13/pflag v1.0.5
38-
golang.org/x/net v0.31.0
39-
k8s.io/api v0.31.1
40-
k8s.io/apimachinery v0.31.1
41-
k8s.io/client-go v0.31.1
42-
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
43-
sigs.k8s.io/controller-runtime v0.19.0
44-
sigs.k8s.io/kustomize/api v0.17.3
38+
golang.org/x/net v0.32.0
39+
k8s.io/api v0.31.3
40+
k8s.io/apimachinery v0.31.3
41+
k8s.io/client-go v0.31.3
42+
k8s.io/utils v0.0.0-20241104163129-6fe5fd82f078
43+
sigs.k8s.io/controller-runtime v0.19.3
44+
sigs.k8s.io/kustomize/api v0.18.0
4545
sigs.k8s.io/yaml v1.4.0
4646
)
4747

48-
// Pin kustomize to v5.4.3
48+
// Pin kustomize to v5.5.0
4949
replace (
50-
sigs.k8s.io/kustomize/api => sigs.k8s.io/kustomize/api v0.17.3
51-
sigs.k8s.io/kustomize/kyaml => sigs.k8s.io/kustomize/kyaml v0.17.2
50+
sigs.k8s.io/kustomize/api => sigs.k8s.io/kustomize/api v0.18.0
51+
sigs.k8s.io/kustomize/kyaml => sigs.k8s.io/kustomize/kyaml v0.18.1
5252
)
5353

5454
// Fix CVE-2022-28948
@@ -120,9 +120,8 @@ require (
120120
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
121121
github.com/fatih/color v1.18.0 // indirect
122122
github.com/felixge/httpsnoop v1.0.4 // indirect
123-
github.com/fluxcd/pkg/envsubst v1.1.0 // indirect
124-
github.com/fluxcd/pkg/sourceignore v0.8.0 // indirect
125-
github.com/fsnotify/fsnotify v1.7.0 // indirect
123+
github.com/fluxcd/pkg/envsubst v1.2.0 // indirect
124+
github.com/fluxcd/pkg/sourceignore v0.9.0 // indirect
126125
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
127126
github.com/getsops/gopgagent v0.0.0-20240527072608-0c14999532fe // indirect
128127
github.com/go-errors/errors v1.5.1 // indirect
@@ -193,7 +192,7 @@ require (
193192
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
194193
github.com/pkg/errors v0.9.1 // indirect
195194
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
196-
github.com/prometheus/client_golang v1.20.3 // indirect
195+
github.com/prometheus/client_golang v1.20.5 // indirect
197196
github.com/prometheus/client_model v0.6.1 // indirect
198197
github.com/prometheus/common v0.55.0 // indirect
199198
github.com/prometheus/procfs v0.15.1 // indirect
@@ -217,16 +216,15 @@ require (
217216
go.opentelemetry.io/otel/sdk v1.29.0 // indirect
218217
go.opentelemetry.io/otel/sdk/metric v1.29.0 // indirect
219218
go.opentelemetry.io/otel/trace v1.30.0 // indirect
220-
go.starlark.net v0.0.0-20231121155337-90ade8b19d09 // indirect
221219
go.uber.org/multierr v1.11.0 // indirect
222220
go.uber.org/zap v1.27.0 // indirect
223-
golang.org/x/crypto v0.29.0 // indirect
221+
golang.org/x/crypto v0.30.0 // indirect
224222
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
225223
golang.org/x/oauth2 v0.24.0 // indirect
226-
golang.org/x/sync v0.9.0 // indirect
227-
golang.org/x/sys v0.27.0 // indirect
228-
golang.org/x/term v0.26.0 // indirect
229-
golang.org/x/text v0.20.0 // indirect
224+
golang.org/x/sync v0.10.0 // indirect
225+
golang.org/x/sys v0.28.0 // indirect
226+
golang.org/x/term v0.27.0 // indirect
227+
golang.org/x/text v0.21.0 // indirect
230228
golang.org/x/time v0.8.0 // indirect
231229
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
232230
google.golang.org/api v0.209.0 // indirect
@@ -242,13 +240,13 @@ require (
242240
gopkg.in/warnings.v0 v0.1.2 // indirect
243241
gopkg.in/yaml.v2 v2.4.0 // indirect
244242
gopkg.in/yaml.v3 v3.0.1 // indirect
245-
k8s.io/apiextensions-apiserver v0.31.1 // indirect
246-
k8s.io/cli-runtime v0.31.1 // indirect
247-
k8s.io/component-base v0.31.1 // indirect
243+
k8s.io/apiextensions-apiserver v0.31.3 // indirect
244+
k8s.io/cli-runtime v0.31.3 // indirect
245+
k8s.io/component-base v0.31.3 // indirect
248246
k8s.io/klog/v2 v2.130.1 // indirect
249247
k8s.io/kube-openapi v0.0.0-20240411171206-dc4e619f62f3 // indirect
250-
k8s.io/kubectl v0.31.1 // indirect
248+
k8s.io/kubectl v0.31.3 // indirect
251249
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
252-
sigs.k8s.io/kustomize/kyaml v0.17.2 // indirect
250+
sigs.k8s.io/kustomize/kyaml v0.18.1 // indirect
253251
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
254252
)

0 commit comments

Comments
 (0)