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 <tnielsen@redhat.com>
This commit is contained in:
Travis Nielsen committed 2021-12-06 08:03:56 -07:00
1 parent ee83ca74af
commit 9d2aa1f6bd
5 files changed
+6 -3

No files matched your search

+1 -1
View File
@@ -112,7 +112,7 @@ func TruncateNodeName(format, nodeName string) string {
func truncateNodeName(format, nodeName string, maxLength int) string { func truncateNodeName(format, nodeName string, maxLength int) string {
if len(nodeName)+len(fmt.Sprintf(format, "")) > maxLength { if len(nodeName)+len(fmt.Sprintf(format, "")) > maxLength {
hashed := Hash(nodeName) 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 nodeName = hashed
} }
return fmt.Sprintf(format, nodeName) return fmt.Sprintf(format, nodeName)
+1 -1
View File
@@ -920,7 +920,7 @@ func NewCephInstaller(t func() *testing.T, clientset *kubernetes.Clientset, sett
k8shelper: k8shelp, k8shelper: k8shelp,
helmHelper: utils.NewHelmHelper(testHelmPath()), helmHelper: utils.NewHelmHelper(testHelmPath()),
k8sVersion: version.String(), k8sVersion: version.String(),
changeHostnames: k8shelp.VersionAtLeast("v1.18.0"), changeHostnames: settings.ChangeHostName,
T: t, T: t,
} }
flag.Parse() flag.Parse()
@@ -45,6 +45,7 @@ type TestCephSettings struct {
SkipCleanupPolicy bool SkipCleanupPolicy bool
DirectMountToolbox bool DirectMountToolbox bool
EnableVolumeReplication bool EnableVolumeReplication bool
ChangeHostName bool
RookVersion string RookVersion string
CephVersion cephv1.CephVersionSpec CephVersion cephv1.CephVersionSpec
} }
+2 -1
View File
@@ -72,6 +72,7 @@ func (h *HelmSuite) SetupSuite() {
SkipOSDCreation: false, SkipOSDCreation: false,
EnableAdmissionController: false, EnableAdmissionController: false,
EnableDiscovery: true, EnableDiscovery: true,
ChangeHostName: true,
RookVersion: installer.LocalBuildTag, RookVersion: installer.LocalBuildTag,
CephVersion: installer.OctopusVersion, 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 // Test to make sure all rook components are installed and Running
func (h *HelmSuite) TestARookInstallViaHelm() { func (h *HelmSuite) TestARookInstallViaHelm() {
checkIfRookClusterIsInstalled(h.Suite, h.k8shelper, h.settings.Namespace, h.settings.Namespace, 1) 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 // Test BlockCreation on Rook that was installed via Helm
+1
View File
@@ -94,6 +94,7 @@ func (s *SmokeSuite) SetupSuite() {
EnableAdmissionController: true, EnableAdmissionController: true,
UseCrashPruner: true, UseCrashPruner: true,
EnableVolumeReplication: true, EnableVolumeReplication: true,
ChangeHostName: true,
RookVersion: installer.LocalBuildTag, RookVersion: installer.LocalBuildTag,
CephVersion: installer.ReturnCephVersion(), CephVersion: installer.ReturnCephVersion(),
} }