Skip to content

STOR-2597,STOR-2627: Rebase aws-ebs-csi-driver to v1.48.0 for OCP 4.21 - #294

Merged
openshift-merge-bot[bot] merged 99 commits into
openshift:masterfrom
jsafrane:rebase-v1.48.0
Nov 3, 2025
Merged

STOR-2597,STOR-2627: Rebase aws-ebs-csi-driver to v1.48.0 for OCP 4.21#294
openshift-merge-bot[bot] merged 99 commits into
openshift:masterfrom
jsafrane:rebase-v1.48.0

Conversation

@jsafrane

@jsafrane jsafrane commented Oct 20, 2025

Copy link
Copy Markdown

This PR rebases the OpenShift fork of aws-ebs-csi-driver from v1.45.0 to v1.48.0.

Upstream Changelogs

v1.46.0

v1.47.0

v1.48.0

  • Features:
    • Align node and controller metrics to consistent experience (#2558)
    • Auto-detect AWS Region from Config (#2425)
    • Call sts:GetCallerIdentity Just in Time instead of blocking on startup (#2620)
    • Add ability to use az-id for volume provisioning (#2613)
    • Add relabelings stanza for ServiceMonitor (#2594)
  • Improvements:
    • Refactor NewCloud (#2616)
    • Bump dependencies and sidecars

Diff Link

kubernetes-sigs/aws-ebs-csi-driver@v1.48.0...jsafrane:aws-ebs-csi-driver:rebase-v1.48.0

ConnorJC3 and others added 30 commits June 18, 2025 17:12
Signed-off-by: Connor Catlett <conncatl@amazon.com>
---
updated-dependencies:
- dependency-name: github.com/aws/aws-sdk-go-v2/service/ec2
  dependency-version: 1.226.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: misc-dependencies
- dependency-name: github.com/prometheus/common
  dependency-version: 0.65.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: misc-dependencies
- dependency-name: go.opentelemetry.io/otel
  dependency-version: 1.37.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: misc-dependencies
- dependency-name: go.opentelemetry.io/otel/exporters/otlp/otlptrace
  dependency-version: 1.37.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: misc-dependencies
- dependency-name: go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc
  dependency-version: 1.37.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: misc-dependencies
- dependency-name: go.opentelemetry.io/otel/sdk
  dependency-version: 1.37.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: misc-dependencies
- dependency-name: github.com/grpc-ecosystem/grpc-gateway/v2
  dependency-version: 2.27.1
  dependency-type: indirect
  update-type: version-update:semver-patch
  dependency-group: misc-dependencies
- dependency-name: go.opentelemetry.io/otel/metric
  dependency-version: 1.37.0
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: misc-dependencies
- dependency-name: go.opentelemetry.io/otel/trace
  dependency-version: 1.37.0
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: misc-dependencies
- dependency-name: github.com/aws/aws-sdk-go-v2/service/ec2
  dependency-version: 1.226.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: misc-dependencies
- dependency-name: github.com/prometheus/common
  dependency-version: 0.65.0
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: misc-dependencies
- dependency-name: go.opentelemetry.io/otel
  dependency-version: 1.37.0
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: misc-dependencies
- dependency-name: go.opentelemetry.io/otel/exporters/otlp/otlptrace
  dependency-version: 1.37.0
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: misc-dependencies
- dependency-name: go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc
  dependency-version: 1.37.0
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: misc-dependencies
- dependency-name: go.opentelemetry.io/otel/sdk
  dependency-version: 1.37.0
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: misc-dependencies
- dependency-name: github.com/grpc-ecosystem/grpc-gateway/v2
  dependency-version: 2.27.1
  dependency-type: indirect
  update-type: version-update:semver-patch
  dependency-group: misc-dependencies
- dependency-name: go.opentelemetry.io/otel/metric
  dependency-version: 1.37.0
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: misc-dependencies
- dependency-name: go.opentelemetry.io/otel/trace
  dependency-version: 1.37.0
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: misc-dependencies
- dependency-name: github.com/opencontainers/cgroups
  dependency-version: 0.0.3
  dependency-type: indirect
  update-type: version-update:semver-patch
  dependency-group: misc-dependencies
- dependency-name: github.com/stoewer/go-strcase
  dependency-version: 1.3.1
  dependency-type: indirect
  update-type: version-update:semver-patch
  dependency-group: misc-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
…ot/go_modules/misc-dependencies-3cc0db3ffc

Bump the misc-dependencies group across 2 directories with 11 updates
…ubernetes-sigs#2536)

* Bump the k8s-dependencies group across 2 directories with 8 updates

Bumps the k8s-dependencies group with 4 updates in the / directory: [k8s.io/api](https://github.com/kubernetes/api), [k8s.io/client-go](https://github.com/kubernetes/client-go), [k8s.io/component-base](https://github.com/kubernetes/component-base) and [k8s.io/mount-utils](https://github.com/kubernetes/mount-utils).
Bumps the k8s-dependencies group with 3 updates in the /tests/e2e directory: [k8s.io/kubernetes](https://github.com/kubernetes/kubernetes), [k8s.io/component-helpers](https://github.com/kubernetes/component-helpers) and [k8s.io/csi-translation-lib](https://github.com/kubernetes/csi-translation-lib).


Updates `k8s.io/api` from 0.33.1 to 0.33.2
- [Commits](kubernetes/api@v0.33.1...v0.33.2)

Updates `k8s.io/apimachinery` from 0.33.1 to 0.33.2
- [Commits](kubernetes/apimachinery@v0.33.1...v0.33.2)

Updates `k8s.io/client-go` from 0.33.1 to 0.33.2
- [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md)
- [Commits](kubernetes/client-go@v0.33.1...v0.33.2)

Updates `k8s.io/component-base` from 0.33.1 to 0.33.2
- [Commits](kubernetes/component-base@v0.33.1...v0.33.2)

Updates `k8s.io/mount-utils` from 0.33.1 to 0.33.2
- [Commits](kubernetes/mount-utils@v0.33.1...v0.33.2)

Updates `k8s.io/kubernetes` from 1.33.1 to 1.33.2
- [Release notes](https://github.com/kubernetes/kubernetes/releases)
- [Commits](kubernetes/kubernetes@v1.33.1...v1.33.2)

Updates `k8s.io/component-helpers` from 0.33.1 to 0.33.2
- [Commits](kubernetes/component-helpers@v0.33.1...v0.33.2)

Updates `k8s.io/csi-translation-lib` from 0.33.1 to 0.33.2
- [Commits](kubernetes/csi-translation-lib@v0.33.1...v0.33.2)

---
updated-dependencies:
- dependency-name: k8s.io/api
  dependency-version: 0.33.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-dependencies
- dependency-name: k8s.io/apimachinery
  dependency-version: 0.33.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-dependencies
- dependency-name: k8s.io/client-go
  dependency-version: 0.33.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-dependencies
- dependency-name: k8s.io/component-base
  dependency-version: 0.33.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-dependencies
- dependency-name: k8s.io/mount-utils
  dependency-version: 0.33.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-dependencies
- dependency-name: k8s.io/kubernetes
  dependency-version: 1.33.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-dependencies
- dependency-name: k8s.io/component-helpers
  dependency-version: 0.33.2
  dependency-type: indirect
  update-type: version-update:semver-patch
  dependency-group: k8s-dependencies
- dependency-name: k8s.io/csi-translation-lib
  dependency-version: 0.33.2
  dependency-type: indirect
  update-type: version-update:semver-patch
  dependency-group: k8s-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>

* Run make-verify

Signed-off-by: Eddie Torres <torredil@amazon.com>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Eddie Torres <torredil@amazon.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Eddie Torres <torredil@amazon.com>
Signed-off-by: SamMayWork <sam.may@kaleido.io>
Bumps the k8s-dependencies group with 1 update in the / directory: [sigs.k8s.io/yaml](https://github.com/kubernetes-sigs/yaml).
Bumps the k8s-dependencies group with 1 update in the /tests/e2e directory: [sigs.k8s.io/yaml](https://github.com/kubernetes-sigs/yaml).


Updates `sigs.k8s.io/yaml` from 1.4.0 to 1.5.0
- [Release notes](https://github.com/kubernetes-sigs/yaml/releases)
- [Changelog](https://github.com/kubernetes-sigs/yaml/blob/master/RELEASE.md)
- [Commits](kubernetes-sigs/yaml@v1.4.0...v1.5.0)

Updates `sigs.k8s.io/yaml` from 1.4.0 to 1.5.0
- [Release notes](https://github.com/kubernetes-sigs/yaml/releases)
- [Changelog](https://github.com/kubernetes-sigs/yaml/blob/master/RELEASE.md)
- [Commits](kubernetes-sigs/yaml@v1.4.0...v1.5.0)

---
updated-dependencies:
- dependency-name: sigs.k8s.io/yaml
  dependency-version: 1.5.0
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: k8s-dependencies
- dependency-name: sigs.k8s.io/yaml
  dependency-version: 1.5.0
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: k8s-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
[nit] Error checking in DefaultKubernetesAPIClient
Signed-off-by: Eddie Torres <torredil@amazon.com>
…-new

Add Karpenter ebs-scale-test cluster type
…ot/go_modules/k8s-dependencies-4262ab44f8

Bump the k8s-dependencies group across 2 directories with 1 update
Bumps the misc-dependencies group with 3 updates in the / directory: [github.com/aws/aws-sdk-go-v2/service/ec2](https://github.com/aws/aws-sdk-go-v2), [go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc](https://github.com/open-telemetry/opentelemetry-go-contrib) and [github.com/google/gnostic-models](https://github.com/google/gnostic-models).
Bumps the misc-dependencies group with 3 updates in the /tests/e2e directory: [github.com/aws/aws-sdk-go-v2/service/ec2](https://github.com/aws/aws-sdk-go-v2), [github.com/google/gnostic-models](https://github.com/google/gnostic-models) and [go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp](https://github.com/open-telemetry/opentelemetry-go-contrib).


Updates `github.com/aws/aws-sdk-go-v2/service/ec2` from 1.226.0 to 1.228.0
- [Release notes](https://github.com/aws/aws-sdk-go-v2/releases)
- [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json)
- [Commits](aws/aws-sdk-go-v2@service/ec2/v1.226.0...service/ec2/v1.228.0)

Updates `go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc` from 0.61.0 to 0.62.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-go-contrib/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-go-contrib/blob/main/CHANGELOG.md)
- [Commits](open-telemetry/opentelemetry-go-contrib@zpages/v0.61.0...zpages/v0.62.0)

Updates `github.com/google/gnostic-models` from 0.6.9 to 0.7.0
- [Commits](google/gnostic-models@v0.6.9...v0.7.0)

Updates `github.com/aws/aws-sdk-go-v2/service/ec2` from 1.226.0 to 1.228.0
- [Release notes](https://github.com/aws/aws-sdk-go-v2/releases)
- [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json)
- [Commits](aws/aws-sdk-go-v2@service/ec2/v1.226.0...service/ec2/v1.228.0)

Updates `github.com/google/gnostic-models` from 0.6.9 to 0.7.0
- [Commits](google/gnostic-models@v0.6.9...v0.7.0)

Updates `go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp` from 0.61.0 to 0.62.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-go-contrib/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-go-contrib/blob/main/CHANGELOG.md)
- [Commits](open-telemetry/opentelemetry-go-contrib@zpages/v0.61.0...zpages/v0.62.0)

---
updated-dependencies:
- dependency-name: github.com/aws/aws-sdk-go-v2/service/ec2
  dependency-version: 1.228.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: misc-dependencies
- dependency-name: go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc
  dependency-version: 0.62.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: misc-dependencies
- dependency-name: github.com/google/gnostic-models
  dependency-version: 0.7.0
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: misc-dependencies
- dependency-name: github.com/aws/aws-sdk-go-v2/service/ec2
  dependency-version: 1.228.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: misc-dependencies
- dependency-name: github.com/google/gnostic-models
  dependency-version: 0.7.0
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: misc-dependencies
- dependency-name: go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp
  dependency-version: 0.62.0
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: misc-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Eddie Torres <torredil@amazon.com>
…ot/go_modules/misc-dependencies-ae160ce04c

Bump the misc-dependencies group across 2 directories with 4 updates
Signed-off-by: Eddie Torres <torredil@amazon.com>
Replace provenance script with `BUILDX_NO_DEFAULT_ATTESTATIONS` env var
…r-5123

Update CSIDriver object to include `nodeAllocatableUpdatePeriodSeconds`
…OnQuotas

Return Resource Exhausted When Exceeding Quotas
Signed-off-by: Connor Catlett <conncatl@amazon.com>
Bumps [aquasecurity/trivy-action](https://github.com/aquasecurity/trivy-action) from 0.31.0 to 0.32.0.
- [Release notes](https://github.com/aquasecurity/trivy-action/releases)
- [Commits](aquasecurity/trivy-action@0.31.0...0.32.0)

---
updated-dependencies:
- dependency-name: aquasecurity/trivy-action
  dependency-version: 0.32.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Connor Catlett <conncatl@amazon.com>
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Oct 20, 2025
@openshift-ci-robot

openshift-ci-robot commented Oct 20, 2025

Copy link
Copy Markdown

@jsafrane: This pull request references STOR-2597 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.21.0" version, but no target version was set.

This pull request references STOR-2627 which is a valid jira issue.

Details

In response to this:

This PR rebases the OpenShift fork of aws-ebs-csi-driver from v1.45.0 to v1.48.0.

Upstream Changelogs

v1.46.0

v1.47.0

v1.48.0

  • Features:
  • Align node and controller metrics to consistent experience (#2558)
  • Auto-detect AWS Region from Config (#2425)
  • Call sts:GetCallerIdentity Just in Time instead of blocking on startup (#2620)
  • Add ability to use az-id for volume provisioning (#2613)
  • Add relabelings stanza for ServiceMonitor (#2594)
  • Improvements:
  • Refactor NewCloud (#2616)
  • Bump dependencies and sidecars

Diff Link

kubernetes-sigs/aws-ebs-csi-driver@v1.48.0...jsafrane:aws-ebs-csi-driver:rebase-v1.48.0

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@jsafrane

Copy link
Copy Markdown
Author

waiting for go 1.24.6 in OCP base images

@gnufied

gnufied commented Oct 21, 2025

Copy link
Copy Markdown
Member

/hold

@openshift-ci openshift-ci Bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 21, 2025
@jsafrane

Copy link
Copy Markdown
Author

/test unit

@jsafrane

Copy link
Copy Markdown
Author

/test verify-deps

@jsafrane

Copy link
Copy Markdown
Author

/hold cancel
/retest

@openshift-ci openshift-ci Bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 22, 2025
@jsafrane

Copy link
Copy Markdown
Author

/test verify-commits
it uses an old commitchecker image

@jsafrane

Copy link
Copy Markdown
Author

/test verify-commits

2 similar comments
@jsafrane

Copy link
Copy Markdown
Author

/test verify-commits

@jsafrane

Copy link
Copy Markdown
Author

/test verify-commits

@chao007

chao007 commented Oct 30, 2025

Copy link
Copy Markdown

/test e2e-aws-csi-extended

@openshift-ci

openshift-ci Bot commented Oct 30, 2025

Copy link
Copy Markdown

@jsafrane: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/okd-scos-e2e-aws-ovn 2ae624a link false /test okd-scos-e2e-aws-ovn
ci/prow/e2e-aws-csi-extended 2ae624a link false /test e2e-aws-csi-extended

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@Phaow

Phaow commented Oct 30, 2025

Copy link
Copy Markdown

e2e-aws-csi-extended job looks good the failed cases caused by kubernetes 1.34 RWOP failed scheduling message changes, the fix is merged in 4.21, so after openshift/release#70493 merged the job will be fixed then.

@chao007

chao007 commented Oct 31, 2025

Copy link
Copy Markdown

/verified by CI

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Oct 31, 2025
@openshift-ci-robot

Copy link
Copy Markdown

@chao007: This PR has been marked as verified by CI.

Details

In response to this:

/verified by CI

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@dfajmon

dfajmon commented Nov 3, 2025

Copy link
Copy Markdown

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Nov 3, 2025
@openshift-merge-bot
openshift-merge-bot Bot merged commit 57eebff into openshift:master Nov 3, 2025
10 of 12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.