Skip to content

Commit e77ddbc

Browse files
stefanprodanstefanprodan
authored
Merge pull request #908 from fluxcd/update-deps-k8s-1.27.3
Update dependencies
2 parents e6494cf + 704776d commit e77ddbc

File tree

6 files changed

+168
-167
lines changed

6 files changed

+168
-167
lines changed

‎.github/workflows/e2e.yaml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ on:
44
pull_request:
55
push:
66
branches:
7-
- main
7+
- 'main'
8+
- 'release/**'
89

910
permissions:
1011
contents: read # for actions/checkout to fetch code
@@ -38,8 +39,9 @@ jobs:
3839
- name: Setup Kubernetes
3940
uses: helm/kind-action@fa81e57adff234b2908110485695db0f181f3c67 # v1.7.0
4041
with:
41-
version: v0.17.0
42+
version: v0.20.0
4243
cluster_name: kind
44+
node_image: kindest/node:v1.27.3@sha256:3966ac761ae0136263ffdb6cfd4db23ef8a83cba8a463690e98317add2c9ba72
4345
- name: Setup Kustomize
4446
uses: fluxcd/pkg/actions/kustomize@main
4547
- name: Enable integration tests

‎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.20
44

55
require (
6-
github.com/fluxcd/pkg/apis/kustomize v1.1.0
7-
github.com/fluxcd/pkg/apis/meta v1.1.0
8-
k8s.io/apiextensions-apiserver v0.27.2
9-
k8s.io/apimachinery v0.27.2
6+
github.com/fluxcd/pkg/apis/kustomize v1.1.1
7+
github.com/fluxcd/pkg/apis/meta v1.1.1
8+
k8s.io/apiextensions-apiserver v0.27.3
9+
k8s.io/apimachinery v0.27.3
1010
sigs.k8s.io/controller-runtime v0.15.0
1111
)
1212

‎api/go.sum‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
22
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
33
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
4-
github.com/fluxcd/pkg/apis/kustomize v1.1.0 h1:Fbv4dCB57r2+fiusozN7at8r7upTz58Z4wWw1njHPyU=
5-
github.com/fluxcd/pkg/apis/kustomize v1.1.0/go.mod h1:CAe9Mjf9KVoTm1V4wpvq/FGXFDSnpBwfww/IG7mw3gM=
6-
github.com/fluxcd/pkg/apis/meta v1.1.0 h1:vYU1mvUzztnQyTzZOLHQ3wm/tXd7E1QZ2V91zuVJPsQ=
7-
github.com/fluxcd/pkg/apis/meta v1.1.0/go.mod h1:/QwCotRKL/BT6RSa4O75FlYW14fU8eRfKnoagzbkmL4=
4+
github.com/fluxcd/pkg/apis/kustomize v1.1.1 h1:MSGn4z0R9PptmoPFHnx2nEZ8Jtl1sKfw0cuDQY2HYwM=
5+
github.com/fluxcd/pkg/apis/kustomize v1.1.1/go.mod h1:0pCu0ecIY+ZM0iE/hOHYwCMZ3b0SpBrjJ1SH3FFyYdE=
6+
github.com/fluxcd/pkg/apis/meta v1.1.1 h1:sLAKLbEu7rRzJ+Mytffu3NcpfdbOBTa6hcpOQzFWm+M=
7+
github.com/fluxcd/pkg/apis/meta v1.1.1/go.mod h1:soCfzjFWbm1mqybDcOywWKTCEYlH3skpoNGTboVk234=
88
github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
99
github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
1010
github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
@@ -82,11 +82,11 @@ gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
8282
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
8383
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
8484
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
85-
k8s.io/api v0.27.2 h1:+H17AJpUMvl+clT+BPnKf0E3ksMAzoBBg7CntpSuADo=
86-
k8s.io/apiextensions-apiserver v0.27.2 h1:iwhyoeS4xj9Y7v8YExhUwbVuBhMr3Q4bd/laClBV6Bo=
87-
k8s.io/apiextensions-apiserver v0.27.2/go.mod h1:Oz9UdvGguL3ULgRdY9QMUzL2RZImotgxvGjdWRq6ZXQ=
88-
k8s.io/apimachinery v0.27.2 h1:vBjGaKKieaIreI+oQwELalVG4d8f3YAMNpWLzDXkxeg=
89-
k8s.io/apimachinery v0.27.2/go.mod h1:XNfZ6xklnMCOGGFNqXG7bUrQCoR04dh/E7FprV6pb+E=
85+
k8s.io/api v0.27.3 h1:yR6oQXXnUEBWEWcvPWS0jQL575KoAboQPfJAuKNrw5Y=
86+
k8s.io/apiextensions-apiserver v0.27.3 h1:xAwC1iYabi+TDfpRhxh4Eapl14Hs2OftM2DN5MpgKX4=
87+
k8s.io/apiextensions-apiserver v0.27.3/go.mod h1:BH3wJ5NsB9XE1w+R6SSVpKmYNyIiyIz9xAmBl8Mb+84=
88+
k8s.io/apimachinery v0.27.3 h1:Ubye8oBufD04l9QnNtW05idcOe9Z3GQN8+7PqmuVcUM=
89+
k8s.io/apimachinery v0.27.3/go.mod h1:XNfZ6xklnMCOGGFNqXG7bUrQCoR04dh/E7FprV6pb+E=
9090
k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
9191
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
9292
k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=

