diff --git a/PROJECT b/PROJECT index 8861bf284..57d63e077 100644 --- a/PROJECT +++ b/PROJECT @@ -15,16 +15,16 @@ resources: domain: ceph.io group: csi kind: Driver - path: github.com/ceph/ceph-csi-operator/api/v1alpha1 - version: v1alpha1 + path: github.com/ceph/ceph-csi-operator/api/v1beta1 + version: v1beta1 - api: crdVersion: v1 namespaced: true domain: ceph.io group: csi kind: OperatorConfig - path: github.com/ceph/ceph-csi-operator/api/v1alpha1 - version: v1alpha1 + path: github.com/ceph/ceph-csi-operator/api/v1beta1 + version: v1beta1 - api: crdVersion: v1 namespaced: true @@ -32,16 +32,16 @@ resources: domain: ceph.io group: csi kind: CephConnection - path: github.com/ceph/ceph-csi-operator/api/v1alpha1 - version: v1alpha1 + path: github.com/ceph/ceph-csi-operator/api/v1beta1 + version: v1beta1 - api: crdVersion: v1 namespaced: true domain: ceph.io group: csi kind: ClientProfile - path: github.com/ceph/ceph-csi-operator/api/v1alpha1 - version: v1alpha1 + path: github.com/ceph/ceph-csi-operator/api/v1beta1 + version: v1beta1 - api: crdVersion: v1 namespaced: true @@ -49,6 +49,6 @@ resources: domain: ceph.io group: csi kind: ClientProfileMapping - path: github.com/ceph/ceph-csi-operator/api/v1alpha1 - version: v1alpha1 + path: github.com/ceph/ceph-csi-operator/api/v1beta1 + version: v1beta1 version: "3" diff --git a/api/v1alpha1/cephconnection_types.go b/api/v1beta1/cephconnection_types.go similarity index 99% rename from api/v1alpha1/cephconnection_types.go rename to api/v1beta1/cephconnection_types.go index 518cb012b..4a26de169 100644 --- a/api/v1alpha1/cephconnection_types.go +++ b/api/v1beta1/cephconnection_types.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package v1alpha1 +package v1beta1 import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/ceph/ceph-csi-operator/api/v1alpha1/clientprofile_types.go b/api/v1beta1/clientprofile_types.go similarity index 99% rename from vendor/github.com/ceph/ceph-csi-operator/api/v1alpha1/clientprofile_types.go rename to api/v1beta1/clientprofile_types.go index 707295ce1..e99d120ee 100644 --- a/vendor/github.com/ceph/ceph-csi-operator/api/v1alpha1/clientprofile_types.go +++ b/api/v1beta1/clientprofile_types.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package v1alpha1 +package v1beta1 import ( corev1 "k8s.io/api/core/v1" diff --git a/api/v1alpha1/clientprofilemapping_types.go b/api/v1beta1/clientprofilemapping_types.go similarity index 99% rename from api/v1alpha1/clientprofilemapping_types.go rename to api/v1beta1/clientprofilemapping_types.go index ce927cb5f..80a7085c7 100644 --- a/api/v1alpha1/clientprofilemapping_types.go +++ b/api/v1beta1/clientprofilemapping_types.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package v1alpha1 +package v1beta1 import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/ceph/ceph-csi-operator/api/v1alpha1/driver_types.go b/api/v1beta1/driver_types.go similarity index 99% rename from vendor/github.com/ceph/ceph-csi-operator/api/v1alpha1/driver_types.go rename to api/v1beta1/driver_types.go index 24052f066..f6259dc5b 100644 --- a/vendor/github.com/ceph/ceph-csi-operator/api/v1alpha1/driver_types.go +++ b/api/v1beta1/driver_types.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package v1alpha1 +package v1beta1 import ( appsv1 "k8s.io/api/apps/v1" diff --git a/vendor/github.com/ceph/ceph-csi-operator/api/v1alpha1/groupversion_info.go b/api/v1beta1/groupversion_info.go similarity index 93% rename from vendor/github.com/ceph/ceph-csi-operator/api/v1alpha1/groupversion_info.go rename to api/v1beta1/groupversion_info.go index 1d6466ed4..dbe4c7920 100644 --- a/vendor/github.com/ceph/ceph-csi-operator/api/v1alpha1/groupversion_info.go +++ b/api/v1beta1/groupversion_info.go @@ -14,10 +14,10 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Package v1alpha1 contains API Schema definitions for the csi v1alpha1 API group +// Package v1beta1 contains API Schema definitions for the csi v1beta1 API group // +kubebuilder:object:generate=true // +groupName=csi.ceph.io -package v1alpha1 +package v1beta1 import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -27,7 +27,7 @@ import ( var ( // GroupVersion is group version used to register these objects - GroupVersion = schema.GroupVersion{Group: "csi.ceph.io", Version: "v1alpha1"} + GroupVersion = schema.GroupVersion{Group: "csi.ceph.io", Version: "v1beta1"} // SchemeBuilder is used to add go types to the GroupVersionKind scheme SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes) diff --git a/vendor/github.com/ceph/ceph-csi-operator/api/v1alpha1/operatorconfig_types.go b/api/v1beta1/operatorconfig_types.go similarity index 99% rename from vendor/github.com/ceph/ceph-csi-operator/api/v1alpha1/operatorconfig_types.go rename to api/v1beta1/operatorconfig_types.go index 0bba111b3..36f1cb57c 100644 --- a/vendor/github.com/ceph/ceph-csi-operator/api/v1alpha1/operatorconfig_types.go +++ b/api/v1beta1/operatorconfig_types.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package v1alpha1 +package v1beta1 import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go similarity index 99% rename from api/v1alpha1/zz_generated.deepcopy.go rename to api/v1beta1/zz_generated.deepcopy.go index bb617807b..5809fed4f 100644 --- a/api/v1alpha1/zz_generated.deepcopy.go +++ b/api/v1beta1/zz_generated.deepcopy.go @@ -18,7 +18,7 @@ limitations under the License. // Code generated by controller-gen. DO NOT EDIT. -package v1alpha1 +package v1beta1 import ( appsv1 "k8s.io/api/apps/v1" diff --git a/cmd/main.go b/cmd/main.go index 01e0f2feb..d1da0331a 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -39,7 +39,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/metrics/filters" metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server" - csiv1alpha1 "github.com/ceph/ceph-csi-operator/api/v1alpha1" + csiv1beta1 "github.com/ceph/ceph-csi-operator/api/v1beta1" "github.com/ceph/ceph-csi-operator/internal/controller" "github.com/ceph/ceph-csi-operator/internal/utils" //+kubebuilder:scaffold:imports @@ -53,7 +53,7 @@ var ( func init() { utilruntime.Must(clientgoscheme.AddToScheme(scheme)) - utilruntime.Must(csiv1alpha1.AddToScheme(scheme)) + utilruntime.Must(csiv1beta1.AddToScheme(scheme)) //+kubebuilder:scaffold:scheme } diff --git a/config/crd/bases/csi.ceph.io_cephconnections.yaml b/config/crd/bases/csi.ceph.io_cephconnections.yaml index 373ebf866..13505bc22 100644 --- a/config/crd/bases/csi.ceph.io_cephconnections.yaml +++ b/config/crd/bases/csi.ceph.io_cephconnections.yaml @@ -14,7 +14,7 @@ spec: singular: cephconnection scope: Namespaced versions: - - name: v1alpha1 + - name: v1beta1 schema: openAPIV3Schema: description: CephConnection is the Schema for the cephconnections API diff --git a/config/crd/bases/csi.ceph.io_clientprofilemappings.yaml b/config/crd/bases/csi.ceph.io_clientprofilemappings.yaml index 5fbbfe7d4..878b1c07d 100644 --- a/config/crd/bases/csi.ceph.io_clientprofilemappings.yaml +++ b/config/crd/bases/csi.ceph.io_clientprofilemappings.yaml @@ -14,7 +14,7 @@ spec: singular: clientprofilemapping scope: Namespaced versions: - - name: v1alpha1 + - name: v1beta1 schema: openAPIV3Schema: description: ClientProfileMapping is the Schema for the clientprofilemappings diff --git a/config/crd/bases/csi.ceph.io_clientprofiles.yaml b/config/crd/bases/csi.ceph.io_clientprofiles.yaml index b15f9d2ac..52cc6bf9f 100644 --- a/config/crd/bases/csi.ceph.io_clientprofiles.yaml +++ b/config/crd/bases/csi.ceph.io_clientprofiles.yaml @@ -14,7 +14,7 @@ spec: singular: clientprofile scope: Namespaced versions: - - name: v1alpha1 + - name: v1beta1 schema: openAPIV3Schema: description: ClientProfile is the Schema for the clientprofiles API diff --git a/config/crd/bases/csi.ceph.io_drivers.yaml b/config/crd/bases/csi.ceph.io_drivers.yaml index 6816ab665..e74413ffc 100644 --- a/config/crd/bases/csi.ceph.io_drivers.yaml +++ b/config/crd/bases/csi.ceph.io_drivers.yaml @@ -14,7 +14,7 @@ spec: singular: driver scope: Namespaced versions: - - name: v1alpha1 + - name: v1beta1 schema: openAPIV3Schema: description: Driver is the Schema for the drivers API diff --git a/config/crd/bases/csi.ceph.io_operatorconfigs.yaml b/config/crd/bases/csi.ceph.io_operatorconfigs.yaml index fde8ebcca..391ef5c5a 100644 --- a/config/crd/bases/csi.ceph.io_operatorconfigs.yaml +++ b/config/crd/bases/csi.ceph.io_operatorconfigs.yaml @@ -14,7 +14,7 @@ spec: singular: operatorconfig scope: Namespaced versions: - - name: v1alpha1 + - name: v1beta1 schema: openAPIV3Schema: description: OperatorConfig is the Schema for the operatorconfigs API diff --git a/config/samples/csi_v1alpha1_cephconnection.yaml b/config/samples/csi_v1beta1_cephconnection.yaml similarity index 85% rename from config/samples/csi_v1alpha1_cephconnection.yaml rename to config/samples/csi_v1beta1_cephconnection.yaml index 265ed7cbe..0710ad0e8 100644 --- a/config/samples/csi_v1alpha1_cephconnection.yaml +++ b/config/samples/csi_v1beta1_cephconnection.yaml @@ -1,4 +1,4 @@ -apiVersion: csi.ceph.io/v1alpha1 +apiVersion: csi.ceph.io/v1beta1 kind: CephConnection metadata: labels: diff --git a/config/samples/csi_v1alpha1_clientprofile.yaml b/config/samples/csi_v1beta1_clientprofile.yaml similarity index 85% rename from config/samples/csi_v1alpha1_clientprofile.yaml rename to config/samples/csi_v1beta1_clientprofile.yaml index 81c5f8742..cd049dfd2 100644 --- a/config/samples/csi_v1alpha1_clientprofile.yaml +++ b/config/samples/csi_v1beta1_clientprofile.yaml @@ -1,4 +1,4 @@ -apiVersion: csi.ceph.io/v1alpha1 +apiVersion: csi.ceph.io/v1beta1 kind: ClientProfile metadata: labels: diff --git a/config/samples/csi_v1alpha1_clientprofilemapping.yaml b/config/samples/csi_v1beta1_clientprofilemapping.yaml similarity index 86% rename from config/samples/csi_v1alpha1_clientprofilemapping.yaml rename to config/samples/csi_v1beta1_clientprofilemapping.yaml index 8bf2bcb52..5844ec2bd 100644 --- a/config/samples/csi_v1alpha1_clientprofilemapping.yaml +++ b/config/samples/csi_v1beta1_clientprofilemapping.yaml @@ -1,4 +1,4 @@ -apiVersion: csi.ceph.io/v1alpha1 +apiVersion: csi.ceph.io/v1beta1 kind: ClientProfileMapping metadata: labels: diff --git a/config/samples/csi_v1alpha1_driver.yaml b/config/samples/csi_v1beta1_driver.yaml similarity index 84% rename from config/samples/csi_v1alpha1_driver.yaml rename to config/samples/csi_v1beta1_driver.yaml index f7083e8ff..d7b0de873 100644 --- a/config/samples/csi_v1alpha1_driver.yaml +++ b/config/samples/csi_v1beta1_driver.yaml @@ -1,4 +1,4 @@ -apiVersion: csi.ceph.io/v1alpha1 +apiVersion: csi.ceph.io/v1beta1 kind: Driver metadata: labels: diff --git a/config/samples/csi_v1alpha1_operatorconfig.yaml b/config/samples/csi_v1beta1_operatorconfig.yaml similarity index 85% rename from config/samples/csi_v1alpha1_operatorconfig.yaml rename to config/samples/csi_v1beta1_operatorconfig.yaml index ea71f3697..de49b3b01 100644 --- a/config/samples/csi_v1alpha1_operatorconfig.yaml +++ b/config/samples/csi_v1beta1_operatorconfig.yaml @@ -1,4 +1,4 @@ -apiVersion: csi.ceph.io/v1alpha1 +apiVersion: csi.ceph.io/v1beta1 kind: OperatorConfig metadata: labels: diff --git a/config/samples/kustomization.yaml b/config/samples/kustomization.yaml index 5e1aee69c..21ae0e789 100644 --- a/config/samples/kustomization.yaml +++ b/config/samples/kustomization.yaml @@ -1,8 +1,8 @@ ## Append samples of your project ## resources: -- csi_v1alpha1_driver.yaml -- csi_v1alpha1_operatorconfig.yaml -- csi_v1alpha1_cephconnection.yaml -- csi_v1alpha1_clientprofile.yaml -- csi_v1alpha1_clientprofilemapping.yaml +- csi_v1beta1_driver.yaml +- csi_v1beta1_operatorconfig.yaml +- csi_v1beta1_cephconnection.yaml +- csi_v1beta1_clientprofile.yaml +- csi_v1beta1_clientprofilemapping.yaml #+kubebuilder:scaffold:manifestskustomizesamples diff --git a/deploy/all-in-one/install.yaml b/deploy/all-in-one/install.yaml index 887181d65..176f4dd9a 100644 --- a/deploy/all-in-one/install.yaml +++ b/deploy/all-in-one/install.yaml @@ -22,7 +22,7 @@ spec: singular: cephconnection scope: Namespaced versions: - - name: v1alpha1 + - name: v1beta1 schema: openAPIV3Schema: description: CephConnection is the Schema for the cephconnections API @@ -91,7 +91,7 @@ spec: singular: clientprofilemapping scope: Namespaced versions: - - name: v1alpha1 + - name: v1beta1 schema: openAPIV3Schema: description: ClientProfileMapping is the Schema for the clientprofilemappings @@ -162,7 +162,7 @@ spec: singular: clientprofile scope: Namespaced versions: - - name: v1alpha1 + - name: v1beta1 schema: openAPIV3Schema: description: ClientProfile is the Schema for the clientprofiles API @@ -264,7 +264,7 @@ spec: singular: driver scope: Namespaced versions: - - name: v1alpha1 + - name: v1beta1 schema: openAPIV3Schema: description: Driver is the Schema for the drivers API @@ -7119,7 +7119,7 @@ spec: singular: operatorconfig scope: Namespaced versions: - - name: v1alpha1 + - name: v1beta1 schema: openAPIV3Schema: description: OperatorConfig is the Schema for the operatorconfigs API diff --git a/deploy/charts/ceph-csi-operator/templates/cephconnection-crd.yaml b/deploy/charts/ceph-csi-operator/templates/cephconnection-crd.yaml index ad92b70be..a3bdedaa8 100644 --- a/deploy/charts/ceph-csi-operator/templates/cephconnection-crd.yaml +++ b/deploy/charts/ceph-csi-operator/templates/cephconnection-crd.yaml @@ -15,7 +15,7 @@ spec: singular: cephconnection scope: Namespaced versions: - - name: v1alpha1 + - name: v1beta1 schema: openAPIV3Schema: description: CephConnection is the Schema for the cephconnections API diff --git a/deploy/charts/ceph-csi-operator/templates/clientprofile-crd.yaml b/deploy/charts/ceph-csi-operator/templates/clientprofile-crd.yaml index 85bb3a534..715a0c61f 100644 --- a/deploy/charts/ceph-csi-operator/templates/clientprofile-crd.yaml +++ b/deploy/charts/ceph-csi-operator/templates/clientprofile-crd.yaml @@ -15,7 +15,7 @@ spec: singular: clientprofile scope: Namespaced versions: - - name: v1alpha1 + - name: v1beta1 schema: openAPIV3Schema: description: ClientProfile is the Schema for the clientprofiles API diff --git a/deploy/charts/ceph-csi-operator/templates/clientprofilemapping-crd.yaml b/deploy/charts/ceph-csi-operator/templates/clientprofilemapping-crd.yaml index 36b412ff6..9191e9af4 100644 --- a/deploy/charts/ceph-csi-operator/templates/clientprofilemapping-crd.yaml +++ b/deploy/charts/ceph-csi-operator/templates/clientprofilemapping-crd.yaml @@ -15,7 +15,7 @@ spec: singular: clientprofilemapping scope: Namespaced versions: - - name: v1alpha1 + - name: v1beta1 schema: openAPIV3Schema: description: ClientProfileMapping is the Schema for the clientprofilemappings diff --git a/deploy/charts/ceph-csi-operator/templates/driver-crd.yaml b/deploy/charts/ceph-csi-operator/templates/driver-crd.yaml index 338e0792d..1bec10b7b 100644 --- a/deploy/charts/ceph-csi-operator/templates/driver-crd.yaml +++ b/deploy/charts/ceph-csi-operator/templates/driver-crd.yaml @@ -15,7 +15,7 @@ spec: singular: driver scope: Namespaced versions: - - name: v1alpha1 + - name: v1beta1 schema: openAPIV3Schema: description: Driver is the Schema for the drivers API diff --git a/deploy/charts/ceph-csi-operator/templates/operatorconfig-crd.yaml b/deploy/charts/ceph-csi-operator/templates/operatorconfig-crd.yaml index 8cca1f442..be4433e13 100644 --- a/deploy/charts/ceph-csi-operator/templates/operatorconfig-crd.yaml +++ b/deploy/charts/ceph-csi-operator/templates/operatorconfig-crd.yaml @@ -15,7 +15,7 @@ spec: singular: operatorconfig scope: Namespaced versions: - - name: v1alpha1 + - name: v1beta1 schema: openAPIV3Schema: description: OperatorConfig is the Schema for the operatorconfigs API diff --git a/deploy/multifile/crd.yaml b/deploy/multifile/crd.yaml index 41f87fd86..1505a7732 100644 --- a/deploy/multifile/crd.yaml +++ b/deploy/multifile/crd.yaml @@ -13,7 +13,7 @@ spec: singular: cephconnection scope: Namespaced versions: - - name: v1alpha1 + - name: v1beta1 schema: openAPIV3Schema: description: CephConnection is the Schema for the cephconnections API @@ -82,7 +82,7 @@ spec: singular: clientprofilemapping scope: Namespaced versions: - - name: v1alpha1 + - name: v1beta1 schema: openAPIV3Schema: description: ClientProfileMapping is the Schema for the clientprofilemappings @@ -153,7 +153,7 @@ spec: singular: clientprofile scope: Namespaced versions: - - name: v1alpha1 + - name: v1beta1 schema: openAPIV3Schema: description: ClientProfile is the Schema for the clientprofiles API @@ -255,7 +255,7 @@ spec: singular: driver scope: Namespaced versions: - - name: v1alpha1 + - name: v1beta1 schema: openAPIV3Schema: description: Driver is the Schema for the drivers API @@ -7110,7 +7110,7 @@ spec: singular: operatorconfig scope: Namespaced versions: - - name: v1alpha1 + - name: v1beta1 schema: openAPIV3Schema: description: OperatorConfig is the Schema for the operatorconfigs API diff --git a/docs/design/hostNetwork.md b/docs/design/hostNetwork.md index 2014bd631..8ba7be0eb 100644 --- a/docs/design/hostNetwork.md +++ b/docs/design/hostNetwork.md @@ -22,7 +22,7 @@ Example: ```yaml kind: OperatorConfig -apiVersion: csi.ceph.io/v1alpha1 +apiVersion: csi.ceph.io/v1beta1 metadata: name: ceph-csi-operator-config namespace: @@ -34,7 +34,7 @@ spec: ## Driver CR ```yaml -apiVersion: csi.ceph.io/v1alpha1 +apiVersion: csi.ceph.io/v1beta1 kind: Driver metadata: name: rbd.csi.ceph.com diff --git a/docs/design/logrotate.md b/docs/design/logrotate.md index df808e346..547433f6f 100644 --- a/docs/design/logrotate.md +++ b/docs/design/logrotate.md @@ -8,7 +8,7 @@ Logroate configuration, ```yaml kind: OperatorConfig -apiVersion: csi.ceph.io/v1alpha1 +apiVersion: csi.ceph.io/v1beta1 …. spec: log: @@ -28,7 +28,7 @@ Similar settings will be overridden by `Driver CRD`: ```yaml kind: Driver -apiVersion: csi.ceph.io/v1alpha1 +apiVersion: csi.ceph.io/v1beta1 metadata: name: "..csi.ceph.com" namespace: diff --git a/docs/design/operator.md b/docs/design/operator.md index 1ce277242..34983907d 100644 --- a/docs/design/operator.md +++ b/docs/design/operator.md @@ -78,7 +78,7 @@ The configurations are categorized into 2 different types ```yaml --- kind: OperatorConfig -apiVersion: csi.ceph.io/v1alpha1 +apiVersion: csi.ceph.io/v1beta1 metadata: name: ceph-csi-operator-config namespace: @@ -259,7 +259,7 @@ RBD, and NFS CSI drivers within namespaces. ```yaml --- kind: Driver -apiVersion: csi.ceph.io/v1alpha1 +apiVersion: csi.ceph.io/v1beta1 metadata: name: "..csi.ceph.com" namespace: @@ -311,7 +311,7 @@ provide the information to be used by multiple CSI drivers. ```yaml --- kind: CephConnection -apiVersion: csi.ceph.io/v1alpha1 +apiVersion: csi.ceph.io/v1beta1 metadata: name: ceph-cluster-1 namespace: @@ -338,7 +338,7 @@ the connection information for the target Ceph cluster. ```yaml --- kind: ClientProfile -apiVersion: csi.ceph.io/v1alpha1 +apiVersion: csi.ceph.io/v1beta1 metadata: name: storage namespace: diff --git a/docs/quick-start.md b/docs/quick-start.md index b82a19c06..09c368bf3 100644 --- a/docs/quick-start.md +++ b/docs/quick-start.md @@ -43,7 +43,7 @@ Once the operator is installed, deploy the Ceph-CSI drivers: ```console echo ' -apiVersion: csi.ceph.io/v1alpha1 +apiVersion: csi.ceph.io/v1beta1 kind: Driver metadata: name: rbd.csi.ceph.com @@ -55,7 +55,7 @@ metadata: ```console echo ' -apiVersion: csi.ceph.io/v1alpha1 +apiVersion: csi.ceph.io/v1beta1 kind: Driver metadata: name: cephfs.csi.ceph.com @@ -67,7 +67,7 @@ metadata: ```console echo ' -apiVersion: csi.ceph.io/v1alpha1 +apiVersion: csi.ceph.io/v1beta1 kind: Driver metadata: name: nfs.csi.ceph.com @@ -97,7 +97,7 @@ Create a CephConnection CR to connect to the Ceph cluster: ```console echo ' -apiVersion: csi.ceph.io/v1alpha1 +apiVersion: csi.ceph.io/v1beta1 kind: CephConnection metadata: name: ceph-connection @@ -115,7 +115,7 @@ the CephConnection CR and the CephFS and RBD configurations: ```console echo ' -apiVersion: csi.ceph.io/v1alpha1 +apiVersion: csi.ceph.io/v1beta1 kind: ClientProfile metadata: name: storage diff --git a/internal/controller/clientprofile_controller.go b/internal/controller/clientprofile_controller.go index e47c39508..6645558af 100644 --- a/internal/controller/clientprofile_controller.go +++ b/internal/controller/clientprofile_controller.go @@ -33,7 +33,7 @@ import ( ctrllog "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/predicate" - csiv1a1 "github.com/ceph/ceph-csi-operator/api/v1alpha1" + csiv1b1 "github.com/ceph/ceph-csi-operator/api/v1beta1" "github.com/ceph/ceph-csi-operator/internal/utils" ) @@ -55,8 +55,8 @@ type ClientProfileReconcile struct { ctx context.Context log logr.Logger - clientProfile csiv1a1.ClientProfile - cephConn csiv1a1.CephConnection + clientProfile csiv1b1.ClientProfile + cephConn csiv1b1.CephConnection cleanUp bool } @@ -94,9 +94,9 @@ func (r *ClientProfileReconciler) SetupWithManager(mgr ctrl.Manager) error { genChangedPredicate := predicate.GenerationChangedPredicate{} return ctrl.NewControllerManagedBy(mgr). - For(&csiv1a1.ClientProfile{}). + For(&csiv1b1.ClientProfile{}). Owns( - &csiv1a1.CephConnection{}, + &csiv1b1.CephConnection{}, builder.MatchEveryOwner, builder.WithPredicates(genChangedPredicate), ). @@ -307,7 +307,7 @@ func (r *ClientProfileReconcile) reconcileCephCsiClusterInfo() error { // ComposeCsiClusterInfoRecord composes the desired csi cluster info record for // a given ClientProfile and CephConnection specs -func composeCsiClusterInfoRecord(clientProfile *csiv1a1.ClientProfile, cephConn *csiv1a1.CephConnection) *csiClusterInfoRecord { +func composeCsiClusterInfoRecord(clientProfile *csiv1b1.ClientProfile, cephConn *csiv1b1.CephConnection) *csiClusterInfoRecord { record := csiClusterInfoRecord{} record.ClusterId = clientProfile.Name record.Monitors = cephConn.Spec.Monitors diff --git a/internal/controller/clientprofile_controller_test.go b/internal/controller/clientprofile_controller_test.go index 8ba78e185..81d94f864 100644 --- a/internal/controller/clientprofile_controller_test.go +++ b/internal/controller/clientprofile_controller_test.go @@ -28,7 +28,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - csiv1alpha1 "github.com/ceph/ceph-csi-operator/api/v1alpha1" + csiv1beta1 "github.com/ceph/ceph-csi-operator/api/v1beta1" ) var _ = Describe("ClientProfile Controller", func() { @@ -43,22 +43,22 @@ var _ = Describe("ClientProfile Controller", func() { Name: resourceName, Namespace: namespaceName, // TODO(user):Modify as needed } - clientProfile := &csiv1alpha1.ClientProfile{} + clientProfile := &csiv1beta1.ClientProfile{} typeCephConnectionName := types.NamespacedName{ Name: cephConnectionName, Namespace: namespaceName, } - cephConn := &csiv1alpha1.CephConnection{} + cephConn := &csiv1beta1.CephConnection{} BeforeEach(func() { err := k8sClient.Get(ctx, typeCephConnectionName, cephConn) if err != nil && errors.IsNotFound(err) { - resource := &csiv1alpha1.CephConnection{ + resource := &csiv1beta1.CephConnection{ ObjectMeta: metav1.ObjectMeta{ Name: cephConnectionName, Namespace: namespaceName, }, - Spec: csiv1alpha1.CephConnectionSpec{ + Spec: csiv1beta1.CephConnectionSpec{ Monitors: []string{"10.98.44.171:6789"}, }, } @@ -68,13 +68,13 @@ var _ = Describe("ClientProfile Controller", func() { By("creating the custom resource for the Kind ClientProfile") err = k8sClient.Get(ctx, typeNamespacedName, clientProfile) if err != nil && errors.IsNotFound(err) { - resource := &csiv1alpha1.ClientProfile{ + resource := &csiv1beta1.ClientProfile{ ObjectMeta: metav1.ObjectMeta{ Name: resourceName, Namespace: "default", }, // TODO(user): Specify other spec details if needed. - Spec: csiv1alpha1.ClientProfileSpec{ + Spec: csiv1beta1.ClientProfileSpec{ CephConnectionRef: corev1.LocalObjectReference{ Name: "foo", }, @@ -86,14 +86,14 @@ var _ = Describe("ClientProfile Controller", func() { AfterEach(func() { // TODO(user): Cleanup logic after each test, like removing the resource instance. - resource := &csiv1alpha1.ClientProfile{} + resource := &csiv1beta1.ClientProfile{} err := k8sClient.Get(ctx, typeNamespacedName, resource) Expect(err).NotTo(HaveOccurred()) By("Cleanup the specific resource instance ClientProfile") Expect(k8sClient.Delete(ctx, resource)).To(Succeed()) - cephConnection := &csiv1alpha1.CephConnection{} + cephConnection := &csiv1beta1.CephConnection{} err = k8sClient.Get(ctx, typeCephConnectionName, cephConnection) Expect(err).NotTo(HaveOccurred()) diff --git a/internal/controller/clientprofilemapping_controller.go b/internal/controller/clientprofilemapping_controller.go index 2b483370e..89d4f8697 100644 --- a/internal/controller/clientprofilemapping_controller.go +++ b/internal/controller/clientprofilemapping_controller.go @@ -30,7 +30,7 @@ import ( ctrllog "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/predicate" - csiv1a1 "github.com/ceph/ceph-csi-operator/api/v1alpha1" + csiv1b1 "github.com/ceph/ceph-csi-operator/api/v1beta1" "github.com/ceph/ceph-csi-operator/internal/utils" ) @@ -52,7 +52,7 @@ type ClientProfileMappingReconcile struct { ctx context.Context log logr.Logger req ctrl.Request - clientProfileMappingList csiv1a1.ClientProfileMappingList + clientProfileMappingList csiv1b1.ClientProfileMappingList } // csiClusterMappingRecord represents the structure to serialize a csi mapping @@ -67,7 +67,7 @@ func (r *ClientProfileMappingReconciler) SetupWithManager(mgr ctrl.Manager) erro genChangedPredicate := predicate.GenerationChangedPredicate{} return ctrl.NewControllerManagedBy(mgr). - For(&csiv1a1.ClientProfileMapping{}). + For(&csiv1b1.ClientProfileMapping{}). // TODO: This watch is probalematic, it will trigger a reconcile for each // mapping resource that exists in the configmap namespace whenever the configmap // is changed. This is unnececary as this reconile build its desired state based @@ -128,7 +128,7 @@ func (r *ClientProfileMappingReconcile) reconcileCephCsiBlockPoolMapping() error log.Info("Reconciling Ceph CSI Cluster mapping") _, err := ctrlutil.CreateOrUpdate(r.ctx, r.Client, &csiConfigMap, func() error { - var owner *csiv1a1.ClientProfileMapping + var owner *csiv1b1.ClientProfileMapping for i := range r.clientProfileMappingList.Items { item := &r.clientProfileMappingList.Items[i] if item.Name == r.req.Name && item.Namespace == r.req.Namespace { diff --git a/internal/controller/clientprofilemapping_controller_test.go b/internal/controller/clientprofilemapping_controller_test.go index 0bd31fccb..4184361c3 100644 --- a/internal/controller/clientprofilemapping_controller_test.go +++ b/internal/controller/clientprofilemapping_controller_test.go @@ -27,7 +27,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - csiv1alpha1 "github.com/ceph/ceph-csi-operator/api/v1alpha1" + csiv1beta1 "github.com/ceph/ceph-csi-operator/api/v1beta1" ) var _ = Describe("ClientProfileMapping Controller", func() { @@ -40,13 +40,13 @@ var _ = Describe("ClientProfileMapping Controller", func() { Name: resourceName, Namespace: "default", // TODO(user):Modify as needed } - clientprofilemapping := &csiv1alpha1.ClientProfileMapping{} + clientprofilemapping := &csiv1beta1.ClientProfileMapping{} BeforeEach(func() { By("creating the custom resource for the Kind ClientProfileMapping") err := k8sClient.Get(ctx, typeNamespacedName, clientprofilemapping) if err != nil && errors.IsNotFound(err) { - resource := &csiv1alpha1.ClientProfileMapping{ + resource := &csiv1beta1.ClientProfileMapping{ ObjectMeta: metav1.ObjectMeta{ Name: resourceName, Namespace: "default", @@ -59,7 +59,7 @@ var _ = Describe("ClientProfileMapping Controller", func() { AfterEach(func() { // TODO(user): Cleanup logic after each test, like removing the resource instance. - resource := &csiv1alpha1.ClientProfileMapping{} + resource := &csiv1beta1.ClientProfileMapping{} err := k8sClient.Get(ctx, typeNamespacedName, resource) Expect(err).NotTo(HaveOccurred()) diff --git a/internal/controller/defaults.go b/internal/controller/defaults.go index c536cd409..b2cda6166 100644 --- a/internal/controller/defaults.go +++ b/internal/controller/defaults.go @@ -23,7 +23,7 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/utils/ptr" - csiv1a1 "github.com/ceph/ceph-csi-operator/api/v1alpha1" + csiv1b1 "github.com/ceph/ceph-csi-operator/api/v1beta1" "github.com/ceph/ceph-csi-operator/internal/utils" ) @@ -44,7 +44,7 @@ const ( defaultLogRotateMaxFiles = 7 ) -var defaultLeaderElection = csiv1a1.LeaderElectionSpec{ +var defaultLeaderElection = csiv1b1.LeaderElectionSpec{ LeaseDuration: 137, RenewDeadline: 107, RetryPeriod: 26, diff --git a/internal/controller/driver_controller.go b/internal/controller/driver_controller.go index c12ee2fea..ab18e7496 100644 --- a/internal/controller/driver_controller.go +++ b/internal/controller/driver_controller.go @@ -47,7 +47,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/predicate" "sigs.k8s.io/controller-runtime/pkg/reconcile" - csiv1a1 "github.com/ceph/ceph-csi-operator/api/v1alpha1" + csiv1b1 "github.com/ceph/ceph-csi-operator/api/v1beta1" "github.com/ceph/ceph-csi-operator/internal/utils" ) @@ -95,7 +95,7 @@ type driverReconcile struct { ctx context.Context log logr.Logger - driver csiv1a1.Driver + driver csiv1b1.Driver driverType DriverType images map[string]string } @@ -110,17 +110,17 @@ func (r *DriverReconciler) SetupWithManager(mgr ctrl.Manager) error { // request for drivers driverDefaultsPredicate := predicate.Funcs{ CreateFunc: func(e event.CreateEvent) bool { - opConf, ok := e.Object.(*csiv1a1.OperatorConfig) + opConf, ok := e.Object.(*csiv1b1.OperatorConfig) return ok && opConf.Spec.DriverSpecDefaults != nil }, UpdateFunc: func(e event.UpdateEvent) bool { - oldConf, oldOk := e.ObjectOld.(*csiv1a1.OperatorConfig) - newConf, newOk := e.ObjectNew.(*csiv1a1.OperatorConfig) + oldConf, oldOk := e.ObjectOld.(*csiv1b1.OperatorConfig) + newConf, newOk := e.ObjectNew.(*csiv1b1.OperatorConfig) return !oldOk || !newOk || !reflect.DeepEqual(oldConf.Spec.DriverSpecDefaults, newConf.Spec.DriverSpecDefaults) }, DeleteFunc: func(e event.DeleteEvent) bool { - opConf, ok := e.Object.(*csiv1a1.OperatorConfig) + opConf, ok := e.Object.(*csiv1b1.OperatorConfig) return ok && opConf.Spec.DriverSpecDefaults != nil }, GenericFunc: func(event.GenericEvent) bool { @@ -132,7 +132,7 @@ func (r *DriverReconciler) SetupWithManager(mgr ctrl.Manager) error { // for all drivers whenever the driver default configuration changes enqueueAllDrivers := handler.EnqueueRequestsFromMapFunc( func(ctx context.Context, obj client.Object) []reconcile.Request { - driverList := csiv1a1.DriverList{} + driverList := csiv1b1.DriverList{} if err := r.List(ctx, &driverList); err != nil { return []reconcile.Request{} } @@ -165,7 +165,7 @@ func (r *DriverReconciler) SetupWithManager(mgr ctrl.Manager) error { ) return ctrl.NewControllerManagedBy(mgr). - For(&csiv1a1.Driver{}). + For(&csiv1b1.Driver{}). Owns( &appsv1.Deployment{}, builder.WithPredicates(genChangedPredicate), @@ -187,7 +187,7 @@ func (r *DriverReconciler) SetupWithManager(mgr ctrl.Manager) error { ), ). Watches( - &csiv1a1.OperatorConfig{}, + &csiv1b1.OperatorConfig{}, enqueueAllDrivers, builder.WithPredicates(driverDefaultsPredicate), ). @@ -293,7 +293,7 @@ func (r *driverReconcile) LoadAndValidateDesiredState() error { r.driverType = DriverType(strings.ToLower(matches[1])) // Load operator configuration resource - opConfig := csiv1a1.OperatorConfig{} + opConfig := csiv1b1.OperatorConfig{} opConfig.Name = operatorConfigName opConfig.Namespace = operatorNamespace if err := r.Get(r.ctx, client.ObjectKeyFromObject(&opConfig), &opConfig); client.IgnoreNotFound(err) != nil { @@ -362,7 +362,7 @@ func (r *driverReconcile) reconcileLogRotateConfigMap() error { log := r.log.WithValues("logRotateConfigMap", logRotateConfigmap.Name) log.Info("Reconciling logRotate configmap") - logRotationSpec := cmp.Or(r.driver.Spec.Log, &csiv1a1.LogSpec{}).Rotation + logRotationSpec := cmp.Or(r.driver.Spec.Log, &csiv1b1.LogSpec{}).Rotation if logRotationSpec != nil { opResult, err := ctrlutil.CreateOrUpdate(r.ctx, r.Client, logRotateConfigmap, func() error { if _, err := utils.ToggleOwnerReference(true, logRotateConfigmap, &r.driver, r.Scheme); err != nil { @@ -528,17 +528,17 @@ func (r *driverReconcile) reconcileControllerPluginDeployment() error { } leaderElectionSpec := cmp.Or(r.driver.Spec.LeaderElection, &defaultLeaderElection) - pluginSpec := cmp.Or(r.driver.Spec.ControllerPlugin, &csiv1a1.ControllerPluginSpec{}) + pluginSpec := cmp.Or(r.driver.Spec.ControllerPlugin, &csiv1b1.ControllerPluginSpec{}) serviceAccountName := cmp.Or( ptr.Deref(pluginSpec.ServiceAccountName, ""), fmt.Sprintf("%s%s-ctrlplugin-sa", serviceAccountPrefix, r.driverType), ) imagePullPolicy := cmp.Or(pluginSpec.ImagePullPolicy, corev1.PullIfNotPresent) grpcTimeout := cmp.Or(r.driver.Spec.GRpcTimeout, defaultGRrpcTimeout) - logVerbosity := ptr.Deref(r.driver.Spec.Log, csiv1a1.LogSpec{}).Verbosity - forceKernelClient := r.isCephFsDriver() && r.driver.Spec.CephFsClientType == csiv1a1.KernelCephFsClient - snPolicy := cmp.Or(r.driver.Spec.SnapshotPolicy, csiv1a1.VolumeSnapshotSnapshotPolicy) - logRotationSpec := cmp.Or(r.driver.Spec.Log, &csiv1a1.LogSpec{}).Rotation + logVerbosity := ptr.Deref(r.driver.Spec.Log, csiv1b1.LogSpec{}).Verbosity + forceKernelClient := r.isCephFsDriver() && r.driver.Spec.CephFsClientType == csiv1b1.KernelCephFsClient + snPolicy := cmp.Or(r.driver.Spec.SnapshotPolicy, csiv1b1.VolumeSnapshotSnapshotPolicy) + logRotationSpec := cmp.Or(r.driver.Spec.Log, &csiv1b1.LogSpec{}).Rotation logRotationEnabled := logRotationSpec != nil logRotateSecurityContext := utils.If( pluginSpec.Privileged != nil && logRotationEnabled, @@ -623,7 +623,7 @@ func (r *driverReconcile) reconcileControllerPluginDeployment() error { // overwrite built in volumes mounts. utils.MapSlice( pluginSpec.Volumes, - func(v csiv1a1.VolumeSpec) corev1.VolumeMount { + func(v csiv1b1.VolumeSpec) corev1.VolumeMount { return v.Mount }, ), @@ -728,7 +728,7 @@ func (r *driverReconcile) reconcileControllerPluginDeployment() error { }, } // Snapshotter Sidecar Container - if snPolicy != csiv1a1.NoneSnapshotPolicy { + if snPolicy != csiv1b1.NoneSnapshotPolicy { containers = append(containers, corev1.Container{ Name: "csi-snapshotter", ImagePullPolicy: imagePullPolicy, @@ -742,7 +742,7 @@ func (r *driverReconcile) reconcileControllerPluginDeployment() error { utils.TimeoutContainerArg(grpcTimeout), utils.If(!r.isNfsDriver(), utils.ExtraCreateMetadataContainerArg, ""), utils.If( - r.driverType != NfsDriverType && snPolicy == csiv1a1.VolumeGroupSnapshotPolicy, + r.driverType != NfsDriverType && snPolicy == csiv1b1.VolumeGroupSnapshotPolicy, utils.EnableVolumeGroupSnapshotsContainerArg, "", ), @@ -885,7 +885,7 @@ func (r *driverReconcile) reconcileControllerPluginDeployment() error { // overwrite built in volumes. utils.MapSlice( pluginSpec.Volumes, - func(v csiv1a1.VolumeSpec) corev1.Volume { + func(v csiv1b1.VolumeSpec) corev1.Volume { return v.Volume }, ), @@ -924,17 +924,14 @@ func (r *driverReconcile) reconcileControllerPluginDeployment() error { } func (r *driverReconcile) controllerPluginCsiAddonsContainerPort() corev1.ContainerPort { - // the cephFS and rbd drivers need to use different ports // to avoid port collisions with host network. port := utils.ControllerPluginCsiAddonsContainerRbdPort if r.isCephFsDriver() { port = utils.ControllerPluginCsiAddonsContainerCephFsPort - } return port - } func (r *driverReconcile) reconcileNodePluginDeamonSet() error { @@ -952,19 +949,19 @@ func (r *driverReconcile) reconcileNodePluginDeamonSet() error { } appName := daemonSet.Name - pluginSpec := cmp.Or(r.driver.Spec.NodePlugin, &csiv1a1.NodePluginSpec{}) + pluginSpec := cmp.Or(r.driver.Spec.NodePlugin, &csiv1b1.NodePluginSpec{}) serviceAccountName := cmp.Or( ptr.Deref(pluginSpec.ServiceAccountName, ""), fmt.Sprintf("%s%s-nodeplugin-sa", serviceAccountPrefix, r.driverType), ) imagePullPolicy := cmp.Or(pluginSpec.ImagePullPolicy, corev1.PullIfNotPresent) - logVerbosity := ptr.Deref(r.driver.Spec.Log, csiv1a1.LogSpec{}).Verbosity + logVerbosity := ptr.Deref(r.driver.Spec.Log, csiv1b1.LogSpec{}).Verbosity kubeletDirPath := cmp.Or(pluginSpec.KubeletDirPath, defaultKubeletDirPath) - forceKernelClient := r.isCephFsDriver() && r.driver.Spec.CephFsClientType == csiv1a1.KernelCephFsClient + forceKernelClient := r.isCephFsDriver() && r.driver.Spec.CephFsClientType == csiv1b1.KernelCephFsClient topology := r.isRdbDriver() && pluginSpec.Topology != nil - domainLabels := cmp.Or(pluginSpec.Topology, &csiv1a1.TopologySpec{}).DomainLabels - logRotationSpec := cmp.Or(r.driver.Spec.Log, &csiv1a1.LogSpec{}).Rotation + domainLabels := cmp.Or(pluginSpec.Topology, &csiv1b1.TopologySpec{}).DomainLabels + logRotationSpec := cmp.Or(r.driver.Spec.Log, &csiv1b1.LogSpec{}).Rotation logRotationEnabled := logRotationSpec != nil daemonSet.Spec = appsv1.DaemonSetSpec{ @@ -1238,7 +1235,7 @@ func (r *driverReconcile) reconcileNodePluginDeamonSet() error { // overwrite built in volumes. utils.MapSlice( pluginSpec.Volumes, - func(v csiv1a1.VolumeSpec) corev1.Volume { + func(v csiv1b1.VolumeSpec) corev1.Volume { return v.Volume }, ), @@ -1368,7 +1365,7 @@ func (r *driverReconcile) generateServiceName(suffix string) string { } func getControllerPluginPodAffinity( - pluginSpec *csiv1a1.ControllerPluginSpec, + pluginSpec *csiv1b1.ControllerPluginSpec, selector *metav1.LabelSelector, ) *corev1.Affinity { if pluginSpec.Affinity != nil && pluginSpec.Affinity.PodAntiAffinity != nil { @@ -1412,7 +1409,7 @@ func logCreateOrUpdateResult( } // mergeDriverSpecs will fill in any unset fields in dest with a copy of the same field in src -func mergeDriverSpecs(dest, src *csiv1a1.DriverSpec) { +func mergeDriverSpecs(dest, src *csiv1b1.DriverSpec) { // Create a copy of the src, making sure that any value copied into dest is a not shared // with the original src src = src.DeepCopy() diff --git a/internal/controller/driver_controller_test.go b/internal/controller/driver_controller_test.go index 48d1ac50d..2027ff891 100644 --- a/internal/controller/driver_controller_test.go +++ b/internal/controller/driver_controller_test.go @@ -27,7 +27,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - csiv1alpha1 "github.com/ceph/ceph-csi-operator/api/v1alpha1" + csiv1beta1 "github.com/ceph/ceph-csi-operator/api/v1beta1" ) var _ = Describe("Driver Controller", func() { @@ -40,13 +40,13 @@ var _ = Describe("Driver Controller", func() { Name: resourceName, Namespace: "default", // TODO(user):Modify as needed } - driver := &csiv1alpha1.Driver{} + driver := &csiv1beta1.Driver{} BeforeEach(func() { By("creating the custom resource for the Kind Driver") err := k8sClient.Get(ctx, typeNamespacedName, driver) if err != nil && errors.IsNotFound(err) { - resource := &csiv1alpha1.Driver{ + resource := &csiv1beta1.Driver{ ObjectMeta: metav1.ObjectMeta{ Name: resourceName, Namespace: "default", @@ -59,7 +59,7 @@ var _ = Describe("Driver Controller", func() { AfterEach(func() { // TODO(user): Cleanup logic after each test, like removing the resource instance. - resource := &csiv1alpha1.Driver{} + resource := &csiv1beta1.Driver{} err := k8sClient.Get(ctx, typeNamespacedName, resource) Expect(err).NotTo(HaveOccurred()) diff --git a/internal/controller/suite_test.go b/internal/controller/suite_test.go index 7cd1ef8f5..9ed20216e 100644 --- a/internal/controller/suite_test.go +++ b/internal/controller/suite_test.go @@ -32,16 +32,18 @@ import ( logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" - csiv1alpha1 "github.com/ceph/ceph-csi-operator/api/v1alpha1" + csiv1beta1 "github.com/ceph/ceph-csi-operator/api/v1beta1" //+kubebuilder:scaffold:imports ) // These tests use Ginkgo (BDD-style Go testing framework). Refer to // http://onsi.github.io/ginkgo/ to learn more about Ginkgo. -var cfg *rest.Config -var k8sClient client.Client -var testEnv *envtest.Environment +var ( + cfg *rest.Config + k8sClient client.Client + testEnv *envtest.Environment +) func TestControllers(t *testing.T) { RegisterFailHandler(Fail) @@ -72,7 +74,7 @@ var _ = BeforeSuite(func() { Expect(err).NotTo(HaveOccurred()) Expect(cfg).NotTo(BeNil()) - err = csiv1alpha1.AddToScheme(scheme.Scheme) + err = csiv1beta1.AddToScheme(scheme.Scheme) Expect(err).NotTo(HaveOccurred()) //+kubebuilder:scaffold:scheme @@ -80,7 +82,6 @@ var _ = BeforeSuite(func() { k8sClient, err = client.New(cfg, client.Options{Scheme: scheme.Scheme}) Expect(err).NotTo(HaveOccurred()) Expect(k8sClient).NotTo(BeNil()) - }) var _ = AfterSuite(func() { diff --git a/vendor/github.com/ceph/ceph-csi-operator/api/v1alpha1/cephconnection_types.go b/vendor/github.com/ceph/ceph-csi-operator/api/v1beta1/cephconnection_types.go similarity index 99% rename from vendor/github.com/ceph/ceph-csi-operator/api/v1alpha1/cephconnection_types.go rename to vendor/github.com/ceph/ceph-csi-operator/api/v1beta1/cephconnection_types.go index 518cb012b..4a26de169 100644 --- a/vendor/github.com/ceph/ceph-csi-operator/api/v1alpha1/cephconnection_types.go +++ b/vendor/github.com/ceph/ceph-csi-operator/api/v1beta1/cephconnection_types.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package v1alpha1 +package v1beta1 import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/api/v1alpha1/clientprofile_types.go b/vendor/github.com/ceph/ceph-csi-operator/api/v1beta1/clientprofile_types.go similarity index 99% rename from api/v1alpha1/clientprofile_types.go rename to vendor/github.com/ceph/ceph-csi-operator/api/v1beta1/clientprofile_types.go index 707295ce1..e99d120ee 100644 --- a/api/v1alpha1/clientprofile_types.go +++ b/vendor/github.com/ceph/ceph-csi-operator/api/v1beta1/clientprofile_types.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package v1alpha1 +package v1beta1 import ( corev1 "k8s.io/api/core/v1" diff --git a/vendor/github.com/ceph/ceph-csi-operator/api/v1alpha1/clientprofilemapping_types.go b/vendor/github.com/ceph/ceph-csi-operator/api/v1beta1/clientprofilemapping_types.go similarity index 99% rename from vendor/github.com/ceph/ceph-csi-operator/api/v1alpha1/clientprofilemapping_types.go rename to vendor/github.com/ceph/ceph-csi-operator/api/v1beta1/clientprofilemapping_types.go index ce927cb5f..80a7085c7 100644 --- a/vendor/github.com/ceph/ceph-csi-operator/api/v1alpha1/clientprofilemapping_types.go +++ b/vendor/github.com/ceph/ceph-csi-operator/api/v1beta1/clientprofilemapping_types.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package v1alpha1 +package v1beta1 import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/api/v1alpha1/driver_types.go b/vendor/github.com/ceph/ceph-csi-operator/api/v1beta1/driver_types.go similarity index 99% rename from api/v1alpha1/driver_types.go rename to vendor/github.com/ceph/ceph-csi-operator/api/v1beta1/driver_types.go index 24052f066..f6259dc5b 100644 --- a/api/v1alpha1/driver_types.go +++ b/vendor/github.com/ceph/ceph-csi-operator/api/v1beta1/driver_types.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package v1alpha1 +package v1beta1 import ( appsv1 "k8s.io/api/apps/v1" diff --git a/api/v1alpha1/groupversion_info.go b/vendor/github.com/ceph/ceph-csi-operator/api/v1beta1/groupversion_info.go similarity index 93% rename from api/v1alpha1/groupversion_info.go rename to vendor/github.com/ceph/ceph-csi-operator/api/v1beta1/groupversion_info.go index 1d6466ed4..dbe4c7920 100644 --- a/api/v1alpha1/groupversion_info.go +++ b/vendor/github.com/ceph/ceph-csi-operator/api/v1beta1/groupversion_info.go @@ -14,10 +14,10 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Package v1alpha1 contains API Schema definitions for the csi v1alpha1 API group +// Package v1beta1 contains API Schema definitions for the csi v1beta1 API group // +kubebuilder:object:generate=true // +groupName=csi.ceph.io -package v1alpha1 +package v1beta1 import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -27,7 +27,7 @@ import ( var ( // GroupVersion is group version used to register these objects - GroupVersion = schema.GroupVersion{Group: "csi.ceph.io", Version: "v1alpha1"} + GroupVersion = schema.GroupVersion{Group: "csi.ceph.io", Version: "v1beta1"} // SchemeBuilder is used to add go types to the GroupVersionKind scheme SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes) diff --git a/api/v1alpha1/operatorconfig_types.go b/vendor/github.com/ceph/ceph-csi-operator/api/v1beta1/operatorconfig_types.go similarity index 99% rename from api/v1alpha1/operatorconfig_types.go rename to vendor/github.com/ceph/ceph-csi-operator/api/v1beta1/operatorconfig_types.go index 0bba111b3..36f1cb57c 100644 --- a/api/v1alpha1/operatorconfig_types.go +++ b/vendor/github.com/ceph/ceph-csi-operator/api/v1beta1/operatorconfig_types.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package v1alpha1 +package v1beta1 import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/ceph/ceph-csi-operator/api/v1alpha1/zz_generated.deepcopy.go b/vendor/github.com/ceph/ceph-csi-operator/api/v1beta1/zz_generated.deepcopy.go similarity index 99% rename from vendor/github.com/ceph/ceph-csi-operator/api/v1alpha1/zz_generated.deepcopy.go rename to vendor/github.com/ceph/ceph-csi-operator/api/v1beta1/zz_generated.deepcopy.go index bb617807b..5809fed4f 100644 --- a/vendor/github.com/ceph/ceph-csi-operator/api/v1alpha1/zz_generated.deepcopy.go +++ b/vendor/github.com/ceph/ceph-csi-operator/api/v1beta1/zz_generated.deepcopy.go @@ -18,7 +18,7 @@ limitations under the License. // Code generated by controller-gen. DO NOT EDIT. -package v1alpha1 +package v1beta1 import ( appsv1 "k8s.io/api/apps/v1" diff --git a/vendor/modules.txt b/vendor/modules.txt index c031c94fd..932059793 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -18,7 +18,7 @@ github.com/blang/semver/v4 github.com/cenkalti/backoff/v4 # github.com/ceph/ceph-csi-operator/api v0.0.0-00010101000000-000000000000 => ./api ## explicit; go 1.23.0 -github.com/ceph/ceph-csi-operator/api/v1alpha1 +github.com/ceph/ceph-csi-operator/api/v1beta1 # github.com/cespare/xxhash/v2 v2.3.0 ## explicit; go 1.11 github.com/cespare/xxhash/v2