From 9d2aa1f6bddb8894de68dd49ee5bf0e211604a06 Mon Sep 17 00:00:00 2001 From: Travis Nielsen Date: Fri, 3 Dec 2021 15:37:49 -0700 Subject: [PATCH] test: generate long node name depending on test suite The generation of a long node name in the integration tests was being done based on the k8s version. In the past, older K8s versions did not support the changing name. Now it's more maintainable if we generate the long name depending on the test suite. Signed-off-by: Travis Nielsen --- pkg/operator/k8sutil/k8sutil.go | 2 +- tests/framework/installer/ceph_installer.go | 2 +- tests/framework/installer/ceph_settings.go | 1 + tests/integration/ceph_helm_test.go | 3 ++- tests/integration/ceph_smoke_test.go | 1 + 5 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkg/operator/k8sutil/k8sutil.go b/pkg/operator/k8sutil/k8sutil.go index 737203a67..c96019ba2 100644 --- a/pkg/operator/k8sutil/k8sutil.go +++ b/pkg/operator/k8sutil/k8sutil.go @@ -112,7 +112,7 @@ func TruncateNodeName(format, nodeName string) string { func truncateNodeName(format, nodeName string, maxLength int) string { if len(nodeName)+len(fmt.Sprintf(format, "")) > maxLength { hashed := Hash(nodeName) - logger.Infof("format and nodeName longer than %d chars, nodeName %s will be %s", validation.DNS1035LabelMaxLength, nodeName, hashed) + logger.Infof("format and nodeName longer than %d chars, nodeName %s will be %s", maxLength, nodeName, hashed) nodeName = hashed } return fmt.Sprintf(format, nodeName) diff --git a/tests/framework/installer/ceph_installer.go b/tests/framework/installer/ceph_installer.go index 19e8e57ef..1112b07a3 100644 --- a/tests/framework/installer/ceph_installer.go +++ b/tests/framework/installer/ceph_installer.go @@ -920,7 +920,7 @@ func NewCephInstaller(t func() *testing.T, clientset *kubernetes.Clientset, sett k8shelper: k8shelp, helmHelper: utils.NewHelmHelper(testHelmPath()), k8sVersion: version.String(), - changeHostnames: k8shelp.VersionAtLeast("v1.18.0"), + changeHostnames: settings.ChangeHostName, T: t, } flag.Parse() diff --git a/tests/framework/installer/ceph_settings.go b/tests/framework/installer/ceph_settings.go index c93bb4c03..f10998acb 100644 --- a/tests/framework/installer/ceph_settings.go +++ b/tests/framework/installer/ceph_settings.go @@ -45,6 +45,7 @@ type TestCephSettings struct { SkipCleanupPolicy bool DirectMountToolbox bool EnableVolumeReplication bool + ChangeHostName bool RookVersion string CephVersion cephv1.CephVersionSpec } diff --git a/tests/integration/ceph_helm_test.go b/tests/integration/ceph_helm_test.go index 7455423d6..9ddf44317 100644 --- a/tests/integration/ceph_helm_test.go +++ b/tests/integration/ceph_helm_test.go @@ -72,6 +72,7 @@ func (h *HelmSuite) SetupSuite() { SkipOSDCreation: false, EnableAdmissionController: false, EnableDiscovery: true, + ChangeHostName: true, RookVersion: installer.LocalBuildTag, CephVersion: installer.OctopusVersion, } @@ -91,7 +92,7 @@ func (h *HelmSuite) AfterTest(suiteName, testName string) { // Test to make sure all rook components are installed and Running func (h *HelmSuite) TestARookInstallViaHelm() { checkIfRookClusterIsInstalled(h.Suite, h.k8shelper, h.settings.Namespace, h.settings.Namespace, 1) - checkIfRookClusterHasHealthyIngress(h.Suite, h.k8shelper, h.settings.Namespace) + checkIfRookClusterHasHealthyIngress(h.Suite, h.k8shelper, h.settings.Namespace) } // Test BlockCreation on Rook that was installed via Helm diff --git a/tests/integration/ceph_smoke_test.go b/tests/integration/ceph_smoke_test.go index 32c140e5b..0edb000ae 100644 --- a/tests/integration/ceph_smoke_test.go +++ b/tests/integration/ceph_smoke_test.go @@ -94,6 +94,7 @@ func (s *SmokeSuite) SetupSuite() { EnableAdmissionController: true, UseCrashPruner: true, EnableVolumeReplication: true, + ChangeHostName: true, RookVersion: installer.LocalBuildTag, CephVersion: installer.ReturnCephVersion(), }