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.

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

Bug 2043130: Update CSI sidecars to the latest release for 4.10 #66

Merged
merged 52 commits into from
Jan 26, 2022

Conversation

dobsonj
Copy link
Member

@dobsonj dobsonj commented Jan 20, 2022

This rebases on v5.0.1 upstream, bumps the Dockerfiles to the golang 1.17 images, and removes 2 stale Dockerfiles that have not been updated in some time (Dockerfile.openshift.rhel7 and Dockerfile.snapshot-controller.openshift).
The Dockerfile changes replace the need for these 3 ART PR's, which were blocked until upstream moved to golang 1.17:

Upstream comparison: kubernetes-csi/external-snapshotter@v5.0.1...dobsonj:bug2043130
/cc @openshift/storage

jsafrane and others added 30 commits August 19, 2021 18:14
RecordMetrics() grabs a mutex and calls recordCancelMetric(), which wants to
grab the same mutex. Go mutexes are not recursive, so recordCancelMetric
blocks forever.

recordCancelMetric should not grab the mutex, it can be sure that the
caller did it already.
kubernetes-csi/csi-release-tools@5489de6e Merge kubernetes-csi/csi-release-tools#174 from mauriciopoppe/bump-kind-version
kubernetes-csi/csi-release-tools@0c675d4c Bump kind version to v0.11.1
kubernetes-csi/csi-release-tools@ef69a88d Merge kubernetes-csi/csi-release-tools#173 from nick5616/add-ws2022
kubernetes-csi/csi-release-tools@44c710c5 added WS2022 to build platforms
kubernetes-csi/csi-release-tools@0883be4f Merge kubernetes-csi/csi-release-tools#171 from pohly/example-commands
kubernetes-csi/csi-release-tools@02cda510 build.make: support binaries outside of cmd, with optional go.mod
kubernetes-csi/csi-release-tools@65922ea2 Merge kubernetes-csi/csi-release-tools#170 from pohly/canary-snapshot-controller
kubernetes-csi/csi-release-tools@c0bdfb3a prow.sh: deploy canary snapshot-controller in canary jobs
kubernetes-csi/csi-release-tools@0438f15a Merge kubernetes-csi/csi-release-tools#167 from c0va23/feature/release-armv7-image
kubernetes-csi/csi-release-tools@4786f4d0 Merge kubernetes-csi/csi-release-tools#168 from msau42/update-release-prereq
kubernetes-csi/csi-release-tools@6a2dc64a Remove requirement to be top-level approver. Only maintainers membership is required to do a release
kubernetes-csi/csi-release-tools@30a4f7bb Release armv7 image
kubernetes-csi/csi-release-tools@ac8108f1 Merge kubernetes-csi/csi-release-tools#165 from consideRatio/pr/update-github-links-ref-to-master-to-HEAD
kubernetes-csi/csi-release-tools@999b483d docs: make github links reference HEAD instead of main
kubernetes-csi/csi-release-tools@fd670693 docs: make github links reference HEAD instead of master

git-subtree-dir: release-tools
git-subtree-split: 5489de6
WIP
Signed-off-by: Grant Griffiths <ggriffiths@purestorage.com>
Signed-off-by: Grant Griffiths <ggriffiths@purestorage.com>
Signed-off-by: Grant Griffiths <ggriffiths@purestorage.com>
Signed-off-by: Grant Griffiths <ggriffiths@purestorage.com>
Signed-off-by: Grant Griffiths <ggriffiths@purestorage.com>
Signed-off-by: Grant Griffiths <ggriffiths@purestorage.com>
Signed-off-by: Grant Griffiths <ggriffiths@purestorage.com>
Signed-off-by: Grant Griffiths <ggriffiths@purestorage.com>
- Also address PR feedback re: avoid a deepCopy for annotations patch

Signed-off-by: Grant Griffiths <ggriffiths@purestorage.com>
Signed-off-by: Grant Griffiths <ggriffiths@purestorage.com>
…atuserror_patch

