Skip to content

STOR-2396: Rebase to upstream v1.20.0 for OCP 4.20#79

Merged
openshift-merge-bot[bot] merged 159 commits intoopenshift:masterfrom
chao007:rebase-v1.20.0
Jul 30, 2025
Merged

STOR-2396: Rebase to upstream v1.20.0 for OCP 4.20#79
openshift-merge-bot[bot] merged 159 commits intoopenshift:masterfrom
chao007:rebase-v1.20.0

Conversation

hanz-vora and others added 30 commits January 21, 2025 17:13
Bumps golang from 1.23.0 to 1.24.0.

---
updated-dependencies:
- dependency-name: golang
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps the onsi group with 1 update in the / directory: [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo).


Updates `github.com/onsi/ginkgo/v2` from 2.20.1 to 2.22.2
- [Release notes](https://github.com/onsi/ginkgo/releases)
- [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md)
- [Commits](onsi/ginkgo@v2.20.1...v2.22.2)

Updates `github.com/onsi/gomega` from 1.34.1 to 1.36.2
- [Release notes](https://github.com/onsi/gomega/releases)
- [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md)
- [Commits](onsi/gomega@v1.34.1...v1.36.2)

---
updated-dependencies:
- dependency-name: github.com/onsi/ginkgo/v2
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: onsi
- dependency-name: github.com/onsi/gomega
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: onsi
...

Signed-off-by: dependabot[bot] <support@github.com>
…ot/go_modules/onsi-6da7530402

Bump the onsi group across 1 directory with 2 updates
Bumps the golang-x group with 7 updates in the / directory:

| Package | From | To |
| --- | --- | --- |
| [golang.org/x/oauth2](https://github.com/golang/oauth2) | `0.21.0` | `0.27.0` |
| [golang.org/x/sys](https://github.com/golang/sys) | `0.28.0` | `0.30.0` |
| [golang.org/x/time](https://github.com/golang/time) | `0.5.0` | `0.10.0` |
| [golang.org/x/crypto](https://github.com/golang/crypto) | `0.31.0` | `0.35.0` |
| [golang.org/x/mod](https://github.com/golang/mod) | `0.20.0` | `0.23.0` |
| [golang.org/x/net](https://github.com/golang/net) | `0.33.0` | `0.35.0` |
| [golang.org/x/tools](https://github.com/golang/tools) | `0.24.0` | `0.30.0` |



Updates `golang.org/x/oauth2` from 0.21.0 to 0.27.0
- [Commits](golang/oauth2@v0.21.0...v0.27.0)

Updates `golang.org/x/sys` from 0.28.0 to 0.30.0
- [Commits](golang/sys@v0.28.0...v0.30.0)

Updates `golang.org/x/time` from 0.5.0 to 0.10.0
- [Commits](golang/time@v0.5.0...v0.10.0)

Updates `golang.org/x/crypto` from 0.31.0 to 0.35.0
- [Commits](golang/crypto@v0.31.0...v0.35.0)

Updates `golang.org/x/mod` from 0.20.0 to 0.23.0
- [Commits](golang/mod@v0.20.0...v0.23.0)

Updates `golang.org/x/net` from 0.33.0 to 0.35.0
- [Commits](golang/net@v0.33.0...v0.35.0)

Updates `golang.org/x/sync` from 0.10.0 to 0.11.0
- [Commits](golang/sync@v0.10.0...v0.11.0)

Updates `golang.org/x/term` from 0.27.0 to 0.29.0
- [Commits](golang/term@v0.27.0...v0.29.0)

Updates `golang.org/x/text` from 0.21.0 to 0.22.0
- [Release notes](https://github.com/golang/text/releases)
- [Commits](golang/text@v0.21.0...v0.22.0)

Updates `golang.org/x/tools` from 0.24.0 to 0.30.0
- [Release notes](https://github.com/golang/tools/releases)
- [Commits](golang/tools@v0.24.0...v0.30.0)

---
updated-dependencies:
- dependency-name: golang.org/x/oauth2
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: golang-x
- dependency-name: golang.org/x/sys
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: golang-x
- dependency-name: golang.org/x/time
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: golang-x
- dependency-name: golang.org/x/crypto
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: golang-x
- dependency-name: golang.org/x/mod
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: golang-x
- dependency-name: golang.org/x/net
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: golang-x
- dependency-name: golang.org/x/sync
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: golang-x
- dependency-name: golang.org/x/term
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: golang-x
- dependency-name: golang.org/x/text
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: golang-x
- dependency-name: golang.org/x/tools
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: golang-x
...

Signed-off-by: dependabot[bot] <support@github.com>
Adding additional checks for data cache watcher and reduceVolumeGroup
…ot/docker/golang-1.24.0

Bump golang from 1.23.0 to 1.24.0
…ot/go_modules/golang-x-9a5330b321

Bump the golang-x group across 1 directory with 10 updates
github.com/emicklei/go-restful needed to be updated, but to v3 which
also required updating k8s openapi.

Change-Id: I9dc0fad79785450904db38702a4cae077e6dfbca
Bumps golang from 1.24.0 to 1.24.1.

---
updated-dependencies:
- dependency-name: golang
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Pass performance parameters when creating regional disks.
Update change log and docs for release v1.17.1 to master
…vailableLSSDsBug

Fix logic bug while checking available LSSDs for RAIDing for Data Cache
Add exponential backoff retries for getting Node from API server logic
…m-location-tpc-fix

Add handling for TPC to GetRegionFromZones
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jul 2, 2025

@chao007: This pull request references STOR-2396 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.20.0" version, but no target version was set.

Details

In response to this:

Issue link:
https://issues.redhat.com/browse/STOR-2396

Diff to upstream v1.20.0:
kubernetes-sigs/gcp-compute-persistent-disk-csi-driver@v1.20.0...chao007:gcp-pd-csi-driver:rebase-1.20.0

Notable changes between v1.17.4 (OCP 4.19) and v1.20.0 (OCP 4.20):

Full changelogs:
https://github.com/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver/releases/tag/v1.20.0

@openshift/storage
@openshift/storage-qe

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.

@chao007 chao007 changed the title [WIP]STOR-2396: Rebase to upstream v1.20.0 for OCP 4.20 STOR-2396: Rebase to upstream v1.20.0 for OCP 4.20 Jul 2, 2025
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 2, 2025
@dfajmon
Copy link

dfajmon commented Jul 8, 2025

@chao007 I would merge kubernetes-sigs@a28ea05 into the general openshift carry
Also could you add @dfajmon and @rhrmo to the owners file?
Thanks

@Phaow
Copy link

Phaow commented Jul 8, 2025

Hi @dfajmon, chao is PTO from July 8th~16th ^^, if it is not urgent we could wait her back to squash the commits. If it needs to merge ASAP, I could help with the squash.

@dfajmon
Copy link

dfajmon commented Jul 8, 2025

It can wait, no worries.

and remove .github
go mod vendor && go mod tidy

UPSTREAM: <carry>: Updating ose-gcp-pd-csi-driver-container image to be consistent with ART for 4.20
Reconciling with https://github.com/openshift/ocp-build-data/tree/dfb5c7d531490cfdc61a3b88bc533702b9624997/images/ose-gcp-pd-csi-driver.yml
@Phaow
Copy link

Phaow commented Jul 22, 2025

/test e2e-gcp

@Phaow
Copy link

Phaow commented Jul 23, 2025

Notable changes test with pre merge build summarize

  • Pass performance parameters when creating regional disks - currently no disks type which support both regional and custom IOPS
  • Add handling for TPC to GetRegionFromZones - OCP do not support TPC zone yet, do not need to test
  • Relax volumeContentSource restriction for ROX multi-zone dynamic volume creation - test passed (If creating an empty disk (content source nil), always create RWO disks (when supported))
$ oc apply -f - << EOF
allowVolumeExpansion: true
apiVersion: storage.k8s.io/v1
kind: StorageClass
metadata:
  name: hyperdisk-rox
parameters:
  replication-type: none
  type: hyperdisk-balanced
  access-mode: READ_ONLY_MANY
provisioner: pd.csi.storage.gke.io
reclaimPolicy: Delete
volumeBindingMode: WaitForFirstConsumer
EOF
$ oc apply -f podWithFs.yaml,pvc.yaml
pod/mypod created
persistentvolumeclaim/mypvc created
$ oc get pvc,pv
NAME                          STATUS   VOLUME                                     CAPACITY   ACCESS MODES   STORAGECLASS    VOLUMEATTRIBUTESCLASS   AGE
persistentvolumeclaim/mypvc   Bound    pvc-86a4f327-f97f-4e8b-8f09-640750e933bc   10Gi       RWO            hyperdisk-rox   <unset>                 9s

NAME                                                        CAPACITY   ACCESS MODES   RECLAIM POLICY   STATUS   CLAIM           STORAGECLASS    VOLUMEATTRIBUTESCLASS   REASON   AGE
persistentvolume/pvc-86a4f327-f97f-4e8b-8f09-640750e933bc   10Gi       RWO            Delete           Bound    default/mypvc   hyperdisk-rox
$ gcloud compute disks describe pvc-86a4f327-f97f-4e8b-8f09-640750e933bc \
  --zone=us-central1-f \
  --project=openshift-qe
accessMode: READ_WRITE_SINGLE
creationTimestamp: '2025-07-23T01:02:32.238-07:00'
description: '{"kubernetes.io/created-for/pv/name":"pvc-86a4f327-f97f-4e8b-8f09-640750e933bc","kubernetes.io/created-for/pvc/name":"mypvc","kubernetes.io/created-for/pvc/namespace":"default","storage.gke.io/created-by":"pd.csi.storage.gke.io"}'
enableConfidentialCompute: false
id: '3149914114406296055'
kind: compute#disk
labelFingerprint: jKytrsr7b_w=
labels:
  kubernetes-io-cluster-pewang-0723g-hrs2q: owned
name: pvc-86a4f327-f97f-4e8b-8f09-640750e933bc
physicalBlockSizeBytes: '4096'
provisionedIops: '3060'
provisionedThroughput: '155'
satisfiesPzi: false
selfLink: https://www.googleapis.com/compute/v1/projects/openshift-qe/zones/us-central1-f/disks/pvc-86a4f327-f97f-4e8b-8f09-640750e933bc
sizeGb: '10'
status: READY
type: https://www.googleapis.com/compute/v1/projects/openshift-qe/zones/us-central1-f/diskTypes/hyperdisk-balanced
zone: https://www.googleapis.com/compute/v1/projects/openshift-qe/zones/us-central1-f
  • Introduce Disk Topology Feature - GKE feature do not need to test
  • Add Gen4 Lssd VM Test - Test codes change only, no customer facing changes, do not need to test
  • GKE-MT Support for PDCSI - GKE feature do not need to test

@Phaow
Copy link

Phaow commented Jul 23, 2025

All regression CI looks good from QE side, just waiting for the final review and RWX snaps supports does not support in this rebase version yet still waiting for conclusion whether we need a newer version to rebase.

@Phaow
Copy link

Phaow commented Jul 24, 2025

@chao007 The carry patch commit message should be -> UPSTREAM: 2116: Remove check on snapshot create support for multi-writer HyperDisk-HA

…ter HyperDisk-HA and let such validations occur at the PD control plane layer
@openshift-ci
Copy link

openshift-ci bot commented Jul 24, 2025

@chao007: all tests passed!

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
Copy link

Phaow commented Jul 25, 2025

I tested with the update(cherry-picked the kubernetes-sigs#2116), the hyperdisk raw block RWX snapshot create and restore works well(Test record).

@Phaow
Copy link

Phaow commented Jul 25, 2025

/label qe-approved

@openshift-ci openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label Jul 25, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jul 25, 2025

@chao007: This pull request references STOR-2396 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.20.0" version, but no target version was set.

Details

In response to this:

Issue link:
https://issues.redhat.com/browse/STOR-2396

Diff to upstream v1.20.0:
kubernetes-sigs/gcp-compute-persistent-disk-csi-driver@v1.20.0...chao007:gcp-pd-csi-driver:rebase-1.20.0

Notable changes between v1.17.4 (OCP 4.19) and v1.20.0 (OCP 4.20):

Full changelogs:
https://github.com/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver/releases/tag/v1.20.0

@openshift/storage
@openshift/storage-qe

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

/lgtm
/approve

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 30, 2025
@openshift-ci
Copy link

openshift-ci bot commented Jul 30, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: chao007, jsafrane

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 30, 2025
@openshift-merge-bot openshift-merge-bot bot merged commit 500ab5d into openshift:master Jul 30, 2025
14 checks passed
@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

Distgit: ose-gcp-pd-csi-driver
This PR has been included in build ose-gcp-pd-csi-driver-container-v4.20.0-202507301647.p0.g500ab5d.assembly.stream.el9.
All builds following this will include this PR.

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. qe-approved Signifies that QE has signed off on this PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.