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 StorageRequest API and controller [wip] #3070

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions PROJECT
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,6 @@ resources:
kind: StorageConsumer
path: github.com/red-hat-storage/ocs-operator/api/v4/v1alpha1
version: v1alpha1
- api:
crdVersion: v1
namespaced: true
controller: true
domain: openshift.io
group: ocs
kind: StorageRequest
path: github.com/red-hat-storage/ocs-operator/api/v4/v1alpha1
version: v1alpha1
- api:
crdVersion: v1
namespaced: true
Expand Down
3 changes: 0 additions & 3 deletions api/v1/storagecluster_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,6 @@ type StorageClusterSpec struct {
// provisioned by the storagecluster controller to be used in
// storageDeviceSets section of the CR.
BackingStorageClasses []BackingStorageClass `json:"backingStorageClasses,omitempty"`
// DefaultStorageProfile is the default storage profile to use for
// the storagerequest as StorageProfile is optional.
DefaultStorageProfile string `json:"defaultStorageProfile,omitempty"`
}

// CSIDriverSpec defines the CSI driver settings for the StorageCluster.
Expand Down
1 change: 0 additions & 1 deletion api/v1alpha1/groupversion_info.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ var (
// Adds the list of known types to scheme.
func addKnownTypes(scheme *runtime.Scheme) error {
scheme.AddKnownTypes(GroupVersion,
&StorageRequest{}, &StorageRequestList{},
&StorageConsumer{}, &StorageConsumerList{},
)
metav1.AddToGroupVersion(scheme, GroupVersion)
Expand Down
86 changes: 0 additions & 86 deletions api/v1alpha1/storagerequest_types.go

This file was deleted.

100 changes: 0 additions & 100 deletions api/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 0 additions & 5 deletions config/crd/bases/ocs.openshift.io_storageclusters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -565,11 +565,6 @@ spec:
type: boolean
type: object
type: object
defaultStorageProfile:
description: |-
DefaultStorageProfile is the default storage profile to use for
the storagerequest as StorageProfile is optional.
type: string
enableCephTools:
description: |-
EnableCephTools toggles on whether or not the ceph tools pod
Expand Down
97 changes: 0 additions & 97 deletions config/crd/bases/ocs.openshift.io_storagerequests.yaml

This file was deleted.

3 changes: 0 additions & 3 deletions config/crd/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ resources:
- bases/ocs.openshift.io_ocsinitializations.yaml
- bases/ocs.openshift.io_storageclusters.yaml
- bases/ocs.openshift.io_storageconsumers.yaml
- bases/ocs.openshift.io_storagerequests.yaml
- bases/ocs.openshift.io_storageclusterpeers.yaml
# +kubebuilder:scaffold:crdkustomizeresource

Expand All @@ -15,7 +14,6 @@ resources:
#- patches/webhook_in_ocsinitializations.yaml
#- patches/webhook_in_storageclusters.yaml
#- patches/webhook_in_storageconsumers.yaml
#- patches/webhook_in_storagerequests.yaml
#- patches/webhook_in_storageclusterpeers.yaml
# +kubebuilder:scaffold:crdkustomizewebhookpatch

Expand All @@ -24,7 +22,6 @@ resources:
#- patches/cainjection_in_ocsinitializations.yaml
#- patches/cainjection_in_storageclusters.yaml
#- patches/cainjection_in_storageconsumers.yaml
#- patches/cainjection_in_storagerequests.yaml
#- patches/cainjection_in_storageclusterpeers.yaml
# +kubebuilder:scaffold:crdkustomizecainjectionpatch

Expand Down
8 changes: 0 additions & 8 deletions config/crd/patches/cainjection_in_storagerequests.yaml

This file was deleted.

17 changes: 0 additions & 17 deletions config/crd/patches/webhook_in_storagerequests.yaml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,6 @@ spec:
kind: StorageConsumer
name: storageconsumers.ocs.openshift.io
version: v1alpha1
- description: StorageRequest is the Schema for the StorageRequests API
displayName: Storage Request
kind: StorageRequest
name: storagerequests.ocs.openshift.io
version: v1alpha1
description: |
**Red Hat OpenShift Container Storage** deploys three operators.

Expand Down
Loading
Loading