Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
227 changes: 127 additions & 100 deletions go.mod

Large diffs are not rendered by default.

521 changes: 278 additions & 243 deletions go.sum

Large diffs are not rendered by default.

10 changes: 0 additions & 10 deletions pkg/manifests/manifests.go
Original file line number Diff line number Diff line change
Expand Up @@ -2547,16 +2547,6 @@ func (f *Factory) NewService(manifest []byte) (*v1.Service, error) {
return &s, nil
}

func (f *Factory) NewEndpoints(manifest []byte) (*v1.Endpoints, error) {
e := v1.Endpoints{}
err := decodeYAML(manifest, &e)
if err != nil {
return nil, err
}

return &e, nil
}

func (f *Factory) NewRoute(manifest []byte) (*routev1.Route, error) {
r := routev1.Route{}
err := decodeYAML(manifest, &r)
Expand Down
4 changes: 2 additions & 2 deletions pkg/server/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ import (
"k8s.io/apiserver/pkg/authorization/authorizer"
"k8s.io/apiserver/pkg/authorization/union"
genericapiserver "k8s.io/apiserver/pkg/server"
"k8s.io/apiserver/pkg/util/compatibility"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/rest"
"k8s.io/component-base/version"
"k8s.io/klog/v2"

"github.com/openshift/cluster-monitoring-operator/pkg/configvalidate"
Expand Down Expand Up @@ -109,7 +109,7 @@ func (s *Server) Run(ctx context.Context, collectionProfilesEnabled bool) error
serverConfig.Authorization.Authorizer,
)

serverConfig.EffectiveVersion = version.DefaultBuildEffectiveVersion()
serverConfig.EffectiveVersion = compatibility.DefaultBuildEffectiveVersion()

server, err = serverConfig.Complete(nil).New(s.name, genericapiserver.NewEmptyDelegate())
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion vendor/cel.dev/expr/.bazelversion
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
7.0.1
7.3.2
# Keep this pinned version in parity with cel-go
34 changes: 19 additions & 15 deletions vendor/cel.dev/expr/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -8,26 +8,38 @@ bazel_dep(
)
bazel_dep(
name = "gazelle",
version = "0.36.0",
version = "0.39.1",
repo_name = "bazel_gazelle",
)
bazel_dep(
name = "googleapis",
version = "0.0.0-20240819-fe8ba054a",
version = "0.0.0-20241220-5e258e33.bcr.1",
repo_name = "com_google_googleapis",
)
bazel_dep(
name = "googleapis-cc",
version = "1.0.0",
)
bazel_dep(
name = "googleapis-java",
version = "1.0.0",
)
bazel_dep(
name = "googleapis-go",
version = "1.0.0",
)
bazel_dep(
name = "protobuf",
version = "26.0",
version = "27.0",
repo_name = "com_google_protobuf",
)
bazel_dep(
name = "rules_cc",
version = "0.0.9",
version = "0.0.17",
)
bazel_dep(
name = "rules_go",
version = "0.49.0",
version = "0.53.0",
repo_name = "io_bazel_rules_go",
)
bazel_dep(
Expand All @@ -36,7 +48,7 @@ bazel_dep(
)
bazel_dep(
name = "rules_proto",
version = "6.0.0",
version = "7.0.2",
)
bazel_dep(
name = "rules_python",
Expand All @@ -50,16 +62,8 @@ python.toolchain(
python_version = "3.11",
)

switched_rules = use_extension("@com_google_googleapis//:extensions.bzl", "switched_rules")
switched_rules.use_languages(
cc = True,
go = True,
java = True,
)
use_repo(switched_rules, "com_google_googleapis_imports")

go_sdk = use_extension("@io_bazel_rules_go//go:extensions.bzl", "go_sdk")
go_sdk.download(version = "1.21.1")
go_sdk.download(version = "1.22.0")

go_deps = use_extension("@bazel_gazelle//:extensions.bzl", "go_deps")
go_deps.from_file(go_mod = "//:go.mod")
Expand Down
2 changes: 1 addition & 1 deletion vendor/cel.dev/expr/cloudbuild.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
steps:
- name: 'gcr.io/cloud-builders/bazel:7.0.1'
- name: 'gcr.io/cloud-builders/bazel:7.3.2'
entrypoint: bazel
args: ['build', '...']
id: bazel-build
Expand Down
Loading