Skip to content

Commit fa1b5c8

Browse files
committed
deps: Bump packages to resolve compilation error
The compilation has started to fail after a recent dependency bump. ```sh $ make hack/build-go.sh Using version from git... Building github.com/openshift/cluster-version-operator (v1.0.0-1311-g25f02d1c) # k8s.io/apiserver/pkg/endpoints vendor/k8s.io/apiserver/pkg/endpoints/installer.go:701:3: cannot use resetFields (variable of type map[fieldpath.APIVersion]*fieldpath.Set) as map[fieldpath.APIVersion]fieldpath.Filter value in argument to managedfields.NewDefaultFieldManager make: *** [Makefile:7: build] Error 1 ``` Bump the mentioned k8s.io/apiserver/pkg/endpoints package to resolve the issue. ```sh $ go get k8s.io/apiserver/pkg/endpoints ``` However, a new error is discovered by bumping the package. ```sh $ go mod tidy go: finding module for package k8s.io/apiserver/pkg/util/version go: github.com/openshift/cluster-version-operator/cmd imports github.com/openshift/library-go/pkg/controller/controllercmd imports github.com/openshift/library-go/pkg/config/serving imports k8s.io/apiserver/pkg/util/version: module k8s.io/apiserver@latest found (v0.32.1), but does not contain package k8s.io/apiserver/pkg/util/version ``` Bump the github.com/openshift/library-go/pkg/config/serving to resolve the issue. ```sh $ go get github.com/openshift/library-go/pkg/config/serving $ go mod tidy $ go mod vendor ```
1 parent 25f02d1 commit fa1b5c8

File tree

334 files changed

+19429
-11635
lines changed

Some content is hidden

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

334 files changed

+19429
-11635
lines changed

