fix: use Label Selector

Signed-off-by: Vladislav Sukhin <[email protected]>
kubeshop · Nov 14, 2024 · e69a2f9 · e69a2f9
1 parent fb46a3a
commit e69a2f9
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/api/v1/testkube.yaml b/api/v1/testkube.yaml
@@ -9042,7 +9042,7 @@ components:
           config:
             $ref: "#/components/schemas/TestWorkflowConfigValue"
           selector:
-            $ref: "https://raw.githubusercontent.com/garethr/kubernetes-json-schema/master/v1.7.8/_definitions.json#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.LabelSelector"
+            $ref: "#/components/schemas/LabelSelector"
             description: label selector for test workflow
 
     TestWorkflowStepExecuteTestRef:

diff --git a/pkg/api/v1/testkube/model_test_workflow_step_execute_test_workflow_ref.go b/pkg/api/v1/testkube/model_test_workflow_step_execute_test_workflow_ref.go
@@ -23,6 +23,6 @@ type TestWorkflowStepExecuteTestWorkflowRef struct {
 	// matrix of parameters to spawn instances
 	Matrix map[string]interface{} `json:"matrix,omitempty"`
 	// parameters that should be distributed across sharded instances
-	Shards   map[string]interface{}                       `json:"shards,omitempty"`
-	Selector *IoK8sApimachineryPkgApisMetaV1LabelSelector `json:"selector,omitempty"`
+	Shards   map[string]interface{} `json:"shards,omitempty"`
+	Selector *LabelSelector         `json:"selector,omitempty"`
 }
diff --git a/pkg/mapper/testworkflows/kube_openapi.go b/pkg/mapper/testworkflows/kube_openapi.go
@@ -806,16 +806,16 @@ func MapStepExecuteTestKubeToAPI(v testworkflowsv1.StepExecuteTest) testkube.Tes
 	}
 }
 
-func MapLabelSelectorRequirementToAPI(v metav1.LabelSelectorRequirement) testkube.IoK8sApimachineryPkgApisMetaV1LabelSelectorRequirement {
-	return testkube.IoK8sApimachineryPkgApisMetaV1LabelSelectorRequirement{
+func MapLabelSelectorRequirementToAPI(v metav1.LabelSelectorRequirement) testkube.LabelSelectorRequirement {
+	return testkube.LabelSelectorRequirement{
 		Key:      v.Key,
 		Operator: string(v.Operator),
 		Values:   v.Values,
 	}
 }
 
-func MapSelectorToAPI(v metav1.LabelSelector) testkube.IoK8sApimachineryPkgApisMetaV1LabelSelector {
-	return testkube.IoK8sApimachineryPkgApisMetaV1LabelSelector{
+func MapSelectorToAPI(v metav1.LabelSelector) testkube.LabelSelector {
+	return testkube.LabelSelector{
 		MatchLabels:      v.MatchLabels,
 		MatchExpressions: common.MapSlice(v.MatchExpressions, MapLabelSelectorRequirementToAPI),
 	}

diff --git a/pkg/mapper/testworkflows/openapi_kube.go b/pkg/mapper/testworkflows/openapi_kube.go
@@ -846,15 +846,15 @@ func MapStepExecuteTestAPIToKube(v testkube.TestWorkflowStepExecuteTestRef) test
 	}
 }
 
-func MapLabelSelectorRequirementToCRD(v testkube.IoK8sApimachineryPkgApisMetaV1LabelSelectorRequirement) metav1.LabelSelectorRequirement {
+func MapLabelSelectorRequirementToCRD(v testkube.LabelSelectorRequirement) metav1.LabelSelectorRequirement {
 	return metav1.LabelSelectorRequirement{
 		Key:      v.Key,
 		Operator: metav1.LabelSelectorOperator(v.Operator),
 		Values:   v.Values,
 	}
 }
 
-func MapSelectorToCRD(v testkube.IoK8sApimachineryPkgApisMetaV1LabelSelector) metav1.LabelSelector {
+func MapSelectorToCRD(v testkube.LabelSelector) metav1.LabelSelector {
 	return metav1.LabelSelector{
 		MatchLabels:      v.MatchLabels,
 		MatchExpressions: common.MapSlice(v.MatchExpressions, MapLabelSelectorRequirementToCRD),