Use JSON patch for many VolumeSnapshot and VolumeSnapshotContent updates
kubernetes-csi/csi-release-tools@5b9a1e06 Merge kubernetes-csi/csi-release-tools#175 from jimdaga/patch-1
kubernetes-csi/csi-release-tools@5eeb6029 images: use k8s-staging-test-infra/gcb-docker-gcloud

git-subtree-dir: release-tools
git-subtree-split: 5b9a1e0
Signed-off-by: Grant Griffiths <ggriffiths@purestorage.com>
…_status

Fix an issue where patch will fail when status is nil
This allows end users to run `kubectl get vs`, for example, instead of
`kubectl get volumesnapshot`. The following short names have been
implemented:

* `VolumeSnapshot` - `vs`
* `VolumeSnapshotContent` - `vsc`, `vscs`
* `VolumeSnapshotClass` - `vsclass`, `vsclasses`

(cherry picked from commit 4f5383a)
…-5.0

Add short names for Volume Snapshot CRDs
Update CertificateSigningRequest apiversion to V1
kubernetes-csi/csi-release-tools@a6a1a797 Merge kubernetes-csi/csi-release-tools#176 from pohly/go-1.17.3
kubernetes-csi/csi-release-tools@0a2cf636 prow.sh: bump Go to 1.17.3
kubernetes-csi/csi-release-tools@fc29fdde Merge kubernetes-csi/csi-release-tools#141 from pohly/prune-replace-optional
kubernetes-csi/csi-release-tools@b46691a4 go-get-kubernetes.sh: make replace statement pruning optional

git-subtree-dir: release-tools
git-subtree-split: a6a1a79
@openshift-ci
Copy link

openshift-ci bot commented Jan 20, 2022

@dobsonj: This pull request references Bugzilla bug 2043130, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.10.0) matches configured target release for branch (4.10.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

No GitHub users were found matching the public email listed for the QA contact in Bugzilla (wduan@redhat.com), skipping review request.

In response to this:

Bug 2043130: Update CSI sidecars to the latest release for 4.10

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/test-infra repository.

1 similar comment
@openshift-ci
Copy link

openshift-ci bot commented Jan 20, 2022

@dobsonj: This pull request references Bugzilla bug 2043130, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.10.0) matches configured target release for branch (4.10.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

No GitHub users were found matching the public email listed for the QA contact in Bugzilla (wduan@redhat.com), skipping review request.

In response to this:

Bug 2043130: Update CSI sidecars to the latest release for 4.10

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/test-infra repository.

@openshift-ci
Copy link

openshift-ci bot commented Jan 20, 2022

@dobsonj: An error was encountered querying GitHub for users with public email (wduan@redhat.com) for bug 2043130 on the Bugzilla server at https://bugzilla.redhat.com. No known errors were detected, please see the full error message for details.

Full error message. non-200 OK status code: 403 Forbidden body: "{\n \"documentation_url\": \"https://docs.github.com/en/free-pro-team@latest/rest/overview/resources-in-the-rest-api#secondary-rate-limits\",\n \"message\": \"You have exceeded a secondary rate limit. Please wait a few minutes before you try again.\"\n}\n"

Please contact an administrator to resolve this issue, then request a bug refresh with /bugzilla refresh.

In response to this:

Bug 2043130: Update CSI sidecars to the latest release for 4.10

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/test-infra repository.

@dobsonj
Copy link
Member Author

dobsonj commented Jan 20, 2022

/hold
Test failure from https://gcsweb-ci.apps.ci.l2s4.p1.openshiftapps.com/gcs/origin-ci-test/pr-logs/pull/openshift_csi-external-snapshotter/66/pull-ci-openshift-csi-external-snapshotter-master-e2e-aws-csi/1484224021531725824/artifacts/e2e-aws-csi/gather-extra/artifacts/pods/openshift-cluster-csi-drivers_aws-ebs-csi-driver-controller-798f66c9d-8tdw8_csi-snapshotter.log

E0120 19:12:25.163042       1 snapshot_controller.go:107] createSnapshot for content [snapcontent-66d2d434-f61a-4eb4-bfc3-97ea04820a36]: error occurred in createSnapshotWrapper: failed to add VolumeSnapshotBeingCreated annotation on the content snapcontent-66d2d434-f61a-4eb4-bfc3-97ea04820a36: "snapshot controller failed to update snapcontent-66d2d434-f61a-4eb4-bfc3-97ea04820a36 on API server: volumesnapshotcontents.snapshot.storage.k8s.io \"snapcontent-66d2d434-f61a-4eb4-bfc3-97ea04820a36\" is forbidden: User \"system:serviceaccount:openshift-cluster-csi-drivers:aws-ebs-csi-driver-controller-sa\" cannot patch resource \"volumesnapshotcontents\" in API group \"snapshot.storage.k8s.io\" at the cluster scope"