go.mod

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ require (
1212
github.com/google/uuid v1.6.0
1313
github.com/openshift/api v0.0.0-20250130171037-7bb8a0201a56
1414
github.com/openshift/client-go v0.0.0-20250131180035-f7ec47e2d87a
15-
github.com/openshift/library-go v0.0.0-20241107160307-0064ad7bd060
15+
github.com/openshift/library-go v0.0.0-20250203131244-80620876b7c2
1616
github.com/operator-framework/api v0.17.1
1717
github.com/operator-framework/operator-lifecycle-manager v0.22.0
1818
github.com/pkg/errors v0.9.1
@@ -26,15 +26,16 @@ require (
2626
gopkg.in/fsnotify.v1 v1.4.7
2727
gopkg.in/yaml.v3 v3.0.1
2828
k8s.io/api v0.32.1
29-
k8s.io/apiextensions-apiserver v0.31.1
29+
k8s.io/apiextensions-apiserver v0.32.1
3030
k8s.io/apimachinery v0.32.1
3131
k8s.io/client-go v0.32.1
3232
k8s.io/klog/v2 v2.130.1
33-
k8s.io/kube-aggregator v0.31.1
33+
k8s.io/kube-aggregator v0.32.1
3434
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
3535
)
3636

3737
require (
38+
cel.dev/expr v0.18.0 // indirect
3839
github.com/NYTimes/gziphandler v1.1.1 // indirect
3940
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
4041
github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 // indirect
@@ -55,7 +56,8 @@ require (
5556
github.com/go-openapi/swag v0.23.0 // indirect
5657
github.com/gogo/protobuf v1.3.2 // indirect
5758
github.com/golang/protobuf v1.5.4 // indirect
58-
github.com/google/cel-go v0.20.1 // indirect
59+
github.com/google/btree v1.0.1 // indirect
60+
github.com/google/cel-go v0.22.0 // indirect
5961
github.com/google/gnostic-models v0.6.8 // indirect
6062
github.com/google/gofuzz v1.2.0 // indirect
6163
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
@@ -75,11 +77,11 @@ require (
7577
github.com/robfig/cron v1.2.0 // indirect
7678
github.com/sirupsen/logrus v1.9.3 // indirect
7779
github.com/spf13/pflag v1.0.5 // indirect
78-
github.com/stoewer/go-strcase v1.2.0 // indirect
80+
github.com/stoewer/go-strcase v1.3.0 // indirect
7981
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
82+
go.etcd.io/etcd/api/v3 v3.5.16 // indirect
83+
go.etcd.io/etcd/client/pkg/v3 v3.5.16 // indirect
84+
go.etcd.io/etcd/client/v3 v3.5.16 // indirect
8385
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
8486
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
8587
go.opentelemetry.io/otel v1.28.0 // indirect
@@ -90,26 +92,26 @@ require (
9092
go.opentelemetry.io/otel/trace v1.28.0 // indirect
9193
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
9294
go.uber.org/multierr v1.11.0 // indirect
93-
go.uber.org/zap v1.26.0 // indirect
94-
golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc // indirect
95+
go.uber.org/zap v1.27.0 // indirect
96+
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
9597
golang.org/x/oauth2 v0.23.0 // indirect
9698
golang.org/x/sync v0.9.0 // indirect
9799
golang.org/x/sys v0.27.0 // indirect
98100
golang.org/x/term v0.26.0 // indirect
99101
golang.org/x/text v0.20.0 // indirect
100-
google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect
101-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
102+
google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7 // indirect
103+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 // indirect
102104
google.golang.org/grpc v1.65.0 // indirect
103105
google.golang.org/protobuf v1.35.1 // indirect
104106
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
105107
gopkg.in/inf.v0 v0.9.1 // indirect
106108
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
107109
gopkg.in/yaml.v2 v2.4.0 // indirect
108-
k8s.io/apiserver v0.31.1 // indirect
109-
k8s.io/component-base v0.31.1 // indirect
110-
k8s.io/kms v0.31.1 // indirect
110+
k8s.io/apiserver v0.32.1 // indirect
111+
k8s.io/component-base v0.32.1 // indirect
112+
k8s.io/kms v0.32.1 // indirect
111113
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
112-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
114+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
113115
sigs.k8s.io/controller-runtime v0.12.1 // indirect
114116
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
115117
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect

go.sum

Lines changed: 50 additions & 50 deletions
Large diffs are not rendered by default.

vendor/cel.dev/expr/.bazelversion

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
7.0.1
2+
# Keep this pinned version in parity with cel-go

vendor/cel.dev/expr/.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
*.pb.go linguist-generated=true
2+
*.pb.go -diff -merge

vendor/cel.dev/expr/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
bazel-*
2+
MODULE.bazel.lock

vendor/cel.dev/expr/BUILD.bazel

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
load("@io_bazel_rules_go//go:def.bzl", "go_library")
2+
3+
package(default_visibility = ["//visibility:public"])
4+
5+
licenses(["notice"]) # Apache 2.0
6+
7+
go_library(
8+
name = "expr",
9+
srcs = [
10+
"checked.pb.go",
11+
"eval.pb.go",
12+
"explain.pb.go",
13+
"syntax.pb.go",
14+
"value.pb.go",
15+
],
16+
importpath = "cel.dev/expr",
17+
visibility = ["//visibility:public"],
18+
deps = [
19+
"@org_golang_google_genproto_googleapis_rpc//status:go_default_library",
20+
"@org_golang_google_protobuf//reflect/protoreflect",
21+
"@org_golang_google_protobuf//runtime/protoimpl",
22+
"@org_golang_google_protobuf//types/known/anypb",
23+
"@org_golang_google_protobuf//types/known/durationpb",
24+
"@org_golang_google_protobuf//types/known/emptypb",
25+
"@org_golang_google_protobuf//types/known/structpb",
26+
"@org_golang_google_protobuf//types/known/timestamppb",
27+
],
28+
)
29+
30+
alias(
31+
name = "go_default_library",
32+
actual = ":expr",
33+
visibility = ["//visibility:public"],
34+
)
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Contributor Code of Conduct
2+
## Version 0.1.1 (adapted from 0.3b-angular)
3+
4+
As contributors and maintainers of the Common Expression Language
5+
(CEL) project, we pledge to respect everyone who contributes by
6+
posting issues, updating documentation, submitting pull requests,
7+
providing feedback in comments, and any other activities.
8+
9+
Communication through any of CEL's channels (GitHub, Gitter, IRC,
10+
mailing lists, Google+, Twitter, etc.) must be constructive and never
11+
resort to personal attacks, trolling, public or private harassment,
12+
insults, or other unprofessional conduct.
13+
14+
We promise to extend courtesy and respect to everyone involved in this
15+
project regardless of gender, gender identity, sexual orientation,
16+
disability, age, race, ethnicity, religion, or level of experience. We
17+
expect anyone contributing to the project to do the same.
18+
19+
If any member of the community violates this code of conduct, the
20+
maintainers of the CEL project may take action, removing issues,
21+
comments, and PRs or blocking accounts as deemed appropriate.
22+
23+
If you are subject to or witness unacceptable behavior, or have any
24+
other concerns, please email us at
25+

vendor/cel.dev/expr/CONTRIBUTING.md

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# How to Contribute
2+
3+
We'd love to accept your patches and contributions to this project. There are a
4+
few guidelines you need to follow.
5+
6+
## Contributor License Agreement
7+
8+
Contributions to this project must be accompanied by a Contributor License
9+
Agreement. You (or your employer) retain the copyright to your contribution,
10+
this simply gives us permission to use and redistribute your contributions as
11+
part of the project. Head over to <https://cla.developers.google.com/> to see
12+
your current agreements on file or to sign a new one.
13+
14+
You generally only need to submit a CLA once, so if you've already submitted one
15+
(even if it was for a different project), you probably don't need to do it
16+
again.
17+
18+
## Code reviews
19+
20+
All submissions, including submissions by project members, require review. We
21+
use GitHub pull requests for this purpose. Consult
22+
[GitHub Help](https://help.github.com/articles/about-pull-requests/) for more
23+
information on using pull requests.
24+
25+
## What to expect from maintainers
26+
27+
Expect maintainers to respond to new issues or pull requests within a week.
28+
For outstanding and ongoing issues and particularly for long-running
29+
pull requests, expect the maintainers to review within a week of a
30+
contributor asking for a new review. There is no commitment to resolution --
31+
merging or closing a pull request, or fixing or closing an issue -- because some
32+
issues will require more discussion than others.

vendor/cel.dev/expr/GOVERNANCE.md

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
# Project Governance
2+
3+
This document defines the governance process for the CEL language. CEL is
4+
Google-developed, but openly governed. Major contributors to the CEL
5+
specification and its corresponding implementations constitute the CEL
6+
Language Council. New members may be added by a unanimous vote of the
7+
Council.
8+
9+
The MAINTAINERS.md file lists the members of the CEL Language Council, and
10+
unofficially indicates the "areas of expertise" of each member with respect
11+
to the publicly available CEL repos.
12+
13+
## Code Changes
14+
15+
Code changes must follow the standard pull request (PR) model documented in the
16+
CONTRIBUTING.md for each CEL repo. All fixes and features must be reviewed by a
17+
maintainer. The maintainer reserves the right to request that any feature
18+
request (FR) or PR be reviewed by the language council.
19+
20+
## Syntax and Semantic Changes
21+
22+
Syntactic and semantic changes must be reviewed by the CEL Language Council.
23+
Maintainers may also request language council review at their discretion.
24+
25+
The review process is as follows:
26+
27+
- Create a Feature Request in the CEL-Spec repo. The feature description will
28+
serve as an abstract for the detailed design document.
29+
- Co-develop a design document with the Language Council.
30+
- Once the proposer gives the design document approval, the document will be
31+
linked to the FR in the CEL-Spec repo and opened for comments to members of
32+
33+
- The Language Council will review the design doc at the next council meeting
34+
(once every three weeks) and the council decision included in the document.
35+
36+
If the proposal is approved, the spec will be updated by a maintainer (if
37+
applicable) and a rationale will be included in the CEL-Spec wiki to ensure
38+
future developers may follow CEL's growth and direction over time.
39+
40+
Approved proposals may be implemented by the proposer or by the maintainers as
41+
the parties see fit. At the discretion of the maintainer, changes from the
42+
approved design are permitted during implementation if they improve the user
43+
experience and clarity of the feature.

0 commit comments

Comments
 (0)