From 54b352d5ceaaf8c723455bb60bc5386fde1a082b Mon Sep 17 00:00:00 2001 From: Vladislav Sukhin Date: Fri, 13 Dec 2024 17:59:35 +0300 Subject: [PATCH] fix: dep update Signed-off-by: Vladislav Sukhin --- go.mod | 2 +- go.sum | 6 ++---- pkg/mapper/testworkflows/kube_openapi.go | 4 ++-- pkg/mapper/testworkflows/openapi_kube.go | 4 ++-- pkg/testworkflows/testworkflowresolver/merge.go | 4 ++-- 5 files changed, 9 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index f3e1bd55f0..d83e255cfb 100644 --- a/go.mod +++ b/go.mod @@ -42,7 +42,7 @@ require ( github.com/keygen-sh/jsonapi-go v1.2.1 github.com/keygen-sh/keygen-go/v3 v3.2.0 github.com/kubepug/kubepug v1.7.1 - github.com/kubeshop/testkube-operator v1.17.55-0.20241213114930-df3327436207 + github.com/kubeshop/testkube-operator v1.17.55-0.20241213144851-e0d37fb5899a github.com/minio/minio-go/v7 v7.0.66 github.com/montanaflynn/stats v0.7.1 github.com/moogar0880/problems v0.1.1 diff --git a/go.sum b/go.sum index d55ba5f3ef..35bbe8851a 100644 --- a/go.sum +++ b/go.sum @@ -336,10 +336,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kubepug/kubepug v1.7.1 h1:LKhfSxS8Y5mXs50v+3Lpyec+cogErDLcV7CMUuiaisw= github.com/kubepug/kubepug v1.7.1/go.mod h1:lv+HxD0oTFL7ZWjj0u6HKhMbbTIId3eG7aWIW0gyF8g= -github.com/kubeshop/testkube-operator v1.17.55-0.20241212153943-9d18068064f1 h1:TmmGhFII/sIdEy6lMRHkRovG7Xr1pW4NkF9sPiPgtNc= -github.com/kubeshop/testkube-operator v1.17.55-0.20241212153943-9d18068064f1/go.mod h1:P47tw1nKQFufdsZndyq2HG2MSa0zK/lU0XpRfZtEmIk= -github.com/kubeshop/testkube-operator v1.17.55-0.20241213114930-df3327436207 h1:IQvoge5CpG0Z1uEjb/rcA4SN+ZiAmPrO0XSTLLlPDeg= -github.com/kubeshop/testkube-operator v1.17.55-0.20241213114930-df3327436207/go.mod h1:P47tw1nKQFufdsZndyq2HG2MSa0zK/lU0XpRfZtEmIk= +github.com/kubeshop/testkube-operator v1.17.55-0.20241213144851-e0d37fb5899a h1:nQDxKFu67lz9BH8isLnP7ttp7cgBWYnRDMV9VxMaYH0= +github.com/kubeshop/testkube-operator v1.17.55-0.20241213144851-e0d37fb5899a/go.mod h1:P47tw1nKQFufdsZndyq2HG2MSa0zK/lU0XpRfZtEmIk= github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ= github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI= github.com/lithammer/fuzzysearch v1.1.8 h1:/HIuJnjHuXS8bKaiTMeeDlW2/AyIWk2brx1V8LFgLN4= diff --git a/pkg/mapper/testworkflows/kube_openapi.go b/pkg/mapper/testworkflows/kube_openapi.go index 5509cc6736..333a2c4d12 100644 --- a/pkg/mapper/testworkflows/kube_openapi.go +++ b/pkg/mapper/testworkflows/kube_openapi.go @@ -1216,9 +1216,9 @@ func MapTestWorkflowTagSchemaKubeToAPI(v testworkflowsv1.TestWorkflowTagSchema) func MapPvcConfigKubeToAPI(v testworkflowsv1.TestWorkflowPvcConfig) testkube.TestWorkflowPvcConfig { return testkube.TestWorkflowPvcConfig{ AccessModes: v.AccessModes, - VolumeMode: v.VolumeMode, + VolumeMode: MapStringToBoxedString(v.VolumeMode), Resources: common.MapPtr(v.Resources, MapResourcesKubeToAPI), - StorageClassName: v.StorageClassName, + StorageClassName: MapStringToBoxedString(v.StorageClassName), VolumeName: v.VolumeName, Selector: common.MapPtr(v.Selector, MapSelectorToAPI), } diff --git a/pkg/mapper/testworkflows/openapi_kube.go b/pkg/mapper/testworkflows/openapi_kube.go index caf0f3860e..fa5a76abc0 100644 --- a/pkg/mapper/testworkflows/openapi_kube.go +++ b/pkg/mapper/testworkflows/openapi_kube.go @@ -1495,9 +1495,9 @@ func MapTestWorkflowTagSchemaAPIToKube(v testkube.TestWorkflowTagSchema) testwor func MapPvcConfigAPIToKube(v testkube.TestWorkflowPvcConfig) testworkflowsv1.TestWorkflowPvcConfig { return testworkflowsv1.TestWorkflowPvcConfig{ AccessModes: v.AccessModes, - VolumeMode: v.VolumeMode, + VolumeMode: MapBoxedStringToString(v.VolumeMode), Resources: common.MapPtr(v.Resources, MapResourcesAPIToKube), - StorageClassName: v.StorageClassName, + StorageClassName: MapBoxedStringToString(v.StorageClassName), VolumeName: v.VolumeName, Selector: common.MapPtr(v.Selector, MapLabelSelectorAPIToKube), } diff --git a/pkg/testworkflows/testworkflowresolver/merge.go b/pkg/testworkflows/testworkflowresolver/merge.go index 9da13ade7a..3ebf623ab0 100644 --- a/pkg/testworkflows/testworkflowresolver/merge.go +++ b/pkg/testworkflows/testworkflowresolver/merge.go @@ -426,8 +426,8 @@ func ConvertTestWorkflowPvcConfigToPersistentVolumeClaimSpec(pvc testworkflowsv1 Selector: pvc.Selector, Resources: ConvertResourcesToVolumeResourceRequirements(pvc.Resources), VolumeName: pvc.VolumeName, - StorageClassName: &pvc.StorageClassName, - VolumeMode: (*corev1.PersistentVolumeMode)(&pvc.VolumeMode), + StorageClassName: pvc.StorageClassName, + VolumeMode: (*corev1.PersistentVolumeMode)(pvc.VolumeMode), } }