Skip to content

Bump to Submariner 0.22.0-m0#2296

Merged
openshift-merge-bot[bot] merged 1 commit intostolostron:mainfrom
tpantelis:bump_subm_m0
Jul 15, 2025
Merged

Bump to Submariner 0.22.0-m0#2296
openshift-merge-bot[bot] merged 1 commit intostolostron:mainfrom
tpantelis:bump_subm_m0

Conversation

@tpantelis
Copy link
Copy Markdown
Collaborator

No description provided.

@skitt
Copy link
Copy Markdown
Member

skitt commented Jul 11, 2025

/approve

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jul 11, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: skitt

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
@sonarqubecloud
Copy link
Copy Markdown

Comment thread go.mod

// The following dependency has an API incompatibility with k8s.io/apiserver v0.33.x
// so downgrade to the previous minor version.
replace go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc => go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0
Copy link
Copy Markdown
Collaborator Author

@tpantelis tpantelis Jul 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@skitt The API incompatibility is

k8s.io/apiserver/pkg/storage/storagebackend/factory/etcd3.go:328:39: undefined: otelgrpc.UnaryClientInterceptor

UnaryClientInterceptor was removed by open-telemetry/opentelemetry-go-contrib#7115.

The otelgrpc dependency is introduced by cloud-prepare -> google.golang.org/api -> go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc. It was google.golang.org/api@v0.236.0 that bumped otelgrpc to v0.61.0 so we could downgrade it and pin to v0.236.0. Not sure what the best thing to do is but it seems pinning otelgrpc to v0.60.0 is the most sensible option.

BTW, k8s.io/apiserver 1.34.0 alpha only bumps otelgrpc to v0.60.0.

Copy link
Copy Markdown
Member

@skitt skitt Jul 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree pinning otelgrpc is the most sensible solution, I didn’t lgtm along with my approve because I’d rather have an additional pair of eyes on this.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems best to pin otelgrpc to me as well. Thanks for the detailed write-up Tom.

@tpantelis
Copy link
Copy Markdown
Collaborator Author

/cc @vthapar @dfarrell07

@openshift-ci openshift-ci Bot requested review from dfarrell07 and vthapar July 15, 2025 11:51
@dfarrell07
Copy link
Copy Markdown
Contributor

/lgtm

@openshift-ci openshift-ci Bot added the lgtm label Jul 15, 2025
@openshift-merge-bot openshift-merge-bot Bot merged commit dbe2e43 into stolostron:main Jul 15, 2025
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants