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-1593: Rebase external-snapshotter to v8.0.1 for OCP 4.17 #156

Merged
merged 111 commits into from
Aug 7, 2024
Merged

STOR-1593: Rebase external-snapshotter to v8.0.1 for OCP 4.17 #156

merged 111 commits into from
Aug 7, 2024

Conversation

dfajmon
Copy link

@dfajmon dfajmon commented Jun 25, 2024 •
edited
Loading

Diff to upstream 8.0.1:
kubernetes-csi/external-snapshotter@v8.0.1...dfajmon:rebase-8.0.1

Changes between 7.0.1 (OCP 4.16) and 8.0.1 (OCP 4.17):

Full changelogs:
https://github.com/kubernetes-csi/external-snapshotter/releases/tag/v8.0.1

@openshift/storage

xing-yang and others added 30 commits February 9, 2024 12:53
@xing-yang
Add nil check for SourceVolumeMode in the ValidationWebHook
36738cd
@k8s-ci-robot
Merge pull request kubernetes-csi#1005 from xing-yang/check_volumemod…
ebf903a 
…econversion

Add nil check for SourceVolumeMode in the validation webhook
@dependabot
Bump google.golang.org/grpc from 1.61.0 to 1.61.1
df3aa4f 
Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.61.0 to 1.61.1.
- [Release notes](https://github.com/grpc/grpc-go/releases)
- [Commits](grpc/grpc-go@v1.61.0...v1.61.1)

---
updated-dependencies:
- dependency-name: google.golang.org/grpc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@Madhu-1
Add snapshot size to VSC created for VGS
5a7115d 
Currently the RestoreSize is missing when
the corresponding VSC are created for the
the volumesnapshotgroup, This PR adds the missing
RestoreSize for VSC.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
@k8s-ci-robot
Merge pull request kubernetes-csi#1010 from kubernetes-csi/dependabot…
dc1f861 
…/go_modules/google.golang.org/grpc-1.61.1

Bump google.golang.org/grpc from 1.61.0 to 1.61.1
@k8s-ci-robot
Merge pull request kubernetes-csi#1011 from Madhu-1/fix-size-vsc
18241c3 
Add snapshot size to VSC created for VGS
@Madhu-1
fix method name in logging
0fe3abb 
updating code to use correct method
names for logging.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
@Madhu-1
use GroupSnapshotDeleteError type for event
5706ab6 
use GroupSnapshotDeleteError as event type for
event incase if there is any failure in delete
operation.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
@k8s-ci-robot
Merge pull request kubernetes-csi#1014 from Madhu-1/fix-logging
ca0b24b 
Fix logging in the volumegroupsnapshot methods
@nixpanic
Fix detecting default annotation on VolumeGroupSnapshotClass
aa837d1 
The `IsDefaultAnnotation()` function has been extended to check for the
correct default annotation, taking the Kind of the object into
consideration.
@k8s-ci-robot
Merge pull request kubernetes-csi#1015 from nixpanic/issue/968
10c1032 
Fix detecting default annotation on VolumeGroupSnapshotClass
@RaunakShah
Merge commit '59e5148a47423a77938a1401de085f7b4c0d1bb9' into release-…
510a702 
…tools-go-update
@RaunakShah
Squashed 'release-tools/' changes from b54c1ba..dc4d0ae
59e5148 
dc4d0ae Merge pull request kubernetes-csi#249 from jsafrane/use-go-version
e681b17 Use .go-version to get Kubernetes go version

git-subtree-dir: release-tools
git-subtree-split: dc4d0ae
@k8s-ci-robot
Merge pull request kubernetes-csi#1020 from RaunakShah/release-tools-…
b2bbd07 
…go-update

Update release tools with go version fix
@dependabot
Bump github.com/prometheus/client_model from 0.5.0 to 0.6.0
e79e2d1 
Bumps [github.com/prometheus/client_model](https://github.com/prometheus/client_model) from 0.5.0 to 0.6.0.
- [Release notes](https://github.com/prometheus/client_model/releases)
- [Commits](prometheus/client_model@v0.5.0...v0.6.0)

---
updated-dependencies:
- dependency-name: github.com/prometheus/client_model
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
@k8s-ci-robot
Merge pull request kubernetes-csi#1013 from kubernetes-csi/dependabot…
d616d72 
…/go_modules/github.com/prometheus/client_model-0.6.0

Bump github.com/prometheus/client_model from 0.5.0 to 0.6.0
@dependabot
Bump github.com/prometheus/client_golang from 1.18.0 to 1.19.0
a8a5df8 
Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.18.0 to 1.19.0.
- [Release notes](https://github.com/prometheus/client_golang/releases)
- [Changelog](https://github.com/prometheus/client_golang/blob/v1.19.0/CHANGELOG.md)
- [Commits](prometheus/client_golang@v1.18.0...v1.19.0)

---
updated-dependencies:
- dependency-name: github.com/prometheus/client_golang
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
@ConnorJC3
Discard unnecessary VolumeSnapshotContent updates to prevent rapid RP…
35579f2 
…C calls

Signed-off-by: Connor Catlett <conncatl@amazon.com>
@k8s-ci-robot
Merge pull request kubernetes-csi#1009 from ConnorJC3/fix-snapshotter…
3177660 
…-rpc-spam

Discard unnecessary VolumeSnapshotContent updates to prevent rapid RPC calls
@dependabot
Bump google.golang.org/grpc from 1.61.1 to 1.62.1
b3e0b20 
Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.61.1 to 1.62.1.
- [Release notes](https://github.com/grpc/grpc-go/releases)
- [Commits](grpc/grpc-go@v1.61.1...v1.62.1)

---
updated-dependencies:
- dependency-name: google.golang.org/grpc
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
@k8s-ci-robot
Merge pull request kubernetes-csi#1027 from kubernetes-csi/dependabot…
34fee32 
…/go_modules/google.golang.org/grpc-1.62.1

Bump google.golang.org/grpc from 1.61.1 to 1.62.1
@k8s-ci-robot
Merge pull request kubernetes-csi#1025 from kubernetes-csi/dependabot…
fcf78d3 
…/go_modules/github.com/prometheus/client_golang-1.19.0

Bump github.com/prometheus/client_golang from 1.18.0 to 1.19.0
@leonardoce
Update controller deployment to latest version
34b1ab4
@dobsonj
CVE-2024-24786: bump google.golang.org/protobuf to v1.33.0
a3c0888
@k8s-ci-robot
Merge pull request kubernetes-csi#1033 from dobsonj/CVE-2024-24786-or…
8756a3e 
…igin-master

CVE-2024-24786: bump google.golang.org/protobuf to v1.33.0
@dependabot
Bump github.com/prometheus/common from 0.48.0 to 0.51.1
3b11e7b 
Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.48.0 to 0.51.1.
- [Release notes](https://github.com/prometheus/common/releases)
- [Commits](prometheus/common@v0.48.0...v0.51.1)

---
updated-dependencies:
- dependency-name: github.com/prometheus/common
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
@manishym
Add snapshot secret reference to group snapshot controller.
e171a98 
Fixes: kubernetes-csi#834
Signed-off-by: Manish <myathnal@redhat.com>
@k8s-ci-robot
Merge pull request kubernetes-csi#1034 from manishym/secretReference
67dcee2 
Add snapshot secret reference to group snapshot controller.
@k8s-ci-robot
Merge pull request kubernetes-csi#1042 from kubernetes-csi/dependabot…
f58c72c 
…/go_modules/github.com/prometheus/common-0.51.1

Bump github.com/prometheus/common from 0.48.0 to 0.51.1
@k8s-ci-robot
Merge pull request kubernetes-csi#1031 from leonardoce/dev/update
fa9de9c 
Update controller deployment to latest version
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jul 8, 2024 •
edited by openshift-ci bot
Loading

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

In response to this:

Diff to upstream 8.0.1:
kubernetes-csi/external-snapshotter@v8.0.1...dfajmon:rebase-8.0.1

Changes between 7.0.1 (OCP 4.16) and 8.0.1 (OCP 4.17):

Full changelogs:
https://github.com/kubernetes-csi/external-snapshotter/releases/tag/v8.0.1

@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 openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Jul 11, 2024
@dfajmon
Copy link
Author

dfajmon commented Jul 11, 2024

/retest

1 similar comment
@dfajmon
Copy link
Author

dfajmon commented Jul 12, 2024

/retest

@duanwei33
Copy link

Need to take a look on the snapshot failed cases due to:

{ fail [k8s.io/kubernetes@v1.30.1/test/e2e/storage/framework/snapshot_resource.go:75]: admission webhook "volumesnapshotclasses.snapshot.storage.k8s.io" denied the request: expect resource to be {snapshot.storage.k8s.io v1 volumesnapshotclasses}, but found {snapshot.storage.k8s.io v1 volumesnapshots}

@duanwei33
Copy link

The error comes from csi-snapshot-webhook, not sure why it admitting volumesnapshotclasses when creating the volumesnapshot.

I0716 00:31:13.424783 1 webhook.go:131] handling request: {"kind":"AdmissionReview","apiVersion":"admission.k8s.io/v1","request":{"uid":"e4f2d61a-1a44-44a6-8503-ffe0c754964d","kind":{"group":"snapshot.storage.k8s.io","version":"v1","kind":"VolumeSnapshot"},"resource":{"group":"snapshot.storage.k8s.io","version":"v1","resource":"volumesnapshots"},"requestKind":{"group":"snapshot.storage.k8s.io","version":"v1","kind":"VolumeSnapshot"},"requestResource":{"group":"snapshot.storage.k8s.io","version":"v1","resource":"volumesnapshots"},"name":"mysnapshot","namespace":"wduan-snapshot","operation":"CREATE","userInfo":{"username":"system:admin","groups":["system:masters","system:authenticated"]},"object":{"apiVersion":"snapshot.storage.k8s.io/v1","kind":"VolumeSnapshot","metadata":{"creationTimestamp":"2024-07-16T00:31:13Z","generation":1,"managedFields":[{"apiVersion":"snapshot.storage.k8s.io/v1","fieldsType":"FieldsV1","fieldsV1":{"f:spec":{".":{},"f:source":{".":{},"f:persistentVolumeClaimName":{}},"f:volumeSnapshotClassName":{}}},"manager":"kubectl-create","operation":"Update","time":"2024-07-16T00:31:13Z"}],"name":"mysnapshot","namespace":"wduan-snapshot","uid":"d2851159-b30e-450a-ab51-7f74301334f7"},"spec":{"source":{"persistentVolumeClaimName":"mypvc-ori"},"volumeSnapshotClassName":"csi-aws-vsc"}},"oldObject":null,"dryRun":false,"options":{"kind":"CreateOptions","apiVersion":"meta.k8s.io/v1","fieldManager":"kubectl-create","fieldValidation":"Ignore"}}}
I0716 00:31:13.424888 1 snapshot.go:52] admitting volumesnapshotclasses
E0716 00:31:13.424902 1 snapshot.go:84] expect resource to be {snapshot.storage.k8s.io v1 volumesnapshotclasses}, but found {snapshot.storage.k8s.io v1 volumesnapshots}
I0716 00:31:13.424936 1 webhook.go:177] sending response: &AdmissionReview{Request:nil,Response:&AdmissionResponse{UID:e4f2d61a-1a44-44a6-8503-ffe0c754964d,Allowed:false,Result:&v1.Status{ListMeta:ListMeta{SelfLink:,ResourceVersion:,Continue:,RemainingItemCount:nil,},Status:,Message:expect resource to be {snapshot.storage.k8s.io v1 volumesnapshotclasses}, but found {snapshot.storage.k8s.io v1 volumesnapshots},Reason:,Details:nil,Code:0,},Patch:nil,PatchType:nil,AuditAnnotations:map[string]string{},Warnings:[],},}

@jsafrane
Copy link

The release note say:

Urgent Upgrade Notes

(No, really, you MUST read this before you upgrade)

The validating logic for VolumeSnapshots, VolumeSnapshotContents, VolumeGroupSnapshots, and VolumeGroupSnapshotContents has been replaced by CEL validation rules. The validating webhook is now only being used for VolumeSnapshotClasses and VolumeGroupSnapshotClasses to ensure that there's at most one class per CSI Driver. The validation webhook is deprecated and will be removed in the next release. (kubernetes-csi#1091, @leonardoce)

So, we need to rework the cluster-csi-snapshot-controller-operator a bit:

  1. We need to update snapshot CRD definitions there with the new CRDs from external-snapshotter.
  2. We need to update the webhook config there to validate only VolumeSnapshotClasses and VolumeGroupSnapshotClasses.

@dfajmon dfajmon mentioned this pull request Jul 25, 2024
Merged
@jsafrane
Copy link

/retest

@jsafrane
Copy link

/retest
expecting the new snapshot-operator to be there...

@dfajmon
Copy link
Author

dfajmon commented Jul 31, 2024

/retest

@jsafrane
Copy link

/lgtm
/approve
/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 31, 2024
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 31, 2024
@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Jul 31, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dfajmon, 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 /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 31, 2024
@jsafrane
Copy link

@duanwei33 upstream has reworked the webhook - some validation is done by the API server directly, without the webhook. In general, users should see no difference.

@duanwei33
Copy link

Snapshot cases look good in CI.
We might need to update some validation test in QE's Polarion, we can do that later.

/label qe-approved

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

openshift-ci-robot commented Aug 7, 2024 •
edited by openshift-ci bot
Loading

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

In response to this:

Diff to upstream 8.0.1:
kubernetes-csi/external-snapshotter@v8.0.1...dfajmon:rebase-8.0.1

Changes between 7.0.1 (OCP 4.16) and 8.0.1 (OCP 4.17):

Full changelogs:
https://github.com/kubernetes-csi/external-snapshotter/releases/tag/v8.0.1

@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 OpenShift CI
Copy link

openshift-ci bot commented Aug 7, 2024

@dfajmon: 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-sigs/prow repository. I understand the commands that are listed here.

@openshift-merge-bot openshift-merge-bot bot merged commit aa558ca into openshift:master Aug 7, 2024
9 checks passed
@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

Distgit: csi-snapshot-validation-webhook
This PR has been included in build ose-csi-snapshot-validation-webhook-container-v4.18.0-202408071445.p0.gaa558ca.assembly.stream.el9.
All builds following this will include this PR.

@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

Distgit: ose-csi-external-snapshotter
This PR has been included in build ose-csi-external-snapshotter-container-v4.18.0-202408071445.p0.gaa558ca.assembly.stream.el9.
All builds following this will include this PR.

@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

Distgit: ose-csi-snapshot-controller
This PR has been included in build ose-csi-snapshot-controller-container-v4.18.0-202408071445.p0.gaa558ca.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
Reviewers

@jsafrane jsafrane Awaiting requested review from jsafrane

@RomanBednar RomanBednar Awaiting requested review from RomanBednar

Assignees

@jsafrane jsafrane

@RomanBednar RomanBednar

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.

ProbeForever has 1 second delay