diff --git a/pkg/operator/ceph/client/controller.go b/pkg/operator/ceph/client/controller.go index fe6ed29f4..de6b48359 100644 --- a/pkg/operator/ceph/client/controller.go +++ b/pkg/operator/ceph/client/controller.go @@ -57,11 +57,9 @@ const ( var logger = capnslog.NewPackageLogger("github.com/rook/rook", controllerName) -var cephClientKind = reflect.TypeOf(cephv1.CephClient{}).Name() - // Sets the type meta for the controller main object var controllerTypeMeta = metav1.TypeMeta{ - Kind: cephClientKind, + Kind: reflect.TypeFor[cephv1.CephClient]().Name(), APIVersion: fmt.Sprintf("%s/%s", cephv1.CustomResourceGroup, cephv1.Version), } diff --git a/pkg/operator/ceph/cluster/rbd/controller.go b/pkg/operator/ceph/cluster/rbd/controller.go index 5f7910469..ddecd4575 100644 --- a/pkg/operator/ceph/cluster/rbd/controller.go +++ b/pkg/operator/ceph/cluster/rbd/controller.go @@ -60,11 +60,9 @@ var objectsToWatch = []client.Object{ &appsv1.Deployment{TypeMeta: metav1.TypeMeta{Kind: "Deployment", APIVersion: appsv1.SchemeGroupVersion.String()}}, } -var cephRBDMirrorKind = reflect.TypeOf(cephv1.CephRBDMirror{}).Name() - // Sets the type meta for the controller main object var controllerTypeMeta = metav1.TypeMeta{ - Kind: cephRBDMirrorKind, + Kind: reflect.TypeFor[cephv1.CephRBDMirror]().Name(), APIVersion: fmt.Sprintf("%s/%s", cephv1.CustomResourceGroup, cephv1.Version), } diff --git a/pkg/operator/ceph/controller/controller_utils.go b/pkg/operator/ceph/controller/controller_utils.go index 4947a3b31..859745bd8 100644 --- a/pkg/operator/ceph/controller/controller_utils.go +++ b/pkg/operator/ceph/controller/controller_utils.go @@ -279,7 +279,7 @@ var ClusterResource = k8sutil.CustomResource{ Plural: "cephclusters", Group: cephv1.CustomResourceGroup, Version: cephv1.Version, - Kind: reflect.TypeOf(cephv1.CephCluster{}).Name(), + Kind: reflect.TypeFor[cephv1.CephCluster]().Name(), APIVersion: fmt.Sprintf("%s/%s", cephv1.CustomResourceGroup, cephv1.Version), } diff --git a/pkg/operator/ceph/file/controller.go b/pkg/operator/ceph/file/controller.go index b687e4e87..29b5b2376 100644 --- a/pkg/operator/ceph/file/controller.go +++ b/pkg/operator/ceph/file/controller.go @@ -61,11 +61,9 @@ var objectsToWatch = []client.Object{ &appsv1.Deployment{TypeMeta: metav1.TypeMeta{Kind: "Deployment", APIVersion: appsv1.SchemeGroupVersion.String()}}, } -var cephFilesystemKind = reflect.TypeOf(cephv1.CephFilesystem{}).Name() - // Sets the type meta for the controller main object var controllerTypeMeta = metav1.TypeMeta{ - Kind: cephFilesystemKind, + Kind: reflect.TypeFor[cephv1.CephFilesystem]().Name(), APIVersion: fmt.Sprintf("%s/%s", cephv1.CustomResourceGroup, cephv1.Version), } diff --git a/pkg/operator/ceph/file/mirror/controller.go b/pkg/operator/ceph/file/mirror/controller.go index 2c7ac7519..eafa1862e 100644 --- a/pkg/operator/ceph/file/mirror/controller.go +++ b/pkg/operator/ceph/file/mirror/controller.go @@ -60,11 +60,9 @@ var objectsToWatch = []client.Object{ &appsv1.Deployment{TypeMeta: metav1.TypeMeta{Kind: "Deployment", APIVersion: appsv1.SchemeGroupVersion.String()}}, } -var cephFilesystemMirrorKind = reflect.TypeOf(cephv1.CephFilesystemMirror{}).Name() - // Sets the type meta for the controller main object var controllerTypeMeta = metav1.TypeMeta{ - Kind: cephFilesystemMirrorKind, + Kind: reflect.TypeFor[cephv1.CephFilesystemMirror]().Name(), APIVersion: fmt.Sprintf("%s/%s", cephv1.CustomResourceGroup, cephv1.Version), } diff --git a/pkg/operator/ceph/file/subvolumegroup/controller.go b/pkg/operator/ceph/file/subvolumegroup/controller.go index ac741c97f..b2a11044a 100644 --- a/pkg/operator/ceph/file/subvolumegroup/controller.go +++ b/pkg/operator/ceph/file/subvolumegroup/controller.go @@ -59,11 +59,9 @@ const ( var logger = capnslog.NewPackageLogger("github.com/rook/rook", controllerName) -var cephFilesystemSubVolumeGroup = reflect.TypeOf(cephv1.CephFilesystemSubVolumeGroup{}).Name() - // Sets the type meta for the controller main object var controllerTypeMeta = metav1.TypeMeta{ - Kind: cephFilesystemSubVolumeGroup, + Kind: reflect.TypeFor[cephv1.CephFilesystemSubVolumeGroup]().Name(), APIVersion: fmt.Sprintf("%s/%s", cephv1.CustomResourceGroup, cephv1.Version), } diff --git a/pkg/operator/ceph/nfs/controller.go b/pkg/operator/ceph/nfs/controller.go index 8e19eb745..adfc1f175 100644 --- a/pkg/operator/ceph/nfs/controller.go +++ b/pkg/operator/ceph/nfs/controller.go @@ -60,11 +60,9 @@ var objectsToWatch = []client.Object{ &appsv1.Deployment{TypeMeta: metav1.TypeMeta{Kind: "Deployment", APIVersion: appsv1.SchemeGroupVersion.String()}}, } -var cephNFSKind = reflect.TypeOf(cephv1.CephNFS{}).Name() - // Sets the type meta for the controller main object var controllerTypeMeta = metav1.TypeMeta{ - Kind: cephNFSKind, + Kind: reflect.TypeFor[cephv1.CephNFS]().Name(), APIVersion: fmt.Sprintf("%s/%s", cephv1.CustomResourceGroup, cephv1.Version), } diff --git a/pkg/operator/ceph/object/controller.go b/pkg/operator/ceph/object/controller.go index 25691a166..ad2d5eb67 100644 --- a/pkg/operator/ceph/object/controller.go +++ b/pkg/operator/ceph/object/controller.go @@ -71,11 +71,9 @@ var objectsToWatch = []client.Object{ &appsv1.Deployment{TypeMeta: metav1.TypeMeta{Kind: "Deployment", APIVersion: appsv1.SchemeGroupVersion.String()}}, } -var cephObjectStoreKind = reflect.TypeOf(cephv1.CephObjectStore{}).Name() - // Sets the type meta for the controller main object var controllerTypeMeta = metav1.TypeMeta{ - Kind: cephObjectStoreKind, + Kind: reflect.TypeFor[cephv1.CephObjectStore]().Name(), APIVersion: fmt.Sprintf("%s/%s", cephv1.CustomResourceGroup, cephv1.Version), } diff --git a/pkg/operator/ceph/object/realm/controller.go b/pkg/operator/ceph/object/realm/controller.go index f7cc47e90..e74447aa2 100644 --- a/pkg/operator/ceph/object/realm/controller.go +++ b/pkg/operator/ceph/object/realm/controller.go @@ -62,11 +62,9 @@ var waitForRequeueIfRealmNotReady = reconcile.Result{Requeue: true, RequeueAfter var logger = capnslog.NewPackageLogger("github.com/rook/rook", controllerName) -var cephObjectRealmKind = reflect.TypeOf(cephv1.CephObjectRealm{}).Name() - // Sets the type meta for the controller main object var controllerTypeMeta = metav1.TypeMeta{ - Kind: cephObjectRealmKind, + Kind: reflect.TypeFor[cephv1.CephObjectRealm]().Name(), APIVersion: fmt.Sprintf("%s/%s", cephv1.CustomResourceGroup, cephv1.Version), } diff --git a/pkg/operator/ceph/object/user/controller.go b/pkg/operator/ceph/object/user/controller.go index b18b2eccf..f3a3438bc 100644 --- a/pkg/operator/ceph/object/user/controller.go +++ b/pkg/operator/ceph/object/user/controller.go @@ -63,11 +63,9 @@ var newMultisiteAdminOpsCtxFunc = object.NewMultisiteAdminOpsContext var logger = capnslog.NewPackageLogger("github.com/rook/rook", controllerName) -var cephObjectStoreUserKind = reflect.TypeOf(cephv1.CephObjectStoreUser{}).Name() - // Sets the type meta for the controller main object var controllerTypeMeta = metav1.TypeMeta{ - Kind: cephObjectStoreUserKind, + Kind: reflect.TypeFor[cephv1.CephObjectStoreUser]().Name(), APIVersion: fmt.Sprintf("%s/%s", cephv1.CustomResourceGroup, cephv1.Version), } diff --git a/pkg/operator/ceph/object/zone/controller.go b/pkg/operator/ceph/object/zone/controller.go index f5a3a9434..91b84ab79 100644 --- a/pkg/operator/ceph/object/zone/controller.go +++ b/pkg/operator/ceph/object/zone/controller.go @@ -69,11 +69,9 @@ var commitConfigChangesFunc = object.CommitConfigChanges var logger = capnslog.NewPackageLogger("github.com/rook/rook", controllerName) -var cephObjectZoneKind = reflect.TypeOf(cephv1.CephObjectZone{}).Name() - // Sets the type meta for the controller main object var controllerTypeMeta = metav1.TypeMeta{ - Kind: cephObjectZoneKind, + Kind: reflect.TypeFor[cephv1.CephObjectZone]().Name(), APIVersion: fmt.Sprintf("%s/%s", cephv1.CustomResourceGroup, cephv1.Version), } diff --git a/pkg/operator/ceph/object/zonegroup/controller.go b/pkg/operator/ceph/object/zonegroup/controller.go index 083ba4fb0..91004cd18 100644 --- a/pkg/operator/ceph/object/zonegroup/controller.go +++ b/pkg/operator/ceph/object/zonegroup/controller.go @@ -55,11 +55,9 @@ var waitForRequeueIfObjectRealmNotReady = reconcile.Result{Requeue: true, Requeu var logger = capnslog.NewPackageLogger("github.com/rook/rook", controllerName) -var cephObjectZoneGroupKind = reflect.TypeOf(cephv1.CephObjectZoneGroup{}).Name() - // Sets the type meta for the controller main object var controllerTypeMeta = metav1.TypeMeta{ - Kind: cephObjectZoneGroupKind, + Kind: reflect.TypeFor[cephv1.CephObjectZoneGroup]().Name(), APIVersion: fmt.Sprintf("%s/%s", cephv1.CustomResourceGroup, cephv1.Version), } diff --git a/pkg/operator/ceph/pool/controller.go b/pkg/operator/ceph/pool/controller.go index 5ea77b70d..5082c2cb0 100644 --- a/pkg/operator/ceph/pool/controller.go +++ b/pkg/operator/ceph/pool/controller.go @@ -59,11 +59,9 @@ const ( var logger = capnslog.NewPackageLogger("github.com/rook/rook", controllerName) -var cephBlockPoolKind = reflect.TypeOf(cephv1.CephBlockPool{}).Name() - // Sets the type meta for the controller main object var controllerTypeMeta = metav1.TypeMeta{ - Kind: cephBlockPoolKind, + Kind: reflect.TypeFor[cephv1.CephBlockPool]().Name(), APIVersion: fmt.Sprintf("%s/%s", cephv1.CustomResourceGroup, cephv1.Version), } diff --git a/pkg/operator/ceph/pool/radosnamespace/controller.go b/pkg/operator/ceph/pool/radosnamespace/controller.go index 53cedbc5b..36551305a 100644 --- a/pkg/operator/ceph/pool/radosnamespace/controller.go +++ b/pkg/operator/ceph/pool/radosnamespace/controller.go @@ -58,11 +58,9 @@ const ( var logger = capnslog.NewPackageLogger("github.com/rook/rook", controllerName) -var poolNamespace = reflect.TypeOf(cephv1.CephBlockPoolRadosNamespace{}).Name() - // Sets the type meta for the controller main object var controllerTypeMeta = metav1.TypeMeta{ - Kind: poolNamespace, + Kind: reflect.TypeFor[cephv1.CephBlockPoolRadosNamespace]().Name(), APIVersion: fmt.Sprintf("%s/%s", cephv1.CustomResourceGroup, cephv1.Version), }