Remove TempestRegexp argument

Looks like it was not in use since the begning. Users usually finds simpler to have explicit negative list, even tough it is possible to consutuct a singe regexp. Also possible to construct a single regexp on the operator side, in case other way of passing would be prefered later on. Moving the default allowedTests to the defaults. Note: Consider moving the tempest run arguments to sub structure.
openstack-k8s-operators · Sep 20, 2023 · 34deecb · 34deecb
1 parent f60e80d
commit 34deecb
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 23 deletions.
diff --git a/api/bases/test.openstack.org_tempests.yaml b/api/bases/test.openstack.org_tempests.yaml
@@ -36,6 +36,8 @@ spec:
             description: TempestSpec defines the desired state of Tempest
             properties:
               allowedTests:
+                default:
+                - tempest.api.identity.v3
                 description: AllowedTests
                 items:
                   type: string
@@ -119,9 +121,6 @@ spec:
                 items:
                   type: string
                 type: array
-              tempestRegex:
-                description: TempestRegex
-                type: string
             required:
             - containerImage
             - openStackConfigMap

diff --git a/api/v1beta1/tempest_types.go b/api/v1beta1/tempest_types.go
@@ -64,10 +64,7 @@ type TempestSpec struct {
 	ExternalEndpoints []MetalLBConfig `json:"externalEndpoints,omitempty"`
 
 	// +kubebuilder:validation:Optional
-	// TempestRegex
-	TempestRegex string `json:"tempestRegex,omitempty"`
-
-	// +kubebuilder:validation:Optional
+	// +kubebuilder:default={"tempest.api.identity.v3"}
 	// AllowedTests
 	AllowedTests []string `json:"allowedTests,omitempty"`
 

diff --git a/config/crd/bases/test.openstack.org_tempests.yaml b/config/crd/bases/test.openstack.org_tempests.yaml
@@ -36,6 +36,8 @@ spec:
             description: TempestSpec defines the desired state of Tempest
             properties:
               allowedTests:
+                default:
+                - tempest.api.identity.v3
                 description: AllowedTests
                 items:
                   type: string
@@ -119,9 +121,6 @@ spec:
                 items:
                   type: string
                 type: array
-              tempestRegex:
-                description: TempestRegex
-                type: string
             required:
             - containerImage
             - openStackConfigMap

diff --git a/pkg/tempest/job.go b/pkg/tempest/job.go
@@ -19,14 +19,6 @@ func Job(
 	runAsUser := int64(42480)
 	runAsGroup := int64(42480)
 
-	args := []string{
-		"/var/lib/tempest/run_tempest.sh",
-	}
-	if instance.Spec.TempestRegex != "" {
-		args = append(args, "--regex")
-		args = append(args, instance.Spec.TempestRegex)
-	}
-
 	job := &batchv1.Job{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      instance.Name,
@@ -40,9 +32,9 @@ func Job(
 					RestartPolicy:      corev1.RestartPolicyNever,
 					ServiceAccountName: instance.RbacResourceName(),
 					SecurityContext: &corev1.PodSecurityContext{
-						RunAsUser: &runAsUser,
+						RunAsUser:  &runAsUser,
 						RunAsGroup: &runAsGroup,
-						FSGroup: &runAsGroup,
+						FSGroup:    &runAsGroup,
 					},
 					Containers: []corev1.Container{
 						{
@@ -51,7 +43,7 @@ func Job(
 							Command: []string{
 								"/usr/local/bin/container-scripts/invoke_tempest",
 							},
-							Args: []string{},
+							Args:         []string{},
 							Env:          env.MergeEnvs([]corev1.EnvVar{}, envVars),
 							VolumeMounts: GetVolumeMounts(),
 						},

diff --git a/templates/tempest/config/include.txt b/templates/tempest/config/include.txt
@@ -1,5 +1,3 @@
 {{range $val := .AllowedTests }}
 {{$val}}
-{{ else }}
-tempest.api.identity.v3
 {{end}}