This is from the "Breaking Change" in the release notes for v5.0.1:

Replaces many VolumeSnapshot/VolumeSnapshotContent Update/UpdateStatus operations with Patch. This lowers the probability of the "object has been modified" update API errors occurring. This change introduces a dependency on two new RBAC rules for the CSI snapshotter sidecar: volumesnapshotcontents:patch, volumesnapshotcontents/status:patch and four new RBAC rules for the snapshot-controller: volumesnapshotcontents:patch, volumesnapshotcontents/status:patch, volumesnapshots:patch, and volumesnapshots/status: patch.

@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 Jan 20, 2022
@dobsonj
Copy link
Member Author

dobsonj commented Jan 24, 2022

/retest

1 similar comment
@dobsonj
Copy link
Member Author

dobsonj commented Jan 24, 2022

/retest

@dobsonj
Copy link
Member Author

dobsonj commented Jan 25, 2022

/test ci/prow/e2e-aws-csi

@openshift-ci
Copy link

openshift-ci bot commented Jan 25, 2022

@dobsonj: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

  • /test e2e-aws-csi
  • /test e2e-gcp-csi
  • /test images
  • /test unit

The following commands are available to trigger optional jobs:

  • /test e2e-ovirt

Use /test all to run the following jobs that were automatically triggered:

  • pull-ci-openshift-csi-external-snapshotter-master-e2e-aws-csi
  • pull-ci-openshift-csi-external-snapshotter-master-e2e-gcp-csi
  • pull-ci-openshift-csi-external-snapshotter-master-images
  • pull-ci-openshift-csi-external-snapshotter-master-unit

In response to this:

/test ci/prow/e2e-aws-csi

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/test-infra repository.

@dobsonj
Copy link
Member Author

dobsonj commented Jan 25, 2022

/test e2e-aws-csi

1 similar comment
@dobsonj
Copy link
Member Author

dobsonj commented Jan 25, 2022

/test e2e-aws-csi

@RomanBednar
Copy link

/test e2e-gcp-csi

@openshift-ci
Copy link

openshift-ci bot commented Jan 26, 2022

@dobsonj: all tests passed!

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/test-infra repository. I understand the commands that are listed here.

@jsafrane
Copy link

/hold cancel
All CSI driver operators were updated with the new RBACs.
/lgtm

@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 Jan 26, 2022
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 26, 2022
@openshift-merge-robot openshift-merge-robot merged commit fe4a0a2 into openshift:master Jan 26, 2022
@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-csi-snapshot-validation-webhook-container-v4.10.0-202305011254.p0.gfe4a0a2.assembly.stream for distgit csi-snapshot-validation-webhook.
All builds following this will include this PR.

@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-csi-external-snapshotter-container-v4.10.0-202305011254.p0.gfe4a0a2.assembly.stream for distgit ose-csi-external-snapshotter.
All builds following this will include this PR.

@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-csi-snapshot-controller-container-v4.10.0-202305011254.p0.gfe4a0a2.assembly.stream for distgit ose-csi-snapshot-controller.
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. bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.