diff --git a/pkg/operator/ceph/object/health.go b/pkg/operator/ceph/object/health.go index c2963902ae2ed..996686d24c855 100644 --- a/pkg/operator/ceph/object/health.go +++ b/pkg/operator/ceph/object/health.go @@ -159,14 +159,13 @@ func (c *bucketChecker) checkObjectStoreHealth() error { } // Set access and secret key - tlsCert := c.objContext.TlsCert s3endpoint := c.objContext.Endpoint s3AccessKey := user.Keys[0].AccessKey s3SecretKey := user.Keys[0].SecretKey // Initiate s3 agent logger.Debugf("initializing s3 connection for object store %q", c.namespacedName.Name) - s3client, err := NewS3Agent(s3AccessKey, s3SecretKey, s3endpoint, "", false, tlsCert) + s3client, err := NewInsecureS3Agent(s3AccessKey, s3SecretKey, s3endpoint, "", false) if err != nil { return errors.Wrap(err, "failed to initialize s3 connection") } diff --git a/pkg/operator/ceph/object/s3-handlers.go b/pkg/operator/ceph/object/s3-handlers.go index 74b8b76c1ae95..5173f7328252e 100644 --- a/pkg/operator/ceph/object/s3-handlers.go +++ b/pkg/operator/ceph/object/s3-handlers.go @@ -40,7 +40,7 @@ func NewS3Agent(accessKey, secretKey, endpoint, region string, debug bool, tlsCe return newS3Agent(accessKey, secretKey, endpoint, region, debug, tlsCert, false) } -func NewTestOnlyS3Agent(accessKey, secretKey, endpoint, region string, debug bool) (*S3Agent, error) { +func NewInsecureS3Agent(accessKey, secretKey, endpoint, region string, debug bool) (*S3Agent, error) { return newS3Agent(accessKey, secretKey, endpoint, region, debug, nil, true) } diff --git a/tests/integration/ceph_object_test.go b/tests/integration/ceph_object_test.go index bfb804d3ac6ff..0346a87f56271 100644 --- a/tests/integration/ceph_object_test.go +++ b/tests/integration/ceph_object_test.go @@ -41,6 +41,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) +var ( + objectStoreServicePrefix = "rook-ceph-rgw-" +) + func TestCephObjectSuite(t *testing.T) { if installer.SkipTestSuite(installer.CephTestSuite) { t.Skip() @@ -102,6 +106,16 @@ func (s *ObjectSuite) TestWithTLS() { runObjectE2ETest(s.helper, s.k8sh, s.Suite, s.settings.Namespace, tls) } +func (s *ObjectSuite) TestWithBrokenTLS() { + if utils.IsPlatformOpenShift() { + s.T().Skip("object store tests skipped on openshift") + } + + tls := true + objectStoreServicePrefix = "broken" + runObjectE2ETest(s.helper, s.k8sh, s.Suite, s.settings.Namespace, tls) +} + func (s *ObjectSuite) TestWithoutTLS() { if utils.IsPlatformOpenShift() { s.T().Skip("object store tests skipped on openshift") @@ -195,7 +209,7 @@ func checkCephObjectUser( // create a CephObjectStore and wait for it to report ready status func createCephObjectStore(t *testing.T, helper *clients.TestClient, k8sh *utils.K8sHelper, namespace, storeName string, replicaSize int, tlsEnable bool) { logger.Infof("Create Object Store %q with replica count %d", storeName, replicaSize) - rgwServiceName := "rook-ceph-rgw-" + storeName + rgwServiceName := objectStoreServicePrefix + storeName if tlsEnable { t.Run("generate TLS certs", func(t *testing.T) { generateRgwTlsCertSecret(t, helper, k8sh, namespace, storeName, rgwServiceName) @@ -320,7 +334,7 @@ func testObjectStoreOperations(s suite.Suite, helper *clients.TestClient, k8sh * s3AccessKey, _ := helper.BucketClient.GetAccessKey(obcName) s3SecretKey, _ := helper.BucketClient.GetSecretKey(obcName) if objectStore.Spec.IsTLSEnabled() { - s3client, err = rgw.NewTestOnlyS3Agent(s3AccessKey, s3SecretKey, s3endpoint, region, true) + s3client, err = rgw.NewInsecureS3Agent(s3AccessKey, s3SecretKey, s3endpoint, region, true) } else { s3client, err = rgw.NewS3Agent(s3AccessKey, s3SecretKey, s3endpoint, region, true, nil) }