Skip to content

Commit 7b8f13b

Browse files
Merge pull request #960 from jhadvig/OCPBUGS-48740
OCPBUGS-48740: Vendor the missing CSP directives
2 parents 6f2500b + fcdfdfb commit 7b8f13b

File tree

2,260 files changed

+73552
-57200
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,260 files changed

+73552
-57200
lines changed

go.mod

Lines changed: 40 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module github.com/openshift/console-operator
22

3-
go 1.22.0
3+
go 1.23.0
44

5-
toolchain go1.22.4
5+
toolchain go1.23.6
66

77
require (
88
github.com/blang/semver v3.5.1+incompatible
@@ -11,23 +11,24 @@ require (
1111
github.com/go-bindata/go-bindata v3.1.2+incompatible
1212
github.com/go-test/deep v1.0.5
1313
github.com/google/go-cmp v0.6.0
14-
github.com/openshift/api v0.0.0-20241211151016-1a7b90faeadf
15-
github.com/openshift/build-machinery-go v0.0.0-20240613134303-8359781da660
16-
github.com/openshift/client-go v0.0.0-20241001162912-da6d55e4611f
17-
github.com/openshift/library-go v0.0.0-20241023193830-022ad9c25e39
14+
github.com/openshift/api v0.0.0-20250128184011-806af1f2b3bc
15+
github.com/openshift/build-machinery-go v0.0.0-20250102153059-e85a1a7ecb5c
16+
github.com/openshift/client-go v0.0.0-20250125113824-8e1f0b8fa9a7
17+
github.com/openshift/library-go v0.0.0-20250127111945-0f76e23726cd
1818
github.com/spf13/cobra v1.8.1
19-
golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1
19+
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
2020
gopkg.in/yaml.v2 v2.4.0
21-
k8s.io/api v0.31.1
22-
k8s.io/apiextensions-apiserver v0.31.1
23-
k8s.io/apimachinery v0.31.1
24-
k8s.io/client-go v0.31.1
25-
k8s.io/component-base v0.31.1
21+
k8s.io/api v0.32.1
22+
k8s.io/apiextensions-apiserver v0.32.1
23+
k8s.io/apimachinery v0.32.1
24+
k8s.io/client-go v0.32.1
25+
k8s.io/component-base v0.32.1
2626
k8s.io/klog/v2 v2.130.1
27-
k8s.io/utils v0.0.0-20240921022957-49e7df575cb6
27+
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
2828
)
2929

3030
require (
31+
cel.dev/expr v0.18.0 // indirect
3132
github.com/NYTimes/gziphandler v1.1.1 // indirect
3233
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
3334
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
@@ -45,16 +46,16 @@ require (
4546
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
4647
github.com/go-logr/logr v1.4.2 // indirect
4748
github.com/go-logr/stdr v1.2.2 // indirect
48-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
49+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
4950
github.com/go-openapi/jsonreference v0.20.2 // indirect
50-
github.com/go-openapi/swag v0.22.4 // indirect
51+
github.com/go-openapi/swag v0.23.0 // indirect
5152
github.com/gogo/protobuf v1.3.2 // indirect
52-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
5353
github.com/golang/protobuf v1.5.4 // indirect
54-
github.com/google/cel-go v0.20.1 // indirect
54+
github.com/google/btree v1.0.1 // indirect
55+
github.com/google/cel-go v0.22.0 // indirect
5556
github.com/google/gnostic-models v0.6.8 // indirect
5657
github.com/google/gofuzz v1.2.0 // indirect
57-
github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect
58+
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
5859
github.com/google/uuid v1.6.0 // indirect
5960
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
6061
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
@@ -77,9 +78,9 @@ require (
7778
github.com/spf13/pflag v1.0.5 // indirect
7879
github.com/stoewer/go-strcase v1.3.0 // indirect
7980
github.com/x448/float16 v0.8.4 // indirect
80-
go.etcd.io/etcd/api/v3 v3.5.14 // indirect
81-
go.etcd.io/etcd/client/pkg/v3 v3.5.14 // indirect
82-
go.etcd.io/etcd/client/v3 v3.5.14 // indirect
81+
go.etcd.io/etcd/api/v3 v3.5.16 // indirect
82+
go.etcd.io/etcd/client/pkg/v3 v3.5.16 // indirect
83+
go.etcd.io/etcd/client/v3 v3.5.16 // indirect
8384
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
8485
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
8586
go.opentelemetry.io/otel v1.28.0 // indirect
@@ -90,30 +91,30 @@ require (
9091
go.opentelemetry.io/otel/trace v1.28.0 // indirect
9192
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
9293
go.uber.org/multierr v1.11.0 // indirect
93-
go.uber.org/zap v1.26.0 // indirect
94-
golang.org/x/crypto v0.27.0 // indirect
95-
golang.org/x/net v0.29.0 // indirect
96-
golang.org/x/oauth2 v0.21.0 // indirect
94+
go.uber.org/zap v1.27.0 // indirect
95+
golang.org/x/crypto v0.28.0 // indirect
96+
golang.org/x/net v0.30.0 // indirect
97+
golang.org/x/oauth2 v0.23.0 // indirect
9798
golang.org/x/sync v0.8.0 // indirect
98-
golang.org/x/sys v0.25.0 // indirect
99-
golang.org/x/term v0.24.0 // indirect
100-
golang.org/x/text v0.18.0 // indirect
101-
golang.org/x/time v0.3.0 // indirect
102-
google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect
103-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
99+
golang.org/x/sys v0.26.0 // indirect
100+
golang.org/x/term v0.25.0 // indirect
101+
golang.org/x/text v0.19.0 // indirect
102+
golang.org/x/time v0.7.0 // indirect
103+
google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7 // indirect
104+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 // indirect
104105
google.golang.org/grpc v1.65.0 // indirect
105-
google.golang.org/protobuf v1.34.2 // indirect
106+
google.golang.org/protobuf v1.35.1 // indirect
106107
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
107108
gopkg.in/inf.v0 v0.9.1 // indirect
108109
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
109110
gopkg.in/yaml.v3 v3.0.1 // indirect
110-
k8s.io/apiserver v0.31.1 // indirect
111-
k8s.io/kms v0.31.1 // indirect
112-
k8s.io/kube-aggregator v0.31.1 // indirect
113-
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
114-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
115-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
111+
k8s.io/apiserver v0.32.1 // indirect
112+
k8s.io/kms v0.32.1 // indirect
113+
k8s.io/kube-aggregator v0.32.1 // indirect
114+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
115+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
116+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
116117
sigs.k8s.io/kube-storage-version-migrator v0.0.6-0.20230721195810-5c8923c5ff96 // indirect
117-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
118+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
118119
sigs.k8s.io/yaml v1.4.0 // indirect
119120
)

0 commit comments

Comments
 (0)