Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

STOR-2016: Rebase to upstream v1.34.0 for OCP 4.18 #276

Merged
merged 72 commits into from
Oct 4, 2024
Merged

STOR-2016: Rebase to upstream v1.34.0 for OCP 4.18 #276

merged 72 commits into from
Oct 4, 2024

Conversation

dfajmon
Copy link

@dfajmon dfajmon commented Sep 5, 2024

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

Diff to upstream v1.32.0:
kubernetes-sigs/aws-ebs-csi-driver@v1.32.0...dfajmon:rebase-v1.34.0

Changes between v1.32.0 (OCP 4.17) and v1.34.0 (OCP 4.18):

Important

The AZ topology key CreateVolume returns has changed from topology.ebs.csi.aws.com/zone to topology.kubernetes.io/zone. Volumes created on v1.33.0 or any future version will be incompatible with versions before v1.28.0. No other customer-facing impact is expected unless you directly depend on the topology label. For more information and the reasoning behind this change, see issue #729.

Full changelogs:
https://github.com/kubernetes-sigs/aws-ebs-csi-driver/blob/master/CHANGELOG.md

@openshift/storage

ConnorJC3 and others added 30 commits June 24, 2024 19:51
@ConnorJC3
Release v1.32.0
65013fe 
Signed-off-by: Connor Catlett <[email protected]>
@k8s-ci-robot
Merge pull request kubernetes-sigs#2073 from ConnorJC3/release132
a4fd70f 
Release v1.32.0
@k8s-ci-robot
Merge pull request kubernetes-sigs#2074 from kubernetes-sigs/release-…
1a30368 
…1.32

Finalize Release 1.32
@ConnorJC3
Add topology label warning to changelog
d09c41f 
Signed-off-by: Connor Catlett <[email protected]>
@ConnorJC3
Backout kops to 1.29
75dfb0f 
Signed-off-by: Connor Catlett <[email protected]>
@k8s-ci-robot
Merge pull request kubernetes-sigs#2076 from ConnorJC3/topology-master
9f755fd 
[master] Add topology label warning to changelog; Backout kops to 1.29
@ElijahQuinones
Add fix for enableLinux node paramater
c66dd37
@k8s-ci-robot
Merge pull request kubernetes-sigs#2078 from ElijahQuinones/fix_node_…
83fed8c 
…enable_linux

Add fix for enableLinux node parameter
@ConnorJC3
Bump go version to fix govulncheck failure
96c0ec4 
Signed-off-by: Connor Catlett <[email protected]>
@k8s-ci-robot
Merge pull request kubernetes-sigs#2080 from ConnorJC3/govulnfix-1255
6015f5d 
Bump go version to fix govulncheck failure
@ConnorJC3
Implement util.ExpiringCache
381647f 
Signed-off-by: Connor Catlett <[email protected]>
@ConnorJC3
Migrate likelyBadNames to ExpiringCache
8f9dbe2 
Signed-off-by: Connor Catlett <[email protected]>
@ConnorJC3
Use new client token when CreateVolume returns IdempotentParameterMis…
0a0d5ef 
…match

Signed-off-by: Connor Catlett <[email protected]>
@ConnorJC3
Only collect metrics in Prow
9389271 
Signed-off-by: Connor Catlett <[email protected]>
@cartermckinnon
Add --kubeconfig flag for out-of-cluster auth
21c583c
@ConnorJC3
Simplify image building
5ce3d81 
Signed-off-by: Connor Catlett <[email protected]>
@ConnorJC3
Split driver install/uninstall out to functions; Introduce make clust…
a782cc0 
…er/(un)install

Signed-off-by: Connor Catlett <[email protected]>
@ConnorJC3
Cache GOCACHE and GOMODCACHE in Dockerfile
3251b42 
Signed-off-by: Connor Catlett <[email protected]>
@ConnorJC3
Update Makefile documentation and CONTRIBUTING.md
0dc7064 
Signed-off-by: Connor Catlett <[email protected]>
@ConnorJC3
Cleanup non-external e2e test handling
58e4226 
Signed-off-by: Connor Catlett <[email protected]>
@k8s-ci-robot
Merge pull request kubernetes-sigs#2079 from ConnorJC3/devx-improvements
3ea9041 
Developer Experience Improvements
@k8s-ci-robot
Merge pull request kubernetes-sigs#2075 from ConnorJC3/fix-createvolu…
c257e5b 
…me-idempotency-race-condition

Use new client token when `CreateVolume` returns `IdempotentParameterMismatch`
@ConnorJC3
Change coalescer InputType from comparable to any
d35e5aa 
Signed-off-by: Connor Catlett <[email protected]>
@k8s-ci-robot
Merge pull request kubernetes-sigs#2081 from cartermckinnon/add-kubec…
a789247 
…onfig-flag

Add --kubeconfig flag for out-of-cluster auth
@k8s-ci-robot
Merge pull request kubernetes-sigs#2083 from ConnorJC3/remove-compara…
1ab7c79 
…ble-coalescer

Change coalescer InputType from `comparable` to `any`
@cHiv0rz
fix dnsconfi indent for controller
cff0cbd
@k8s-ci-robot
Merge pull request kubernetes-sigs#2084 from cHiv0rz/master
f166253 
fix dnsConfig indentation in controller template file
@ConnorJC3
govulncheck: Bump google.golang.org/grpc to v1.64.1
b6941d4 
Signed-off-by: Connor Catlett <[email protected]>
@k8s-ci-robot
Merge pull request kubernetes-sigs#2085 from ConnorJC3/govuln
ec8718a 
govulncheck: Bump google.golang.org/grpc to v1.64.1
@ConnorJC3
Migrate CreateVolume response topology to standard label topology.kub…
8b70f71 
…ernetes.io/zone

