Skip to content

[mcr25.0] Bump dependencies to fix CVEs#10

Merged
smerkviladze merged 4 commits into
Mirantis:mcr25.0from
smerkviladze:mcr25-cve-fixes
Jul 9, 2026
Merged

[mcr25.0] Bump dependencies to fix CVEs#10
smerkviladze merged 4 commits into
Mirantis:mcr25.0from
smerkviladze:mcr25-cve-fixes

Conversation

@smerkviladze

@smerkviladze smerkviladze commented Jul 8, 2026

Copy link
Copy Markdown
Collaborator

Bump:

  • golang.org/x/* dependencies
  • google.golang.org/grpc to v1.80.0
  • go.opentelemetry.io/otel, otel/trace, otel/metric*, otel/sdk to v1.43.0
  • go.opentelemetry.io/otel/exporters/otlp/otlptrace{,grpc,http} to v1.39.0
  • go.opentelemetry.io/contrib/instrumentation (otelgrpc, otelhttp, otelhttptrace) to v0.48.0
  • Mirantis/buildkit to v0.13.0-beta1-m.2 (to fix conflicting Schema URL issue)

Signed-off-by: Sopho Merkviladze <smerkviladze@mirantis.com>
grpc >= v1.65.0 depends on go.opentelemetry.io/otel, so the OTel stack
is bumped in lockstep: otel v1.14.0 -> v1.39.0, contrib instrumentation
(otelgrpc, otelhttp, otelhttptrace) v0.40.0 -> v0.48.0, protobuf v1.36.11.

otelgrpc is capped at v0.48.0: v0.49.0 removed the interceptor API still
used by the vendored Mirantis buildkit fork.

Signed-off-by: Sopho Merkviladze <smerkviladze@mirantis.com>
Signed-off-by: Sopho Merkviladze <smerkviladze@mirantis.com>
@smerkviladze smerkviladze marked this pull request as ready for review July 8, 2026 13:28
@smerkviladze smerkviladze requested review from corhere and dperny July 8, 2026 13:28

@corhere corhere left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Looks like some OTEL SDK hell still needs to be addressed. E.g.:

=== FAIL: tests TestIntegration/TestImageIDOutput/worker=docker (1.53s)
ERROR: conflicting Schema URL: https://opentelemetry.io/schemas/1.40.0 and https://opentelemetry.io/schemas/1.17.0
    build.go:165: 
        	Error Trace:	/src/tests/build.go:165
        	            				/src/vendor/github.com/moby/buildkit/util/testutil/integration/run.go:91
        	            				/src/vendor/github.com/moby/buildkit/util/testutil/integration/run.go:205
        	Error:      	Received unexpected error:
        	            	exit status 1
        	Test:       	TestIntegration/TestImageIDOutput/worker=docker

Mirantis/buildkit@9863dd3 (or Mirantis/buildkit@9cbf3ac) will need to be cherry-picked to our buildkit v0.13-beta branch to resolve this.

Picks up the backport of moby/buildkit 9863dd307 (detect: sever
semconv relationship to otel sdk).

Signed-off-by: Sopho Merkviladze <smerkviladze@mirantis.com>
@smerkviladze

Copy link
Copy Markdown
Collaborator Author

Looks like some OTEL SDK hell still needs to be addressed. E.g.:

=== FAIL: tests TestIntegration/TestImageIDOutput/worker=docker (1.53s)
ERROR: conflicting Schema URL: https://opentelemetry.io/schemas/1.40.0 and https://opentelemetry.io/schemas/1.17.0
    build.go:165: 
        	Error Trace:	/src/tests/build.go:165
        	            				/src/vendor/github.com/moby/buildkit/util/testutil/integration/run.go:91
        	            				/src/vendor/github.com/moby/buildkit/util/testutil/integration/run.go:205
        	Error:      	Received unexpected error:
        	            	exit status 1
        	Test:       	TestIntegration/TestImageIDOutput/worker=docker

Mirantis/buildkit@9863dd3 (or Mirantis/buildkit@9cbf3ac) will need to be cherry-picked to our buildkit v0.13-beta branch to resolve this.

Done. Thank you!

@smerkviladze smerkviladze merged commit 2b0dc2f into Mirantis:mcr25.0 Jul 9, 2026
24 of 62 checks passed
@smerkviladze smerkviladze deleted the mcr25-cve-fixes branch July 9, 2026 18:06
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.

2 participants