Skip to content

STOR-1591: Rebase to upstream v1.6.16 for OCP 4.17#39

Merged
openshift-merge-bot[bot] merged 24 commits into
openshift:masterfrom
dfajmon:rebase-1.6.16
Jul 11, 2024
Merged

STOR-1591: Rebase to upstream v1.6.16 for OCP 4.17#39
openshift-merge-bot[bot] merged 24 commits into
openshift:masterfrom
dfajmon:rebase-1.6.16

Conversation

@dfajmon

@dfajmon dfajmon commented Jun 27, 2024

Copy link
Copy Markdown

hsadoyan and others added 22 commits January 4, 2024 00:36
…-pick-of-#746-upstream-release-1.6

Automated cherry pick of kubernetes-sigs#746: Fix issue where errors were reported as info
…-pick-of-#737-kubernetes-sigs#770-kubernetes-sigs#774-upstream-release-1.6

Automated cherry pick of kubernetes-sigs#737: Add NfsExportOptions parsing#770: Refactor duplicate function#774: Disable NFSExportOptions by default
…t/cherry-pick-798-to-release-1.6

[release-1.6] Change base image from bullseye to bookworm for CVE fixes
…t/cherry-pick-836-to-release-1.6

[release-1.6] fix CVE-2024-28085
…t/cherry-pick-842-to-release-1.6

[release-1.6] Add dannawang0221 to OWNERS
…t/cherry-pick-848-to-release-1.6

[release-1.6] Update debian base image to fix CVE-2024-2961
…t/cherry-pick-873-to-release-1.6

[release-1.6] fix tier capacity check for expandVolume
…k-of-#864-upstream-release-1.6

Automated cherry pick of kubernetes-sigs#864: Properly unwrap gce-compute error code.
Manual cherrypick of kubernetes-sigs#878: Update k8s.io/kubernetes to fix GO-2024-2746
@openshift-ci-robot

openshift-ci-robot commented Jun 27, 2024

Copy link
Copy Markdown

@dfajmon: This pull request references STOR-1593 which is a valid jira issue.

Details

In response to this:

Diff to upstream v1.6.16:
kubernetes-sigs/gcp-filestore-csi-driver@v1.6.16...dfajmon:rebase-1.6.16

Changes between 1.6.16 (OCP 4.17) and 1.6.16:

Full changelogs:
https://github.com/kubernetes-sigs/gcp-filestore-csi-driver/releases/tag/v1.6.16

@openshift/storage

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.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jun 27, 2024
@openshift-ci openshift-ci Bot requested review from RomanBednar and gnufied June 27, 2024 10:42
@dfajmon dfajmon changed the title STOR-1593: Rebase to upstream v1.6.16 STOR-1591: Rebase to upstream v1.6.16 Jun 27, 2024
@openshift-ci-robot

openshift-ci-robot commented Jun 27, 2024

Copy link
Copy Markdown

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

Details

In response to this:

Diff to upstream v1.6.16:
kubernetes-sigs/gcp-filestore-csi-driver@v1.6.16...dfajmon:rebase-1.6.16

Changes between 1.6.16 (OCP 4.17) and 1.6.16:

Full changelogs:
https://github.com/kubernetes-sigs/gcp-filestore-csi-driver/releases/tag/v1.6.16

@openshift/storage

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 Jun 27, 2024

Copy link
Copy Markdown
Author

/jira refresh

@openshift-ci-robot

openshift-ci-robot commented Jun 27, 2024

Copy link
Copy Markdown

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

Details

In response to this:

/jira refresh

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 force-pushed the rebase-1.6.16 branch 4 times, most recently from fc1f58d to e0d0de6 Compare June 28, 2024 10:29
Reported to USPTREAM: kubernetes-sigs#896

Can be dropped if upstream adds this replace to go.mod:

k8s.io/endpointslice => k8s.io/endpointslice v0.29.4
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.29.4

Commit fixes verify-deps check which was failing with:

 go: k8s.io/dynamic-resource-allocation@v0.0.0: invalid version: unknown revision v0.0.0