‎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.0.0-rc.4/source-controller.crds.yaml
6-
- https://github.com/fluxcd/source-controller/releases/download/v1.0.0-rc.4/source-controller.deployment.yaml
5+
- https://github.com/fluxcd/source-controller/releases/download/v1.0.0/source-controller.crds.yaml
6+
- https://github.com/fluxcd/source-controller/releases/download/v1.0.0/source-controller.deployment.yaml
77
- ../crd
88
- ../rbac
99
- ../manager

‎go.mod‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -9,47 +9,47 @@ replace github.com/fluxcd/kustomize-controller/api => ./api
99
replace github.com/opencontainers/go-digest => github.com/opencontainers/go-digest v1.0.1-0.20220411205349-bde1400a84be
1010

1111
require (
12-
cloud.google.com/go/kms v1.10.2
12+
cloud.google.com/go/kms v1.12.1
1313
filippo.io/age v1.1.1
1414
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230106234847-43070de90fa1
15-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.6.0
15+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.6.1
1616
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.0
1717
github.com/Azure/azure-sdk-for-go/sdk/keyvault/azkeys v0.10.0
18-
github.com/aws/aws-sdk-go v1.44.270
19-
github.com/aws/aws-sdk-go-v2 v1.18.0
20-
github.com/aws/aws-sdk-go-v2/config v1.18.25
21-
github.com/aws/aws-sdk-go-v2/credentials v1.13.24
22-
github.com/aws/aws-sdk-go-v2/service/kms v1.21.1
23-
github.com/aws/aws-sdk-go-v2/service/sts v1.19.0
18+
github.com/aws/aws-sdk-go v1.44.295
19+
github.com/aws/aws-sdk-go-v2 v1.18.1
20+
github.com/aws/aws-sdk-go-v2/config v1.18.27
21+
github.com/aws/aws-sdk-go-v2/credentials v1.13.26
22+
github.com/aws/aws-sdk-go-v2/service/kms v1.22.2
23+
github.com/aws/aws-sdk-go-v2/service/sts v1.19.2
2424
github.com/cyphar/filepath-securejoin v0.2.3
2525
github.com/dimchansky/utfbom v1.1.1
2626
github.com/fluxcd/kustomize-controller/api v1.0.0-rc.4
2727
github.com/fluxcd/pkg/apis/acl v0.1.0
28-
github.com/fluxcd/pkg/apis/event v0.5.0
29-
github.com/fluxcd/pkg/apis/kustomize v1.1.0
30-
github.com/fluxcd/pkg/apis/meta v1.1.0
31-
github.com/fluxcd/pkg/http/fetch v0.5.1
32-
github.com/fluxcd/pkg/kustomize v1.3.3
33-
github.com/fluxcd/pkg/runtime v0.38.1
34-
github.com/fluxcd/pkg/ssa v0.28.1
28+
github.com/fluxcd/pkg/apis/event v0.5.1
29+
github.com/fluxcd/pkg/apis/kustomize v1.1.1
30+
github.com/fluxcd/pkg/apis/meta v1.1.1
31+
github.com/fluxcd/pkg/http/fetch v0.5.2
32+
github.com/fluxcd/pkg/kustomize v1.3.4
33+
github.com/fluxcd/pkg/runtime v0.40.0
34+
github.com/fluxcd/pkg/ssa v0.28.2
3535
github.com/fluxcd/pkg/tar v0.2.0
3636
github.com/fluxcd/pkg/testserver v0.4.0
37-
github.com/fluxcd/source-controller/api v1.0.0-rc.4
37+
github.com/fluxcd/source-controller/api v1.0.0
3838
github.com/hashicorp/vault/api v1.9.2
39-
github.com/onsi/gomega v1.27.7
39+
github.com/onsi/gomega v1.27.8
4040
github.com/opencontainers/go-digest v1.0.0
4141
github.com/ory/dockertest/v3 v3.10.0
4242
github.com/spf13/pflag v1.0.5
4343
go.mozilla.org/sops/v3 v3.7.3
44-
golang.org/x/net v0.10.0
45-
google.golang.org/api v0.124.0
46-
google.golang.org/genproto v0.0.0-20230526015343-6ee61e4f9d5f
47-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234015-3fc162c6f38a
48-
google.golang.org/grpc v1.55.0
49-
google.golang.org/protobuf v1.30.0
50-
k8s.io/api v0.27.2
51-
k8s.io/apimachinery v0.27.2
52-
k8s.io/client-go v0.27.2
44+
golang.org/x/net v0.11.0
45+
google.golang.org/api v0.129.0
46+
google.golang.org/genproto v0.0.0-20230629202037-9506855d4529
47+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230629202037-9506855d4529
48+
google.golang.org/grpc v1.56.1
49+
google.golang.org/protobuf v1.31.0
50+
k8s.io/api v0.27.3
51+
k8s.io/apimachinery v0.27.3
52+
k8s.io/client-go v0.27.3
5353
k8s.io/utils v0.0.0-20230505201702-9f6742963106
5454
sigs.k8s.io/cli-utils v0.34.0
5555
sigs.k8s.io/controller-runtime v0.15.0
@@ -67,9 +67,9 @@ replace (
6767
replace gopkg.in/yaml.v3 => gopkg.in/yaml.v3 v3.0.1
6868

6969
require (
70-
cloud.google.com/go/compute v1.19.0 // indirect
70+
cloud.google.com/go/compute v1.19.3 // indirect
7171
cloud.google.com/go/compute/metadata v0.2.3 // indirect
72-
cloud.google.com/go/iam v0.13.0 // indirect
72+
cloud.google.com/go/iam v1.1.0 // indirect
7373
github.com/Azure/azure-sdk-for-go v63.3.0+incompatible // indirect
7474
github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 // indirect
7575
github.com/Azure/azure-sdk-for-go/sdk/keyvault/internal v0.7.1 // indirect
@@ -90,13 +90,13 @@ require (
9090
github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
9191
github.com/ProtonMail/go-crypto v0.0.0-20230518184743-7afd39499903 // indirect
9292
github.com/acomagu/bufpipe v1.0.4 // indirect
93-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.3 // indirect
94-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33 // indirect
95-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.27 // indirect
96-
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.34 // indirect
97-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.27 // indirect
98-
github.com/aws/aws-sdk-go-v2/service/sso v1.12.10 // indirect
99-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.10 // indirect
93+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.4 // indirect
94+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.34 // indirect
95+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.28 // indirect
96+
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.35 // indirect
97+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.28 // indirect
98+
github.com/aws/aws-sdk-go-v2/service/sso v1.12.12 // indirect
99+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.12 // indirect
100100
github.com/aws/smithy-go v1.13.5 // indirect
101101
github.com/beorn7/perks v1.0.1 // indirect
102102
github.com/blang/semver v3.5.1+incompatible // indirect
@@ -140,14 +140,14 @@ require (
140140
github.com/google/s2a-go v0.1.4 // indirect
141141
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
142142
github.com/google/uuid v1.3.0 // indirect
143-
github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
144-
github.com/googleapis/gax-go/v2 v2.8.0 // indirect
143+
github.com/googleapis/enterprise-certificate-proxy v0.2.5 // indirect
144+
github.com/googleapis/gax-go/v2 v2.11.0 // indirect
145145
github.com/goware/prefixer v0.0.0-20160118172347-395022866408 // indirect
146146
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
147147
github.com/hashicorp/errwrap v1.1.0 // indirect
148148
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
149149
github.com/hashicorp/go-multierror v1.1.1 // indirect
150-
github.com/hashicorp/go-retryablehttp v0.7.2 // indirect
150+
github.com/hashicorp/go-retryablehttp v0.7.4 // indirect
151151
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
152152
github.com/hashicorp/go-secure-stdlib/parseutil v0.1.6 // indirect
153153
github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect
@@ -182,10 +182,10 @@ require (
182182
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
183183
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
184184
github.com/pkg/errors v0.9.1 // indirect
185-
github.com/prometheus/client_golang v1.15.1 // indirect
185+
github.com/prometheus/client_golang v1.16.0 // indirect
186186
github.com/prometheus/client_model v0.4.0 // indirect
187187
github.com/prometheus/common v0.42.0 // indirect
188-
github.com/prometheus/procfs v0.9.0 // indirect
188+
github.com/prometheus/procfs v0.10.1 // indirect
189189
github.com/russross/blackfriday/v2 v2.1.0 // indirect
190190
github.com/ryanuber/go-glob v1.0.0 // indirect
191191
github.com/sirupsen/logrus v1.9.0 // indirect
@@ -201,26 +201,26 @@ require (
201201
go.uber.org/atomic v1.10.0 // indirect
202202
go.uber.org/multierr v1.8.0 // indirect
203203
go.uber.org/zap v1.24.0 // indirect
204-
golang.org/x/crypto v0.9.0 // indirect
204+
golang.org/x/crypto v0.10.0 // indirect
205205
golang.org/x/mod v0.10.0 // indirect
206-
golang.org/x/oauth2 v0.8.0 // indirect
207-
golang.org/x/sys v0.8.0 // indirect
208-
golang.org/x/term v0.8.0 // indirect
209-
golang.org/x/text v0.9.0 // indirect
206+
golang.org/x/oauth2 v0.9.0 // indirect
207+
golang.org/x/sys v0.9.0 // indirect
208+
golang.org/x/term v0.9.0 // indirect
209+
golang.org/x/text v0.10.0 // indirect
210210
golang.org/x/time v0.3.0 // indirect
211211
golang.org/x/tools v0.9.1 // indirect
212212
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
213213
google.golang.org/appengine v1.6.7 // indirect
214-
google.golang.org/genproto/googleapis/api v0.0.0-20230525234020-1aefcd67740a // indirect
214+
google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc // indirect
215215
gopkg.in/inf.v0 v0.9.1 // indirect
216216
gopkg.in/ini.v1 v1.66.4 // indirect
217217
gopkg.in/urfave/cli.v1 v1.20.0 // indirect
218218
gopkg.in/warnings.v0 v0.1.2 // indirect
219219
gopkg.in/yaml.v2 v2.4.0 // indirect
220220
gopkg.in/yaml.v3 v3.0.1 // indirect
221-
k8s.io/apiextensions-apiserver v0.27.2 // indirect
221+
k8s.io/apiextensions-apiserver v0.27.3 // indirect
222222
k8s.io/cli-runtime v0.27.1 // indirect
223-
k8s.io/component-base v0.27.2 // indirect
223+
k8s.io/component-base v0.27.3 // indirect
224224
k8s.io/klog/v2 v2.100.1 // indirect
225225
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
226226
k8s.io/kubectl v0.27.1 // indirect

0 commit comments

Comments
 (0)