From 209dc6251d44d3cd3f76d64b62bbbd46005d3443 Mon Sep 17 00:00:00 2001 From: subhamkrai Date: Fri, 11 Sep 2020 13:29:53 +0530 Subject: [PATCH] ceph: fixed DNS suffix breaks in custom DNS suffix clusters By addding ".svc" to the endpoint of the object store, will fix the custom DNS suffix cluster. Signed-off-by: subhamkrai --- pkg/operator/ceph/object/bucket/provisioner_test.go | 2 +- pkg/operator/ceph/object/controller_test.go | 2 +- pkg/operator/ceph/object/objectstore.go | 2 +- pkg/operator/ceph/object/rgw_test.go | 6 +++--- pkg/operator/ceph/object/status_test.go | 8 ++++---- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkg/operator/ceph/object/bucket/provisioner_test.go b/pkg/operator/ceph/object/bucket/provisioner_test.go index cb1a0c25e..93dd47a57 100644 --- a/pkg/operator/ceph/object/bucket/provisioner_test.go +++ b/pkg/operator/ceph/object/bucket/provisioner_test.go @@ -100,5 +100,5 @@ func TestPopulateDomainAndPort(t *testing.T) { p.objectStoreName = store err = p.populateDomainAndPort(sc) assert.NoError(t, err) - assert.Equal(t, "rook-ceph-rgw-test-store.ns.svc.cluster.local", p.storeDomainName) + assert.Equal(t, "rook-ceph-rgw-test-store.ns.svc", p.storeDomainName) } diff --git a/pkg/operator/ceph/object/controller_test.go b/pkg/operator/ceph/object/controller_test.go index 73e5896ce..e6d37dfc5 100644 --- a/pkg/operator/ceph/object/controller_test.go +++ b/pkg/operator/ceph/object/controller_test.go @@ -371,7 +371,7 @@ func TestCephObjectStoreController(t *testing.T) { assert.NoError(t, err) assert.Equal(t, cephv1.ConditionProgressing, objectStore.Status.Phase, objectStore) assert.NotEmpty(t, objectStore.Status.Info["endpoint"], objectStore) - assert.Equal(t, "http://rook-ceph-rgw-my-store.rook-ceph.svc.cluster.local:80", objectStore.Status.Info["endpoint"], objectStore) + assert.Equal(t, "http://rook-ceph-rgw-my-store.rook-ceph.svc:80", objectStore.Status.Info["endpoint"], objectStore) logger.Info("PHASE 3 DONE") // Test the functionality of verifyObjectUserCleanup diff --git a/pkg/operator/ceph/object/objectstore.go b/pkg/operator/ceph/object/objectstore.go index e935a1be0..0cb6441ec 100644 --- a/pkg/operator/ceph/object/objectstore.go +++ b/pkg/operator/ceph/object/objectstore.go @@ -44,7 +44,7 @@ const ( bucketProvisionerName = "ceph.rook.io/bucket" AccessKeyName = "access-key" SecretKeyName = "secret-key" - svcDNSSuffix = "svc.cluster.local" + svcDNSSuffix = "svc" ) var ( diff --git a/pkg/operator/ceph/object/rgw_test.go b/pkg/operator/ceph/object/rgw_test.go index 7abbcb03e..f42b46b2e 100644 --- a/pkg/operator/ceph/object/rgw_test.go +++ b/pkg/operator/ceph/object/rgw_test.go @@ -159,15 +159,15 @@ func TestBuildDomainNameAndEndpoint(t *testing.T) { name := "my-store" ns := "rook-ceph" dns := BuildDomainName(name, ns) - assert.Equal(t, "rook-ceph-rgw-my-store.rook-ceph.svc.cluster.local", dns) + assert.Equal(t, "rook-ceph-rgw-my-store.rook-ceph.svc", dns) // non-secure endpoint var port int32 = 80 ep := buildDNSEndpoint(dns, port, false) - assert.Equal(t, "http://rook-ceph-rgw-my-store.rook-ceph.svc.cluster.local:80", ep) + assert.Equal(t, "http://rook-ceph-rgw-my-store.rook-ceph.svc:80", ep) // Secure endpoint var securePort int32 = 443 ep = buildDNSEndpoint(dns, securePort, true) - assert.Equal(t, "https://rook-ceph-rgw-my-store.rook-ceph.svc.cluster.local:443", ep) + assert.Equal(t, "https://rook-ceph-rgw-my-store.rook-ceph.svc:443", ep) } diff --git a/pkg/operator/ceph/object/status_test.go b/pkg/operator/ceph/object/status_test.go index 0976d085d..be8b743c9 100644 --- a/pkg/operator/ceph/object/status_test.go +++ b/pkg/operator/ceph/object/status_test.go @@ -37,7 +37,7 @@ func TestBuildStatusInfo(t *testing.T) { statusInfo := buildStatusInfo(cephObjectStore) assert.NotEmpty(t, statusInfo["endpoint"]) assert.Empty(t, statusInfo["secureEndpoint"]) - assert.Equal(t, "http://rook-ceph-rgw-my-store.rook-ceph.svc.cluster.local:80", statusInfo["endpoint"]) + assert.Equal(t, "http://rook-ceph-rgw-my-store.rook-ceph.svc:80", statusInfo["endpoint"]) // SecurePort enabled and Port disabled cephObjectStore.Spec.Gateway.Port = 0 @@ -46,7 +46,7 @@ func TestBuildStatusInfo(t *testing.T) { statusInfo = buildStatusInfo(cephObjectStore) assert.NotEmpty(t, statusInfo["endpoint"]) assert.Empty(t, statusInfo["secureEndpoint"]) - assert.Equal(t, "https://rook-ceph-rgw-my-store.rook-ceph.svc.cluster.local:443", statusInfo["endpoint"]) + assert.Equal(t, "https://rook-ceph-rgw-my-store.rook-ceph.svc:443", statusInfo["endpoint"]) // Both Port and SecurePort enabled cephObjectStore.Spec.Gateway.Port = 80 @@ -55,6 +55,6 @@ func TestBuildStatusInfo(t *testing.T) { statusInfo = buildStatusInfo(cephObjectStore) assert.NotEmpty(t, statusInfo["endpoint"]) assert.NotEmpty(t, statusInfo["secureEndpoint"]) - assert.Equal(t, "http://rook-ceph-rgw-my-store.rook-ceph.svc.cluster.local:80", statusInfo["endpoint"]) - assert.Equal(t, "https://rook-ceph-rgw-my-store.rook-ceph.svc.cluster.local:443", statusInfo["secureEndpoint"]) + assert.Equal(t, "http://rook-ceph-rgw-my-store.rook-ceph.svc:80", statusInfo["endpoint"]) + assert.Equal(t, "https://rook-ceph-rgw-my-store.rook-ceph.svc:443", statusInfo["secureEndpoint"]) }