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

Remove Snapshot related components from OCS Plugin #5968

Merged
merged 1 commit into from
Oct 6, 2020

Conversation

bipuladh
Copy link
Contributor

No description provided.

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 13, 2020
@a2batic
Copy link
Contributor

a2batic commented Jul 14, 2020

@bipuladh please remove following files as well

frontend/packages/ceph-storage-plugin/src/utils/snapshot-workflow.ts
frontend/packages/ceph-storage-plugin/src/utils/delete-snapshot-workflow.ts
frontend/packages/ceph-storage-plugin/src/components/volume-snapshot/volume-snapshot.tsx
frontend/packages/ceph-storage-plugin/src/components/volume-snapshot/_volume-snapshot.scss
frontend/packages/ceph-storage-plugin/src/components/modals/volume-snapshot-modal/volume-snapshot-modal.tsx
frontend/packages/ceph-storage-plugin/src/components/modals/volume-snapshot-modal/_volume-snapshot-modal.scss
frontend/packages/ceph-storage-plugin/src/__tests__/volume-snapshot.spec.tsx
frontend/packages/ceph-storage-plugin/src/__tests__/volume-snapshot-modal.spec.tsx
frontend/packages/ceph-storage-plugin/src/__tests__/restore-pvc-modal.spec.tsx
frontend/packages/ceph-storage-plugin/src/__tests__/__snapshots__/volume-snapshot.spec.tsx.snap
frontend/packages/ceph-storage-plugin/src/__mocks__/volume-snapshot-data.tsx
frontend/packages/ceph-storage-plugin/src/utils/kebab-actions.ts

@a2batic
Copy link
Contributor

a2batic commented Jul 14, 2020

@bipuladh please do following changes as well.

  1. Remove Snapshot flag from features.ts
  2. Remove VolumeSnapshot model
diff --git a/frontend/packages/ceph-storage-plugin/src/features.ts b/frontend/packages/ceph-storage-plugin/src/features.ts
index e05e393d9..fae01c82e 100644
--- a/frontend/packages/ceph-storage-plugin/src/features.ts
+++ b/frontend/packages/ceph-storage-plugin/src/features.ts
@@ -23,7 +23,6 @@ export const CEPH_FLAG = 'CEPH';
 
 /* Key and Value should be same value received in CSV  */
 export const OCS_SUPPORT_FLAGS = {
-  SNAPSHOT: 'SNAPSHOT',
   EXTERNAL: 'EXTERNAL',
 };
 
diff --git a/frontend/packages/ceph-storage-plugin/src/models.ts b/frontend/packages/ceph-storage-plugin/src/models.ts
index 172262560..4612aa478 100644
--- a/frontend/packages/ceph-storage-plugin/src/models.ts
+++ b/frontend/packages/ceph-storage-plugin/src/models.ts
@@ -25,16 +25,3 @@ export const OCSServiceModel: K8sKind = {
   id: 'ocscluster',
   crd: true,
 };
-
-export const VolumeSnapshotModel: K8sKind = {
-  label: 'Volume Snapshot',
-  apiVersion: 'snapshot.storage.k8s.io/v1beta1',
-  apiGroup: '',
-  plural: 'volumesnapshots',
-  abbr: 'VS',
-  namespaced: true,
-  kind: 'VolumeSnapshot',
-  id: 'volumesnapshot',
-  labelPlural: 'Volume Snapshots',
-  crd: true,
-};

@openshift-ci-robot openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 16, 2020
@openshift-ci-robot openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 4, 2020
@bipuladh
Copy link
Contributor Author

bipuladh commented Sep 4, 2020

/hold
for 4.7

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 4, 2020
@cloudbehl
Copy link
Contributor

/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 5, 2020
Copy link
Contributor

@a2batic a2batic left a comment

Choose a reason for hiding this comment

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

Remove VolumeSnapshotModel in models.ts

diff --git a/frontend/packages/ceph-storage-plugin/src/models.ts b/frontend/packages/ceph-storage-plugin/src/models.ts
index 172262560..4612aa478 100644
--- a/frontend/packages/ceph-storage-plugin/src/models.ts
+++ b/frontend/packages/ceph-storage-plugin/src/models.ts
@@ -25,16 +25,3 @@ export const OCSServiceModel: K8sKind = {
   id: 'ocscluster',
   crd: true,
 };
-
-export const VolumeSnapshotModel: K8sKind = {
-  label: 'Volume Snapshot',
-  apiVersion: 'snapshot.storage.k8s.io/v1beta1',
-  apiGroup: '',
-  plural: 'volumesnapshots',
-  abbr: 'VS',
-  namespaced: true,
-  kind: 'VolumeSnapshot',
-  id: 'volumesnapshot',
-  labelPlural: 'Volume Snapshots',
-  crd: true,
-};

@a2batic
Copy link
Contributor

a2batic commented Oct 5, 2020

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Oct 5, 2020
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: a2batic, bipuladh

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-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit 251fd69 into openshift:master Oct 6, 2020
@spadgett spadgett added this to the v4.7 milestone Oct 6, 2020
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. component/ceph Related to ceph-storage-plugin lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants