feedc0de/my-rook-config
1
0
Fork 0
forked from rook/rook
Code Pull Requests Activity

ceph: fix multiple imports

Browse Source 
This fixes libraries that were being imported multiple times in
pkg/operator/ceph/object and its subpackages.

Signed-off-by: Lars Lehtonen <lars.lehtonen@gmail.com>
This commit is contained in:
Lars Lehtonen
2021-04-12 02:57:13 -07:00
parent 8b96114e80
commit f1b341ba23
4 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/operator/ceph/object/controller.go
+1 -2
View File
@@ -39,7 +39,6 @@ import (
"github.com/rook/rook/pkg/util/exec"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
kerrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
@@ -63,7 +62,7 @@ var logger = capnslog.NewPackageLogger("github.com/rook/rook", controllerName)
// List of object resources to watch by the controller
var objectsToWatch = []client.Object{
&corev1.Secret{TypeMeta: metav1.TypeMeta{Kind: "Secret", APIVersion: corev1.SchemeGroupVersion.String()}},
&v1.Service{TypeMeta: metav1.TypeMeta{Kind: "Service", APIVersion: v1.SchemeGroupVersion.String()}},
&corev1.Service{TypeMeta: metav1.TypeMeta{Kind: "Service", APIVersion: corev1.SchemeGroupVersion.String()}},
&appsv1.Deployment{TypeMeta: metav1.TypeMeta{Kind: "Deployment", APIVersion: appsv1.SchemeGroupVersion.String()}},
}
pkg/operator/ceph/object/objectstore.go
+2 -3
View File
@@ -28,7 +28,6 @@ import (
"github.com/pkg/errors"
cephv1 "github.com/rook/rook/pkg/apis/ceph.rook.io/v1"
"github.com/rook/rook/pkg/clusterd"
"github.com/rook/rook/pkg/daemon/ceph/client"
ceph "github.com/rook/rook/pkg/daemon/ceph/client"
"github.com/rook/rook/pkg/operator/ceph/config"
opcontroller "github.com/rook/rook/pkg/operator/ceph/controller"
@@ -604,7 +603,7 @@ func deletePools(context *Context, spec cephv1.ObjectStoreSpec, lastStore bool)
return errors.Wrapf(err, "failed to list erasure code profiles for cluster %s", context.clusterInfo.Namespace)
}
// cleans up the EC profile for the data pool only. Metadata pools don't support EC (only replication is supported).
ecProfileName := client.GetErasureCodeProfileForPool(context.Name)
ecProfileName := ceph.GetErasureCodeProfileForPool(context.Name)
for i := range erasureCodes {
if erasureCodes[i] == ecProfileName {
if err := ceph.DeleteErasureCodeProfile(context.Context, context.clusterInfo, ecProfileName); err != nil {
@@ -649,7 +648,7 @@ func CreatePools(context *Context, clusterSpec *cephv1.ClusterSpec, metadataPool
ecProfileName := ""
if dataPool.IsErasureCoded() {
ecProfileName = client.GetErasureCodeProfileForPool(context.Name)
ecProfileName = ceph.GetErasureCodeProfileForPool(context.Name)
// create a new erasure code profile for the data pool
if err := ceph.CreateErasureCodeProfile(context.Context, context.clusterInfo, ecProfileName, dataPool); err != nil {
return errors.Wrap(err, "failed to create erasure code profile")
pkg/operator/ceph/object/user/controller.go
+2 -3
View File
@@ -41,7 +41,6 @@ import (
"github.com/rook/rook/pkg/operator/ceph/object"
"github.com/rook/rook/pkg/operator/k8sutil"
corev1 "k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
kerrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"sigs.k8s.io/controller-runtime/pkg/client"
@@ -348,14 +347,14 @@ func generateStatusInfo(u *cephv1.CephObjectStoreUser) map[string]string {
return m
}
func (r *ReconcileObjectStoreUser) generateCephUserSecret(u *cephv1.CephObjectStoreUser) *v1.Secret {
func (r *ReconcileObjectStoreUser) generateCephUserSecret(u *cephv1.CephObjectStoreUser) *corev1.Secret {
// Store the keys in a secret
secrets := map[string]string{
"AccessKey": *r.userConfig.AccessKey,
"SecretKey": *r.userConfig.SecretKey,
"Endpoint": r.objContext.Endpoint,
}
secret := &v1.Secret{
secret := &corev1.Secret{
ObjectMeta: metav1.ObjectMeta{
Name: generateCephUserSecretName(u),
Namespace: u.Namespace,
pkg/operator/ceph/object/user/controller_test.go
+1 -2
View File
@@ -32,7 +32,6 @@ import (
exectest "github.com/rook/rook/pkg/util/exec/test"
"github.com/stretchr/testify/assert"
corev1 "k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/types"
@@ -197,7 +196,7 @@ func TestCephObjectStoreUserController(t *testing.T) {
"mon-secret": []byte("monsecret"),
"admin-secret": []byte("adminsecret"),
}
secret := &v1.Secret{
secret := &corev1.Secret{
ObjectMeta: metav1.ObjectMeta{
Name: "rook-ceph-mon",
Namespace: namespace,