operator: refactor to use reflect.TypeFor

Signed-off-by: cuiweixie <cuiweixie@gmail.com>
This commit is contained in:
cuiweixie committed 2025-08-28 23:02:19 +08:00
1 parent b162873623
commit 20b3b9deef
14 files changed
+14 -40

No files matched your search

+1 -3
View File
@@ -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),
}
+1 -3
View File
@@ -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),
}
@@ -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),
}
+1 -3
View File
@@ -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),
}
+1 -3
View File
@@ -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),
}
@@ -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),
}
+1 -3
View File
@@ -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),
}
+1 -3
View File
@@ -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),
}
+1 -3
View File
@@ -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),
}
+1 -3
View File
@@ -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),
}
+1 -3
View File
@@ -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),
}
@@ -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),
}
+1 -3
View File
@@ -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),
}
@@ -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),
}