Merge pull request #305 from kstrenkova/shorten-test-names

Shorten test pod names

Author: openshift-merge-bot[bot]

api/v1beta1/ansibletest_webhook.go

@@ -25,7 +25,11 @@ package v1beta1
 import (
 	"fmt"
 
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/util/validation"
+	"k8s.io/apimachinery/pkg/util/validation/field"
 	ctrl "sigs.k8s.io/controller-runtime"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
@@ -61,8 +65,31 @@ var _ webhook.Validator = &AnsibleTest{}
 func (r *AnsibleTest) ValidateCreate() (admission.Warnings, error) {
 	ansibletestlog.Info("validate create", "name", r.Name)
 
+	var allErrs field.ErrorList
 	var allWarnings admission.Warnings
 
+	if len(r.Name) >= validation.DNS1123LabelMaxLength {
+		allErrs = append(allErrs, &field.Error{
+			Type:     field.ErrorTypeInvalid,
+			BadValue: len(r.Name),
+			Detail:   fmt.Sprintf(ErrNameTooLong, "AnsibleTest", validation.DNS1123LabelMaxLength),
+		},
+		)
+	}
+
+	for _, workflowStep := range r.Spec.Workflow {
+		podNameLength := len(r.Name) + len(workflowStep.StepName) + len("-sXX-")
+
+		if podNameLength >= validation.DNS1123LabelMaxLength {
+			allErrs = append(allErrs, &field.Error{
+				Type:     field.ErrorTypeInvalid,
+				BadValue: podNameLength,
+				Detail:   fmt.Sprintf(ErrNameTooLong, "AnsibleTest", validation.DNS1123LabelMaxLength),
+			},
+			)
+		}
+	}
+
 	if r.Spec.Privileged {
 		allWarnings = append(allWarnings, fmt.Sprintf(WarnPrivilegedModeOn, "AnsibleTest"))
 	}
@@ -71,6 +98,14 @@ func (r *AnsibleTest) ValidateCreate() (admission.Warnings, error) {
 		allWarnings = append(allWarnings, fmt.Sprintf(WarnSELinuxLevel, r.Kind))
 	}
 
+	if len(allErrs) > 0 {
+		return allWarnings, apierrors.NewInvalid(
+			schema.GroupKind{
+				Group: GroupVersion.WithKind("AnsibleTest").Group,
+				Kind:  GroupVersion.WithKind("AnsibleTest").Kind,
+			}, r.GetName(), allErrs)
+	}
+
 	return allWarnings, nil
 }
 

api/v1beta1/common_webhook.go

@@ -7,6 +7,10 @@ const (
 
 	// ErrDebug
 	ErrDebug = "%s.Spec.Workflow parameter must be empty to run debug mode"
+
+	// ErrNameTooLong
+	ErrNameTooLong = "The combined length of %s pod name exceeds the maximum of %d " +
+		"characters. Shorten the CR name or workflow step name to proceed."
 )
 
 const (

api/v1beta1/tempest_webhook.go

@@ -30,6 +30,7 @@ import (
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/util/validation"
 	"k8s.io/apimachinery/pkg/util/validation/field"
 	ctrl "sigs.k8s.io/controller-runtime"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
@@ -108,6 +109,28 @@ func (r *Tempest) ValidateCreate() (admission.Warnings, error) {
 		)
 	}
 
+	if len(r.Name) >= validation.DNS1123LabelMaxLength {
+		allErrs = append(allErrs, &field.Error{
+			Type:     field.ErrorTypeInvalid,
+			BadValue: len(r.Name),
+			Detail:   fmt.Sprintf(ErrNameTooLong, "Tempest", validation.DNS1123LabelMaxLength),
+		},
+		)
+	}
+
+	for _, workflowStep := range r.Spec.Workflow {
+		podNameLength := len(r.Name) + len(workflowStep.StepName) + len("-sXX-")
+
+		if podNameLength >= validation.DNS1123LabelMaxLength {
+			allErrs = append(allErrs, &field.Error{
+				Type:     field.ErrorTypeInvalid,
+				BadValue: podNameLength,
+				Detail:   fmt.Sprintf(ErrNameTooLong, "Tempest", validation.DNS1123LabelMaxLength),
+			},
+			)
+		}
+	}
+
 	if r.Spec.Privileged {
 		allWarnings = append(allWarnings, fmt.Sprintf(WarnPrivilegedModeOn, "Tempest"))
 	}

api/v1beta1/tobiko_webhook.go

@@ -28,6 +28,7 @@ import (
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/util/validation"
 	"k8s.io/apimachinery/pkg/util/validation/field"
 	ctrl "sigs.k8s.io/controller-runtime"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
@@ -75,12 +76,38 @@ func (r *Tobiko) ValidateCreate() (admission.Warnings, error) {
 		})
 	}
 
+	if len(r.Name) >= validation.DNS1123LabelMaxLength {
+		allErrs = append(allErrs, &field.Error{
+			Type:     field.ErrorTypeInvalid,
+			BadValue: len(r.Name),
+			Detail:   fmt.Sprintf(ErrNameTooLong, "Tobiko", validation.DNS1123LabelMaxLength),
+		},
+		)
+	}
+
+	for _, workflowStep := range r.Spec.Workflow {
+		podNameLength := len(r.Name) + len(workflowStep.StepName) + len("-sXX-")
+
+		if podNameLength >= validation.DNS1123LabelMaxLength {
+			allErrs = append(allErrs, &field.Error{
+				Type:     field.ErrorTypeInvalid,
+				BadValue: podNameLength,
+				Detail:   fmt.Sprintf(ErrNameTooLong, "Tobiko", validation.DNS1123LabelMaxLength),
+			},
+			)
+		}
+	}
+
 	if r.Spec.Privileged {
 		allWarnings = append(allWarnings, fmt.Sprintf(WarnPrivilegedModeOn, "Tobiko"))
 	} else {
 		allWarnings = append(allWarnings, fmt.Sprintf(WarnPrivilegedModeOff, "Tobiko"))
 	}
 
+	if r.Spec.Privileged && len(r.Spec.Workflow) > 0 && len(r.Spec.SELinuxLevel) == 0 {
+		allWarnings = append(allWarnings, fmt.Sprintf(WarnSELinuxLevel, r.Kind))
+	}
+
 	if len(allErrs) > 0 {
 		return allWarnings, apierrors.NewInvalid(
 			schema.GroupKind{
@@ -89,10 +116,6 @@ func (r *Tobiko) ValidateCreate() (admission.Warnings, error) {
 			}, r.GetName(), allErrs)
 	}
 
-	if r.Spec.Privileged && len(r.Spec.Workflow) > 0 && len(r.Spec.SELinuxLevel) == 0 {
-		allWarnings = append(allWarnings, fmt.Sprintf(WarnSELinuxLevel, r.Kind))
-	}
-
 	return allWarnings, nil
 }
 

controllers/common.go

@@ -30,12 +30,11 @@ import (
 )
 
 const (
-	workflowNameSuffix       = "-workflow-counter"
-	podNameStepInfix         = "-workflow-step-"
-	envVarsConfigMapinfix    = "-env-vars-step-"
-	customDataConfigMapinfix = "-custom-data-step-"
+	podNameStepInfix         = "-s"
+	envVarsConfigMapinfix    = "-env-vars-s"
+	customDataConfigMapinfix = "-custom-data-s"
 	workflowStepNumInvalid   = -1
-	workflowStepNameInvalid  = "no-step-name"
+	workflowStepNameInvalid  = "no-name"
 	workflowStepLabel        = "workflowStep"
 	instanceNameLabel        = "instanceName"
 	operatorNameLabel        = "operator"
@@ -389,10 +388,6 @@ func (r *Reconciler) GetPodName(instance interface{}, workflowStepNum int) strin
 	return workflowStepNameInvalid
 }
 
-func (r *Reconciler) GetWorkflowConfigMapName(instance client.Object) string {
-	return instance.GetName() + workflowNameSuffix
-}
-
 func (r *Reconciler) GetPVCLogsName(instance client.Object, workflowStepNum int) string {
 	instanceName := instance.GetName()
 	instanceCreationTimestamp := instance.GetCreationTimestamp().Format(time.UnixDate)