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

STOR-1700: Rebase external-snapshotter to v7.0.0 to get VolumeGroupSnapshot #139

Merged
merged 112 commits into from
Feb 7, 2024

Conversation

mpatlasov
Copy link

Diff to upstream v7.0.0:
kubernetes-csi/external-snapshotter@v7.0.0...mpatlasov:rebase-v7.0.0

Changes between 6.3.0 (OCP 4.15) and 7.0.0:

Full changelogs:

https://github.com/kubernetes-csi/external-snapshotter/releases/tag/v7.0.0

@openshift/storage

bjschafer and others added 30 commits June 9, 2023 10:11
Previously, the CRD yaml files did not include the objectmeta field
(metadata) that the CRD definitions themselves do include. This was
causing issues for tools that parse only the schema, such as linters.

This updates all of the yaml files to include the metadata field in
their schemae.
Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.58.0 to 1.58.1.
- [Release notes](https://github.com/grpc/grpc-go/releases)
- [Commits](grpc/grpc-go@v1.58.0...v1.58.1)

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

Signed-off-by: dependabot[bot] <[email protected]>
…go_modules/google.golang.org/grpc-1.58.1

Bump google.golang.org/grpc from 1.58.0 to 1.58.1
Manually update to [email protected]

It was necessary to update to kubernetes-csi/[email protected] to remove dependency on cloud.google.com/[email protected]
fix unit tests

operate on cloned copy

revert to update call for removeSnapshotFinalizer

fix content delete finalizer
…sue-748

Update VolumeSnapshot and VolumeSnapshotContent using JSON patch
…ernetes_recommand_labels

chore: Adopt kubernetes recommand label
Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.58.1 to 1.58.2.
- [Release notes](https://github.com/grpc/grpc-go/releases)
- [Commits](grpc/grpc-go@v1.58.1...v1.58.2)

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

Signed-off-by: dependabot[bot] <[email protected]>
…go_modules/google.golang.org/grpc-1.58.2

Bump google.golang.org/grpc from 1.58.1 to 1.58.2
Bumps [github.com/prometheus/client_model](https://github.com/prometheus/client_model) from 0.4.0 to 0.5.0.
- [Release notes](https://github.com/prometheus/client_model/releases)
- [Commits](prometheus/client_model@v0.4.0...v0.5.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] <[email protected]>
…go_modules/github.com/prometheus/client_model-0.5.0

Bump github.com/prometheus/client_model from 0.4.0 to 0.5.0
Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.58.2 to 1.58.3.
- [Release notes](https://github.com/grpc/grpc-go/releases)
- [Commits](grpc/grpc-go@v1.58.2...v1.58.3)

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

Signed-off-by: dependabot[bot] <[email protected]>
f9d5b9c Merge pull request kubernetes-csi#236 from mowangdk/feature/bump_csi-driver-host-path_version
b01fd53 Bump csi-driver-host-path version up to v1.12.0

git-subtree-dir: release-tools
git-subtree-split: f9d5b9c
VolumeGroupSnapshots are still in alpha.
This commit adds cmdline args to enable group snapshot
webhooks while keeping it disbaled by default.

Signed-off-by: Rakshith R <[email protected]>
…go_modules/google.golang.org/grpc-1.58.3

Bump google.golang.org/grpc from 1.58.2 to 1.58.3
Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.58.3 to 1.59.0.
- [Release notes](https://github.com/grpc/grpc-go/releases)
- [Commits](grpc/grpc-go@v1.58.3...v1.59.0)

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

Signed-off-by: dependabot[bot] <[email protected]>
…groupsnapshot-webhook

add cmdline args to enable group snapshot webhooks
…go_modules/google.golang.org/grpc-1.59.0

Bump google.golang.org/grpc from 1.58.3 to 1.59.0
Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.44.0 to 0.45.0.
- [Release notes](https://github.com/prometheus/common/releases)
- [Commits](prometheus/common@v0.44.0...v0.45.0)

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

Signed-off-by: dependabot[bot] <[email protected]>
…go_modules/github.com/prometheus/common-0.45.0

Bump github.com/prometheus/common from 0.44.0 to 0.45.0
Bumps [github.com/fsnotify/fsnotify](https://github.com/fsnotify/fsnotify) from 1.6.0 to 1.7.0.
- [Release notes](https://github.com/fsnotify/fsnotify/releases)
- [Changelog](https://github.com/fsnotify/fsnotify/blob/main/CHANGELOG.md)
- [Commits](fsnotify/fsnotify@v1.6.0...v1.7.0)

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

Signed-off-by: dependabot[bot] <[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 Feb 5, 2024
@openshift-ci-robot
Copy link

openshift-ci-robot commented Feb 5, 2024

@mpatlasov: This pull request references STOR-1700 which is a valid jira issue.

In response to this:

Diff to upstream v7.0.0:
kubernetes-csi/external-snapshotter@v7.0.0...mpatlasov:rebase-v7.0.0

Changes between 6.3.0 (OCP 4.15) and 7.0.0:

Full changelogs:

https://github.com/kubernetes-csi/external-snapshotter/releases/tag/v7.0.0

@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 requested review from dobsonj and jsafrane February 5, 2024 21:55
Copy link

openshift-ci bot commented Feb 5, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mpatlasov

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 Feb 5, 2024
Copy link
Member

@bertinatto bertinatto left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 6, 2024
@mpatlasov
Copy link
Author

/label docs-approved
/label px-approved

@openshift-ci openshift-ci bot added docs-approved Signifies that Docs has signed off on this PR px-approved Signifies that Product Support has signed off on this PR labels Feb 6, 2024
@bertinatto
Copy link
Member

/lgtm cancel
@mpatlasov you might need to change the target branch.

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Feb 6, 2024
@mpatlasov mpatlasov changed the base branch from rebase-v7.0.0 to master February 6, 2024 18:34
@openshift-ci-robot
Copy link

openshift-ci-robot commented Feb 6, 2024

@mpatlasov: This pull request references STOR-1700 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 epic to target the "4.16.0" version, but no target version was set.

In response to this:

Diff to upstream v7.0.0:
kubernetes-csi/external-snapshotter@v7.0.0...mpatlasov:rebase-v7.0.0

Changes between 6.3.0 (OCP 4.15) and 7.0.0:

Full changelogs:

https://github.com/kubernetes-csi/external-snapshotter/releases/tag/v7.0.0

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

@bertinatto
Copy link
Member

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 6, 2024
Copy link

openshift-ci bot commented Feb 6, 2024

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

@Phaow
Copy link

Phaow commented Feb 7, 2024

Pre verify passed with pre merged build 4.16.0-0.test-2024-02-07-024915-ci-ln-r3tf8xt-latest (build 4.16,openshift/csi-external-snapshotter#139)

13 pass, 12 skip (13m45s)
$ oc logs csi-snapshot-controller-operator-7bfb6bbc6b-5pcsg| grep 'FeatureGates'| grep -i 'volume'
I0207 07:52:33.940035       1 event.go:364] Event(v1.ObjectReference{Kind:"Deployment", Namespace:"openshift-cluster-storage-operator", Name:"csi-snapshot-controller-operator", UID:"198a6ece-98a9-4ab5-b038-4ed444ed9b4f", APIVersion:"apps/v1", ResourceVersion:"", FieldPath:""}): type: 'Normal' reason: 'FeatureGatesInitialized' FeatureGates updated to featuregates.Features{Enabled:[]v1.FeatureGateName{"AdminNetworkPolicy", "AlibabaPlatform", "AutomatedEtcdBackup", "AzureWorkloadIdentity", "BuildCSIVolumes", "CSIDriverSharedResource", "CloudDualStackNodeIPs", "DNSNameResolver", "DynamicResourceAllocation", "ExternalCloudProvider", "ExternalCloudProviderAzure", "ExternalCloudProviderExternal", "ExternalCloudProviderGCP", "GCPClusterHostedDNS", "GCPLabelsTags", "GatewayAPI", "InsightsConfigAPI", "InstallAlternateInfrastructureAWS", "KMSv1", "MachineAPIProviderOpenStack", "MachineConfigNodes", "ManagedBootImages", "MaxUnavailableStatefulSet", "MetricsServer", "MixedCPUsAllocation", "NetworkLiveMigration", "NodeSwap", "OnClusterBuild", "OpenShiftPodSecurityAdmission", "PinnedImages", "PrivateHostedZoneAWS", "RouteExternalCertificate", "SignatureStores", "SigstoreImageVerification", "TranslateStreamCloseWebsocketRequests", "UpgradeStatus", "VSphereControlPlaneMachineSet", "VSphereStaticIPs", "ValidatingAdmissionPolicy", "VolumeGroupSnapshot"}, Disabled:[]v1.FeatureGateName{"ClusterAPIInstall", "DisableKubeletCloudCredentialProviders", "EventedPLEG", "MachineAPIOperatorDisableMachineHealthCheckController"}}
I0207 07:52:33.940091       1 starter.go:149] FeatureGates initialized: knownFeatureGates=[AdminNetworkPolicy AlibabaPlatform AutomatedEtcdBackup AzureWorkloadIdentity BuildCSIVolumes CSIDriverSharedResource CloudDualStackNodeIPs ClusterAPIInstall DNSNameResolver DisableKubeletCloudCredentialProviders DynamicResourceAllocation EventedPLEG ExternalCloudProvider ExternalCloudProviderAzure ExternalCloudProviderExternal ExternalCloudProviderGCP GCPClusterHostedDNS GCPLabelsTags GatewayAPI InsightsConfigAPI InstallAlternateInfrastructureAWS KMSv1 MachineAPIOperatorDisableMachineHealthCheckController MachineAPIProviderOpenStack MachineConfigNodes ManagedBootImages MaxUnavailableStatefulSet MetricsServer MixedCPUsAllocation NetworkLiveMigration NodeSwap OnClusterBuild OpenShiftPodSecurityAdmission PinnedImages PrivateHostedZoneAWS RouteExternalCertificate SignatureStores SigstoreImageVerification TranslateStreamCloseWebsocketRequests UpgradeStatus VSphereControlPlaneMachineSet VSphereStaticIPs ValidatingAdmissionPolicy VolumeGroupSnapshot]
$ oc get crd| grep volumegroupsnapshot
volumegroupsnapshotclasses.groupsnapshot.storage.k8s.io      2024-02-07T07:52:34Z
volumegroupsnapshotcontents.groupsnapshot.storage.k8s.io     2024-02-07T07:52:34Z
volumegroupsnapshots.groupsnapshot.storage.k8s.io            2024-02-07T07:52:34Z

For the rebase, regression tests pass is ok. The whole feature need to wait openshift/cluster-csi-snapshot-controller-operator#191 completed, we could merge the rebase codes firstly.

@Phaow
Copy link

Phaow commented Feb 7, 2024

/label qe-approved

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

openshift-ci-robot commented Feb 7, 2024

@mpatlasov: This pull request references STOR-1700 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 epic to target the "4.16.0" version, but no target version was set.

In response to this:

Diff to upstream v7.0.0:
kubernetes-csi/external-snapshotter@v7.0.0...mpatlasov:rebase-v7.0.0

Changes between 6.3.0 (OCP 4.15) and 7.0.0:

Full changelogs:

https://github.com/kubernetes-csi/external-snapshotter/releases/tag/v7.0.0

@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 196496e into openshift:master Feb 7, 2024
7 checks passed
@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-csi-snapshot-validation-webhook-container-v4.16.0-202402071412.p0.g196496e.assembly.stream.el9 for distgit csi-snapshot-validation-webhook.
All builds following this will include this PR.

mpatlasov added a commit to mpatlasov/csi-external-snapshotter that referenced this pull request Aug 27, 2024
This message is removed upstream and in newer openshift versions:
 * kubernetes-csi#882
 * openshift#139
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.