Signed-off-by: Connor Catlett <[email protected]>
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Sep 5, 2024
@openshift-ci-robot
Copy link

openshift-ci-robot commented Sep 5, 2024 •
edited by openshift-ci bot
Loading

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

In response to this:

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

Diff to upstream v1.32.0:
kubernetes-sigs/aws-ebs-csi-driver@v1.32.0...dfajmon:rebase-v1.34.0

Changes between v1.32.0 (OCP 4.17) and v1.34.0 (OCP 4.18):

[!IMPORTANT]
The AZ topology key CreateVolume returns has changed from topology.ebs.csi.aws.com/zone to topology.kubernetes.io/zone. Volumes created on v1.33.0 or any future version will be incompatible with versions before v1.28.0. No other customer-facing impact is expected unless you directly depend on the topology label. For more information and the reasoning behind this change, see issue #729.

Full changelogs:
https://github.com/kubernetes-sigs/aws-ebs-csi-driver/blob/master/CHANGELOG.md

@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.

@jsafrane @dfajmon
UPSTREAM: <carry>: Add OpenShift files
73d3003 
- Remove .github files: we don't want custom templates or dependabots in
  OpenShift forks.

- Compile with -mod=vendor

- Compile without KUBECONFIG: hack/verify-kustomize reads the current
  namespace and adds it into generated / verified manifests.
With KUBECONFIG="", it won't be able to get the namespace and thus it will
generate manifests with namespace: default.

- Compile tools (not the main driver binary!) with -mod=readonly,
  so `make verify` can compile mockgen from the internet.

- Add .snyk file to ignore false positives

- Add vendor/ dir
@dfajmon
Copy link
Author

dfajmon commented Sep 6, 2024

/hold
need to figure out what to do with ci/prow/e2e-aws-csi-extended as it works with topology.ebs.csi.aws.com/zone which is changing to topology.kubernetes.io/zone

@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 Sep 6, 2024
@dfajmon
Copy link
Author

dfajmon commented Sep 20, 2024

/retest

@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Sep 20, 2024

@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/e2e-aws-csi-extended 73d3003 link false /test e2e-aws-csi-extended

Full PR test history. Your PR dashboard.

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

dfajmon commented Sep 26, 2024 •
edited
Loading

/unhold
https://github.com/openshift/openshift-tests-private/pull/19938 fixes the problem with aws-csi-extended CI
but this PR needs to be merged first

@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 Sep 26, 2024
@gnufied
Copy link
Member

gnufied commented Sep 26, 2024

/lgtm
/approve

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 26, 2024
@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Sep 26, 2024

[APPROVALNOTIFIER] This PR is APPROVED

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

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

The pull request process is described here

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 Sep 26, 2024
@Phaow
Copy link

Phaow commented Sep 27, 2024

Pre merge test with 4.18.0-0.test-2024-09-25-010000-ci-ln-2ilsfpk-latest (build 4.18,openshift/aws-ebs-csi-driver#276),
all regression test passed.

66 pass, 55 skip (31m34s)

The 2 new notable changes needs https://issues.redhat.com/browse/STOR-2078 finish to test. I tried with oc patch featuregate cluster -p '{"spec":{"featureSet":"CustomNoUpgrade","customNoUpgrade":{"enabled":["VolumeAttributesClass"]}}}' --type=merge, it seems does not work. Will retest when https://issues.redhat.com/browse/STOR-2078 ready to test.

@Phaow
Copy link

Phaow commented Sep 27, 2024

/label qe-approved

@openshift-ci openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label Sep 27, 2024
@openshift-ci-robot
Copy link

openshift-ci-robot commented Sep 27, 2024 •
edited by openshift-ci bot
Loading

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

In response to this:

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

Diff to upstream v1.32.0:
kubernetes-sigs/aws-ebs-csi-driver@v1.32.0...dfajmon:rebase-v1.34.0

Changes between v1.32.0 (OCP 4.17) and v1.34.0 (OCP 4.18):

[!IMPORTANT]
The AZ topology key CreateVolume returns has changed from topology.ebs.csi.aws.com/zone to topology.kubernetes.io/zone. Volumes created on v1.33.0 or any future version will be incompatible with versions before v1.28.0. No other customer-facing impact is expected unless you directly depend on the topology label. For more information and the reasoning behind this change, see issue #729.

Full changelogs:
https://github.com/kubernetes-sigs/aws-ebs-csi-driver/blob/master/CHANGELOG.md

@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.

@jsafrane
Copy link

jsafrane commented Oct 4, 2024

/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 Oct 4, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit b51cd6b into openshift:master Oct 4, 2024
9 of 10 checks passed
@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

Distgit: ose-aws-ebs-csi-driver
This PR has been included in build ose-aws-ebs-csi-driver-container-v4.18.0-202410041911.p0.gb51cd6b.assembly.stream.el9.
All builds following this will include this PR.

@dfajmon dfajmon deleted the rebase-v1.34.0 branch October 7, 2024 08:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jsafrane jsafrane Awaiting requested review from jsafrane

@RomanBednar RomanBednar Awaiting requested review from RomanBednar

Assignees

@gnufied gnufied

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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.