go: k8s.io/endpointslice@v0.0.0: invalid version: unknown revision v0.0.0
go: google.golang.org/genproto/googleapis/rpc@v0.0.0-20230822172742-b8732ec3820d: missing go.sum entry for go.mod file; to add it:
	go mod download google.golang.org/genproto/googleapis/rpc
ERROR: go list -mod=readonly -m all failed with the message listed above.
Cachito used in ART builds will fail to resolve dependencies offline.
Typically, a pinned version is missing in go.mod, e.g.:
    replace k8s.io/foo => k8s.io/foo v0.26.0
@openshift-ci

openshift-ci Bot commented Jun 28, 2024

Copy link
Copy Markdown

@dfajmon: The following test 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/security 3b87c68 link false /test security

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.

@dfajmon

dfajmon commented Jul 1, 2024

Copy link
Copy Markdown
Author

The failing ci/prow/security was discussed and is left intentionally failed.

@RomanBednar

Copy link
Copy Markdown

/approve

@openshift-ci

openshift-ci Bot commented Jul 8, 2024

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dfajmon, RomanBednar

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 8, 2024
@RomanBednar

Copy link
Copy Markdown

/label px-approved
/label docs-approved

@openshift-ci openshift-ci Bot added px-approved Signifies that Product Support has signed off on this PR docs-approved Signifies that Docs has signed off on this PR labels Jul 8, 2024
@RomanBednar

Copy link
Copy Markdown

/assign @duanwei33

For QE approval

@duanwei33

Copy link
Copy Markdown

@chao007 Hi, please see if we need some pre-merge checks for customer-visible features, thanks!

@duanwei33

Copy link
Copy Markdown

@dfajmon @RomanBednar
Could you help update the source version typo(?) in the description?

Changes between 1.6.16 (OCP 4.17) and 1.6.16:

@RomanBednar

Copy link
Copy Markdown

@dfajmon It should be: Changes between v1.6.11 (OCP 4.16) and 1.6.16 (OCP 4.17):

@openshift-ci-robot

openshift-ci-robot commented Jul 8, 2024

Copy link
Copy Markdown

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

Details

In response to this:

Diff to upstream v1.6.16:
kubernetes-sigs/gcp-filestore-csi-driver@v1.6.16...dfajmon:rebase-1.6.16

Changes between v1.6.11 (OCP 4.16) and 1.6.16 (OCP 4.17):

Full changelogs:
https://github.com/kubernetes-sigs/gcp-filestore-csi-driver/releases/tag/v1.6.16

@openshift/storage

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 Jul 8, 2024

Copy link
Copy Markdown
Author

@duanwei33 fixed

@dobsonj

dobsonj commented Jul 8, 2024

Copy link
Copy Markdown
Member

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jul 8, 2024
@chao007

chao007 commented Jul 11, 2024

Copy link
Copy Markdown

/label qe-approved

@openshift-ci openshift-ci Bot added the qe-approved Signifies that QE has signed off on this PR label Jul 11, 2024
@openshift-ci-robot

openshift-ci-robot commented Jul 11, 2024

Copy link
Copy Markdown

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

Details

In response to this:

Diff to upstream v1.6.16:
kubernetes-sigs/gcp-filestore-csi-driver@v1.6.16...dfajmon:rebase-1.6.16

Changes between v1.6.11 (OCP 4.16) and 1.6.16 (OCP 4.17):

Full changelogs:
https://github.com/kubernetes-sigs/gcp-filestore-csi-driver/releases/tag/v1.6.16

@openshift/storage

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.

@openshift-merge-bot openshift-merge-bot Bot merged commit b6ccd6a into openshift:master Jul 11, 2024
@openshift-bot

Copy link
Copy Markdown

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-gcp-filestore-csi-driver-container-v4.17.0-202407110611.p0.gb6ccd6a.assembly.stream.el9 for distgit ose-gcp-filestore-csi-driver.
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. docs-approved Signifies that Docs has signed off on this PR 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. px-approved Signifies that Product Support has signed off on this PR qe-approved Signifies that QE has signed off on this PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.