From 1fd76a11685f950425bdfc1db43da37f5aeda58b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Han?= Date: Tue, 13 Jul 2021 17:44:40 +0200 Subject: [PATCH] ceph: add missing ceph cluster spec MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The lib-bucket-provisioner was missing the cephCluster spec so the check in RunAdminCommandNoMultisite would fail. This is similar to ad54ed8aacf6d6e7fc49657568ebc051a0f2ae76 just a different place. Signed-off-by: Sébastien Han --- pkg/operator/ceph/object/bucket/provisioner.go | 10 ++++++++++ pkg/operator/ceph/object/bucket/util.go | 13 +++++++++++++ 2 files changed, 23 insertions(+) diff --git a/pkg/operator/ceph/object/bucket/provisioner.go b/pkg/operator/ceph/object/bucket/provisioner.go index 15432b615..1947e389f 100644 --- a/pkg/operator/ceph/object/bucket/provisioner.go +++ b/pkg/operator/ceph/object/bucket/provisioner.go @@ -630,6 +630,16 @@ func (p *Provisioner) setAdminOpsAPIClient() error { return errors.Wrapf(err, "failed to get ceph object store %q", p.objectStoreName) } + cephCluster, err := p.getCephCluster() + if err != nil { + return errors.Wrapf(err, "failed to get ceph cluster in namespace %q", p.clusterInfo.Namespace) + } + if cephCluster == nil { + return errors.Errorf("failed to read ceph cluster in namespace %q, it's nil", p.clusterInfo.Namespace) + } + // Set the Ceph Cluster Spec so that we can fetch the admin ops key properly when multus is enabled + p.objectContext.CephClusterSpec = cephCluster.Spec + // Fetch the object store admin ops user accessKey, secretKey, err := cephObject.GetAdminOPSUserCredentials(p.objectContext, &cephObjectStore.Spec) if err != nil { diff --git a/pkg/operator/ceph/object/bucket/util.go b/pkg/operator/ceph/object/bucket/util.go index 6647a23f5..71faa16cf 100644 --- a/pkg/operator/ceph/object/bucket/util.go +++ b/pkg/operator/ceph/object/bucket/util.go @@ -91,6 +91,19 @@ func (p *Provisioner) getObjectStore() (*cephv1.CephObjectStore, error) { return store, err } +func (p *Provisioner) getCephCluster() (*cephv1.CephCluster, error) { + cephCluster, err := p.context.RookClientset.CephV1().CephClusters(p.clusterInfo.Namespace).List(context.TODO(), metav1.ListOptions{}) + if err != nil { + return nil, errors.Wrapf(err, "failed to list ceph clusters in namespace %q", p.clusterInfo.Namespace) + } + if len(cephCluster.Items) == 0 { + return nil, errors.Errorf("failed to find ceph cluster in namespace %q", p.clusterInfo.Namespace) + } + + // This is a bit weak, but there will always be a single cluster per namespace anyway + return &cephCluster.Items[0], err +} + func randomString(n int) string { var letterRunes = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"