Skip to content

Commit 0add02b

Browse files
stefanprodanstefanprodan
authored
Merge pull request #1249 from fluxcd/deps-update
Update flux deps and k8s deps to 1.31.1
2 parents aabb41f + 9ad0b15 commit 0add02b

File tree

5 files changed

+76
-76
lines changed

5 files changed

+76
-76
lines changed

‎api/go.mod‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ module github.com/fluxcd/kustomize-controller/api
33
go 1.22.0
44

55
require (
6-
github.com/fluxcd/pkg/apis/kustomize v1.6.0
7-
github.com/fluxcd/pkg/apis/meta v1.6.0
8-
k8s.io/apiextensions-apiserver v0.31.0
9-
k8s.io/apimachinery v0.31.0
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
1010
sigs.k8s.io/controller-runtime v0.19.0
1111
)
1212

‎api/go.sum‎

Lines changed: 10 additions & 10 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.0 h1:G8Nj4ec8CeReT7nhwGLOuli9s+fInEk8gG+xjpDmZWQ=
6-
github.com/fluxcd/pkg/apis/kustomize v1.6.0/go.mod h1:uWiRCCq/HFW9UraizQKJWi0/jB3QrkYcSvXa0uVyQig=
7-
github.com/fluxcd/pkg/apis/meta v1.6.0 h1:93TcRpiph0OCoQh+cI+PM7E35kBW9dScuas9tWc90Dw=
8-
github.com/fluxcd/pkg/apis/meta v1.6.0/go.mod h1:ZOeHcvyVdZDC5ZOGV7YuwplIvAx6LvmpeyhfTcNZCnc=
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=
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,12 +97,12 @@ 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.0 h1:b9LiSjR2ym/SzTOlfMHm1tr7/21aD7fSkqgD/CVJBCo=
101-
k8s.io/api v0.31.0/go.mod h1:0YiFF+JfFxMM6+1hQei8FY8M7s1Mth+z/q7eF1aJkTE=
102-
k8s.io/apiextensions-apiserver v0.31.0 h1:fZgCVhGwsclj3qCw1buVXCV6khjRzKC5eCFt24kyLSk=
103-
k8s.io/apiextensions-apiserver v0.31.0/go.mod h1:b9aMDEYaEe5sdK+1T0KU78ApR/5ZVp4i56VacZYEHxk=
104-
k8s.io/apimachinery v0.31.0 h1:m9jOiSr3FoSSL5WO9bjm1n6B9KROYYgNZOb4tyZ1lBc=
105-
k8s.io/apimachinery v0.31.0/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
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=
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=

‎config/default/kustomization.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
33
namespace: kustomize-system
44
resources:
5-
- https://github.com/fluxcd/source-controller/releases/download/v1.3.0/source-controller.crds.yaml
6-
- https://github.com/fluxcd/source-controller/releases/download/v1.3.0/source-controller.deployment.yaml
5+
- https://github.com/fluxcd/source-controller/releases/download/v1.4.0/source-controller.crds.yaml
6+
- https://github.com/fluxcd/source-controller/releases/download/v1.4.0/source-controller.deployment.yaml
77
- ../crd
88
- ../rbac
99
- ../manager

‎go.mod‎

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

3-
go 1.22.0
3+
go 1.22.5
44

55
replace github.com/fluxcd/kustomize-controller/api => ./api
66

@@ -14,31 +14,31 @@ require (
1414
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.14.0
1515
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0
1616
github.com/aws/aws-sdk-go-v2/credentials v1.17.27
17-
github.com/cyphar/filepath-securejoin v0.3.1
17+
github.com/cyphar/filepath-securejoin v0.3.2
1818
github.com/dimchansky/utfbom v1.1.1
1919
github.com/fluxcd/cli-utils v0.36.0-flux.9
2020
github.com/fluxcd/kustomize-controller/api v1.3.0
2121
github.com/fluxcd/pkg/apis/acl v0.3.0
22-
github.com/fluxcd/pkg/apis/event v0.10.0
23-
github.com/fluxcd/pkg/apis/kustomize v1.6.0
24-
github.com/fluxcd/pkg/apis/meta v1.6.0
25-
github.com/fluxcd/pkg/http/fetch v0.12.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
2626
github.com/fluxcd/pkg/kustomize v1.13.0
27-
github.com/fluxcd/pkg/runtime v0.49.0
28-
github.com/fluxcd/pkg/ssa v0.41.0
29-
github.com/fluxcd/pkg/tar v0.8.0
27+
github.com/fluxcd/pkg/runtime v0.49.1
28+
github.com/fluxcd/pkg/ssa v0.41.1
29+
github.com/fluxcd/pkg/tar v0.8.1
3030
github.com/fluxcd/pkg/testserver v0.7.0
31-
github.com/fluxcd/source-controller/api v1.3.0
31+
github.com/fluxcd/source-controller/api v1.4.0
3232
github.com/getsops/sops/v3 v3.9.0
3333
github.com/hashicorp/vault/api v1.14.0
3434
github.com/onsi/gomega v1.34.2
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
3838
golang.org/x/net v0.29.0
39-
k8s.io/api v0.31.0
40-
k8s.io/apimachinery v0.31.0
41-
k8s.io/client-go 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
4242
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
4343
sigs.k8s.io/controller-runtime v0.19.0
4444
sigs.k8s.io/kustomize/api v0.17.3
@@ -184,7 +184,7 @@ require (
184184
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
185185
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
186186
github.com/pkg/errors v0.9.1 // indirect
187-
github.com/prometheus/client_golang v1.20.0 // indirect
187+
github.com/prometheus/client_golang v1.20.3 // indirect
188188
github.com/prometheus/client_model v0.6.1 // indirect
189189
github.com/prometheus/common v0.55.0 // indirect
190190
github.com/prometheus/procfs v0.15.1 // indirect
@@ -209,8 +209,8 @@ require (
209209
go.uber.org/multierr v1.11.0 // indirect
210210
go.uber.org/zap v1.27.0 // indirect
211211
golang.org/x/crypto v0.27.0 // indirect
212-
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
213-
golang.org/x/oauth2 v0.22.0 // indirect
212+
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
213+
golang.org/x/oauth2 v0.23.0 // indirect
214214
golang.org/x/sync v0.8.0 // indirect
215215
golang.org/x/sys v0.25.0 // indirect
216216
golang.org/x/term v0.24.0 // indirect
@@ -229,12 +229,12 @@ require (
229229
gopkg.in/warnings.v0 v0.1.2 // indirect
230230
gopkg.in/yaml.v2 v2.4.0 // indirect
231231
gopkg.in/yaml.v3 v3.0.1 // indirect
232-
k8s.io/apiextensions-apiserver v0.31.0 // indirect
233-
k8s.io/cli-runtime v0.31.0 // indirect
234-
k8s.io/component-base v0.31.0 // indirect
232+
k8s.io/apiextensions-apiserver v0.31.1 // indirect
233+
k8s.io/cli-runtime v0.31.1 // indirect
234+
k8s.io/component-base v0.31.1 // indirect
235235
k8s.io/klog/v2 v2.130.1 // indirect
236236
k8s.io/kube-openapi v0.0.0-20240411171206-dc4e619f62f3 // indirect
237-
k8s.io/kubectl v0.31.0 // indirect
237+
k8s.io/kubectl v0.31.1 // indirect
238238
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
239239
sigs.k8s.io/kustomize/kyaml v0.17.2 // indirect
240240
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect

0 commit comments

Comments
 (0)