Skip to content

Commit 61fa7da

Browse files
authored
Merge pull request #1302 from fluxcd/sops-v3.9.3
Update SOPS to v3.9.2
2 parents 3791888 + 4d03cf0 commit 61fa7da

File tree

2 files changed

+265
-208
lines changed

2 files changed

+265
-208
lines changed

go.mod

Lines changed: 82 additions & 69 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.5
3+
go 1.22.7
44

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

@@ -11,9 +11,9 @@ replace github.com/opencontainers/go-digest => github.com/opencontainers/go-dige
1111
require (
1212
filippo.io/age v1.2.0
1313
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24
14-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.14.0
15-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0
16-
github.com/aws/aws-sdk-go-v2/credentials v1.17.27
14+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.16.0
15+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.0
16+
github.com/aws/aws-sdk-go-v2/credentials v1.17.47
1717
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
@@ -29,13 +29,13 @@ require (
2929
github.com/fluxcd/pkg/tar v0.8.1
3030
github.com/fluxcd/pkg/testserver v0.7.0
3131
github.com/fluxcd/source-controller/api v1.4.1
32-
github.com/getsops/sops/v3 v3.9.0
33-
github.com/hashicorp/vault/api v1.14.0
32+
github.com/getsops/sops/v3 v3.9.2
33+
github.com/hashicorp/vault/api v1.15.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
38-
golang.org/x/net v0.29.0
38+
golang.org/x/net v0.31.0
3939
k8s.io/api v0.31.1
4040
k8s.io/apimachinery v0.31.1
4141
k8s.io/client-go v0.31.1
@@ -55,62 +55,70 @@ replace (
5555
replace gopkg.in/yaml.v3 => gopkg.in/yaml.v3 v3.0.1
5656

5757
require (
58-
cloud.google.com/go v0.115.1 // indirect
59-
cloud.google.com/go/auth v0.8.1 // indirect
60-
cloud.google.com/go/auth/oauth2adapt v0.2.4 // indirect
61-
cloud.google.com/go/compute/metadata v0.5.0 // indirect
62-
cloud.google.com/go/iam v1.1.13 // indirect
63-
cloud.google.com/go/kms v1.18.5 // indirect
64-
cloud.google.com/go/longrunning v0.5.12 // indirect
65-
cloud.google.com/go/storage v1.43.0 // indirect
66-
dario.cat/mergo v1.0.0 // indirect
58+
cel.dev/expr v0.16.1 // indirect
59+
cloud.google.com/go v0.116.0 // indirect
60+
cloud.google.com/go/auth v0.10.2 // indirect
61+
cloud.google.com/go/auth/oauth2adapt v0.2.5 // indirect
62+
cloud.google.com/go/compute/metadata v0.5.2 // indirect
63+
cloud.google.com/go/iam v1.2.2 // indirect
64+
cloud.google.com/go/kms v1.20.1 // indirect
65+
cloud.google.com/go/longrunning v0.6.2 // indirect
66+
cloud.google.com/go/monitoring v1.21.2 // indirect
67+
cloud.google.com/go/storage v1.47.0 // indirect
68+
dario.cat/mergo v1.0.1 // indirect
6769
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
68-
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.1.0 // indirect
69-
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.0.1 // indirect
70+
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.3.0 // indirect
71+
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.1.0 // indirect
7072
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
71-
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
73+
github.com/AzureAD/microsoft-authentication-library-for-go v1.3.1 // indirect
74+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.24.1 // indirect
75+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.48.1 // indirect
76+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.1 // indirect
7277
github.com/MakeNowJust/heredoc v1.0.0 // indirect
7378
github.com/Microsoft/go-winio v0.6.2 // indirect
7479
github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
75-
github.com/ProtonMail/go-crypto v1.1.0-alpha.3-proton // indirect
76-
github.com/aws/aws-sdk-go-v2 v1.30.3 // indirect
77-
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.3 // indirect
78-
github.com/aws/aws-sdk-go-v2/config v1.27.27 // indirect
79-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.11 // indirect
80-
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.10 // indirect
81-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.15 // indirect
82-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.15 // indirect
83-
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 // indirect
84-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.15 // indirect
85-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.3 // indirect
86-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.17 // indirect
87-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.17 // indirect
88-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.15 // indirect
89-
github.com/aws/aws-sdk-go-v2/service/kms v1.35.3 // indirect
90-
github.com/aws/aws-sdk-go-v2/service/s3 v1.58.3 // indirect
91-
github.com/aws/aws-sdk-go-v2/service/sso v1.22.4 // indirect
92-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.4 // indirect
93-
github.com/aws/aws-sdk-go-v2/service/sts v1.30.3 // indirect
94-
github.com/aws/smithy-go v1.20.3 // indirect
80+
github.com/ProtonMail/go-crypto v1.1.3 // indirect
81+
github.com/aws/aws-sdk-go-v2 v1.32.6 // indirect
82+
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.7 // indirect
83+
github.com/aws/aws-sdk-go-v2/config v1.28.6 // indirect
84+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.21 // indirect
85+
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.42 // indirect
86+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.25 // indirect
87+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.25 // indirect
88+
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect
89+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.25 // indirect
90+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1 // indirect
91+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.6 // indirect
92+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.6 // indirect
93+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.6 // indirect
94+
github.com/aws/aws-sdk-go-v2/service/kms v1.37.7 // indirect
95+
github.com/aws/aws-sdk-go-v2/service/s3 v1.70.0 // indirect
96+
github.com/aws/aws-sdk-go-v2/service/sso v1.24.7 // indirect
97+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.6 // indirect
98+
github.com/aws/aws-sdk-go-v2/service/sts v1.33.2 // indirect
99+
github.com/aws/smithy-go v1.22.1 // indirect
95100
github.com/beorn7/perks v1.0.1 // indirect
96101
github.com/blang/semver v3.5.1+incompatible // indirect
97102
github.com/blang/semver/v4 v4.0.0 // indirect
98-
github.com/cenkalti/backoff/v3 v3.2.2 // indirect
99103
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
104+
github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
100105
github.com/cespare/xxhash/v2 v2.3.0 // indirect
101106
github.com/chai2010/gettext-go v1.0.2 // indirect
102-
github.com/cloudflare/circl v1.3.9 // indirect
107+
github.com/cloudflare/circl v1.4.0 // indirect
108+
github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78 // indirect
103109
github.com/containerd/continuity v0.4.3 // indirect
104-
github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
110+
github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
105111
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
106-
github.com/docker/cli v27.1.2+incompatible // indirect
107-
github.com/docker/docker v27.1.2+incompatible // indirect
112+
github.com/docker/cli v27.3.1+incompatible // indirect
113+
github.com/docker/docker v27.3.1+incompatible // indirect
108114
github.com/docker/go-connections v0.5.0 // indirect
109115
github.com/docker/go-units v0.5.0 // indirect
110116
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
117+
github.com/envoyproxy/go-control-plane v0.13.0 // indirect
118+
github.com/envoyproxy/protoc-gen-validate v1.1.0 // indirect
111119
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
112120
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
113-
github.com/fatih/color v1.17.0 // indirect
121+
github.com/fatih/color v1.18.0 // indirect
114122
github.com/felixge/httpsnoop v1.0.4 // indirect
115123
github.com/fluxcd/pkg/envsubst v1.1.0 // indirect
116124
github.com/fluxcd/pkg/sourceignore v0.8.0 // indirect
@@ -121,14 +129,14 @@ require (
121129
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
122130
github.com/go-git/go-billy/v5 v5.5.0 // indirect
123131
github.com/go-git/go-git/v5 v5.12.0 // indirect
124-
github.com/go-jose/go-jose/v4 v4.0.2 // indirect
132+
github.com/go-jose/go-jose/v4 v4.0.4 // indirect
125133
github.com/go-logr/logr v1.4.2 // indirect
126134
github.com/go-logr/stdr v1.2.2 // indirect
127135
github.com/go-logr/zapr v1.3.0 // indirect
128136
github.com/go-openapi/jsonpointer v0.21.0 // indirect
129137
github.com/go-openapi/jsonreference v0.21.0 // indirect
130138
github.com/go-openapi/swag v0.23.0 // indirect
131-
github.com/go-viper/mapstructure/v2 v2.0.0 // indirect
139+
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
132140
github.com/gogo/protobuf v1.3.2 // indirect
133141
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
134142
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
@@ -140,8 +148,8 @@ require (
140148
github.com/google/s2a-go v0.1.8 // indirect
141149
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
142150
github.com/google/uuid v1.6.0 // indirect
143-
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
144-
github.com/googleapis/gax-go/v2 v2.13.0 // indirect
151+
github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect
152+
github.com/googleapis/gax-go/v2 v2.14.0 // indirect
145153
github.com/gorilla/websocket v1.5.0 // indirect
146154
github.com/goware/prefixer v0.0.0-20160118172347-395022866408 // indirect
147155
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
@@ -152,7 +160,7 @@ require (
152160
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
153161
github.com/hashicorp/go-secure-stdlib/parseutil v0.1.8 // indirect
154162
github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect
155-
github.com/hashicorp/go-sockaddr v1.0.6 // indirect
163+
github.com/hashicorp/go-sockaddr v1.0.7 // indirect
156164
github.com/hashicorp/hcl v1.0.0 // indirect
157165
github.com/imdario/mergo v0.3.16 // indirect
158166
github.com/inconshreveable/mousetrap v1.1.0 // indirect
@@ -184,6 +192,7 @@ require (
184192
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
185193
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
186194
github.com/pkg/errors v0.9.1 // indirect
195+
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
187196
github.com/prometheus/client_golang v1.20.3 // indirect
188197
github.com/prometheus/client_model v0.6.1 // indirect
189198
github.com/prometheus/common v0.55.0 // indirect
@@ -192,37 +201,41 @@ require (
192201
github.com/ryanuber/go-glob v1.0.0 // indirect
193202
github.com/sirupsen/logrus v1.9.3 // indirect
194203
github.com/spf13/cobra v1.8.1 // indirect
195-
github.com/urfave/cli v1.22.15 // indirect
204+
github.com/urfave/cli v1.22.16 // indirect
196205
github.com/x448/float16 v0.8.4 // indirect
197206
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
198207
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
199208
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
200209
github.com/xlab/treeprint v1.2.0 // indirect
201210
github.com/zeebo/blake3 v0.2.3 // indirect
202211
go.opencensus.io v0.24.0 // indirect
203-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
204-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
205-
go.opentelemetry.io/otel v1.28.0 // indirect
206-
go.opentelemetry.io/otel/metric v1.28.0 // indirect
207-
go.opentelemetry.io/otel/trace v1.28.0 // indirect
212+
go.opentelemetry.io/contrib/detectors/gcp v1.29.0 // indirect
213+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.55.0 // indirect
214+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.55.0 // indirect
215+
go.opentelemetry.io/otel v1.30.0 // indirect
216+
go.opentelemetry.io/otel/metric v1.30.0 // indirect
217+
go.opentelemetry.io/otel/sdk v1.29.0 // indirect
218+
go.opentelemetry.io/otel/sdk/metric v1.29.0 // indirect
219+
go.opentelemetry.io/otel/trace v1.30.0 // indirect
208220
go.starlark.net v0.0.0-20231121155337-90ade8b19d09 // indirect
209221
go.uber.org/multierr v1.11.0 // indirect
210222
go.uber.org/zap v1.27.0 // indirect
211-
golang.org/x/crypto v0.27.0 // indirect
223+
golang.org/x/crypto v0.29.0 // indirect
212224
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
213-
golang.org/x/oauth2 v0.23.0 // indirect
214-
golang.org/x/sync v0.8.0 // indirect
215-
golang.org/x/sys v0.25.0 // indirect
216-
golang.org/x/term v0.24.0 // indirect
217-
golang.org/x/text v0.18.0 // indirect
218-
golang.org/x/time v0.6.0 // indirect
225+
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
230+
golang.org/x/time v0.8.0 // indirect
219231
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
220-
google.golang.org/api v0.191.0 // indirect
221-
google.golang.org/genproto v0.0.0-20240730163845-b1a4ccb954bf // indirect
222-
google.golang.org/genproto/googleapis/api v0.0.0-20240725223205-93522f1f2a9f // indirect
223-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240730163845-b1a4ccb954bf // indirect
224-
google.golang.org/grpc v1.65.0 // indirect
225-
google.golang.org/protobuf v1.34.2 // indirect
232+
google.golang.org/api v0.209.0 // indirect
233+
google.golang.org/genproto v0.0.0-20241113202542-65e8d215514f // indirect
234+
google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect
235+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241113202542-65e8d215514f // indirect
236+
google.golang.org/grpc v1.68.0 // indirect
237+
google.golang.org/grpc/stats/opentelemetry v0.0.0-20240907200651-3ffb98b2c93a // indirect
238+
google.golang.org/protobuf v1.35.2 // indirect
226239
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
227240
gopkg.in/inf.v0 v0.9.1 // indirect
228241
gopkg.in/ini.v1 v1.67.0 // indirect

0 commit comments

Comments
 (0)