STOR-2534,STOR-2586: Rebase to v8.4.0 for OCP 4.21 #189
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This commit introduces the new VolumeGroupSnapshot v1beta2 API, updates the CRD and the generated code. Both v1beta1 and v1beta2 APIs are served, with v1beta1 being the stored version.
This patch configures the conversion strategy on the VolumeGroupSnapshot, VolumeGroupSnapshotContent and VolumeGroupSnapshotClass CRDs. Since v1beta2 is marked as the stored version, client using v1beta1 will now require the conversion webhook to operate propertly.
This commit has just the minimal changes to make the code use the new API. The new fields are not yet set.
This patch improves the sidecar to set the fields introduced by the VolumeGroupSnapshotContent v1beta2 API when dynamically provisioning a VolumeGroupSnapshot. This information is then used by the common snapshot controller to set the status of the member VolumeSnapshotContent objects, allowing the relative fields to be set even when the CSI driver does not implement the ListSnapshots RPC call.
This patch implements a reversible conversion webhook from/to VolumeGroupSnapshots v1beta1 to/from VolumeGroupSnapshots v1beta2. The extra fields included in the new API are tracked in an annotation that is automatically set on v1beta1 objects.
Signed-off-by: Leonardo Cecchi <[email protected]>
This patch makes several corrections to the conversion webhook: - fixes several occurrences of the old validation webhook codebase - simplify the webhook command and drops the direct cobra dependency - align the README with what the code really does - removes the unneeded structure in the unit tests - removes unneeded code and the unneeded dependencies - drop support for converting VolumeSnapshots and VolumeSnapshotClasses as they are structurally identical Signed-off-by: Leonardo Cecchi <[email protected]>
…e conversion webhook Signed-off-by: Leonardo Cecchi <[email protected]>
Signed-off-by: Leonardo Cecchi <[email protected]>
Signed-off-by: Leonardo Cecchi <[email protected]>
Signed-off-by: Leonardo Cecchi <[email protected]>
Signed-off-by: Leonardo Cecchi <[email protected]>
Apply Jan's suggestions. Signed-off-by: Leonardo Cecchi <[email protected]>
Introduce v1beta2 VolumeGroupSnapshot API
… election lease on sigterm
…s-faster Restart external-snapshotter faster by releasing leader election lease on sigterm
5f38a9075 Merge pull request kubernetes-csi#282 from rhrmo/update-go-1.24.6 579f62421 Update go to 1.24.6 74e066a82 Merge pull request kubernetes-csi#279 from Aishwarya-Hebbar/update-csi-prow-version 6f236be7d Update CSI prow driver version to v1.17.0 0ee55894b Merge pull request kubernetes-csi#280 from xing-yang/update_go_1.24.4 9af101534 update to go 1.24.4 f5fec3e36 Merge pull request kubernetes-csi#275 from chrishenzie/emeritus c5d285db8 Remove chrishenzie from kubernetes-csi-reviewers git-subtree-dir: release-tools git-subtree-split: 5f38a907597230563f5e2213aea116acdd9d86bc
Bump k8s dependencies to v1.34.0
test: fix CVE-2025-47907 error in trivy action
Bumps [actions/setup-go](https://github.com/actions/setup-go) from 5 to 6. - [Release notes](https://github.com/actions/setup-go/releases) - [Commits](actions/setup-go@v5...v6) --- updated-dependencies: - dependency-name: actions/setup-go dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]>
…/github_actions/actions/setup-go-6 Bump actions/setup-go from 5 to 6
Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 5. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@v4...v5) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '5' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]>
…/github_actions/actions/checkout-5 Bump actions/checkout from 4 to 5
Signed-off-by: Leonardo Cecchi <[email protected]>
Signed-off-by: Leonardo Cecchi <[email protected]>
Signed-off-by: Leonardo Cecchi <[email protected]>
Signed-off-by: Leonardo Cecchi <[email protected]>
74502e544 Merge pull request kubernetes-csi#278 from liangyuanpeng/migrate_k8s_testimages 533443055 Merge pull request kubernetes-csi#281 from kubernetes-csi/dependabot/github_actions/actions/checkout-5 458ce146f Bump actions/checkout from 4 to 5 5ec1a52b8 use gcr.io/k8s-staging-test-infra instead of gcr.io/k8s-testimages git-subtree-dir: release-tools git-subtree-split: 74502e544bc6a17820892c0d490e8f0b59462998
…tool_update Release tool update
Update CSI spec to 1.12
Deprecate VolumeGroupSnapshot v1beta1, address API review comments
fix: remove unused help functions
Add changelog for v8.4
and remove .github
Additional changes: Update .ci-operator.yaml and Dockerfiles for OCP 4.21
openshift-ci-robot
added
the
jira/valid-reference
|
@jsafrane: This pull request references STOR-2534 which is a valid jira issue. This pull request references STOR-2586 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. In response to this:
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. |
|
/hold |
openshift-ci
bot
added
the
do-not-merge/hold
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: jsafrane 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 |
openshift-ci
bot
added
the
approved
|
@jsafrane: The following test failed, say
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. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
11 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Upstream changelogs
Summary of changes
Major features and improvements from v8.3.0 to v8.4.0:
worker-threadsflag to make the number of worker threads in snapshot-controller and csi-snapshotter configurableCarried commits
All commits from the previous rebase (v8.3.0) have been carried forward:
4279ab8 -
UPSTREAM: <carry>: Add OpenShift files- cherry-pick8b132ec -
UPSTREAM: <carry>: Updating ose-csi-external-snapshotter-container image to be consistent with ART for 4.21- squash7bdcd9c -
UPSTREAM: <carry>: Updating ose-csi-snapshot-controller-container image to be consistent with ART for 4.21- squashAll squashed commits have been combined into a single commit: "UPSTREAM: : Add OpenShift files" which includes updates to .ci-operator.yaml and Dockerfiles for OCP 4.21.
Testing
make- Build successfulmake test- All tests passDiff to upstream: kubernetes-csi/external-snapshotter@v8.4.0...jsafrane:external-snapshotter:rebase-v8.4.0
Previous rebase: #181