From a103f37f4ad1bf362f8b655301bd9c644a2244b8 Mon Sep 17 00:00:00 2001 From: Ludger Pottmeier Date: Fri, 25 Oct 2024 00:12:30 +0200 Subject: [PATCH 1/4] Update kubernetes.go Fix issue #1942 --- pkg/transformer/kubernetes/kubernetes.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/transformer/kubernetes/kubernetes.go b/pkg/transformer/kubernetes/kubernetes.go index 72881833..2b33af79 100644 --- a/pkg/transformer/kubernetes/kubernetes.go +++ b/pkg/transformer/kubernetes/kubernetes.go @@ -985,7 +985,7 @@ func (k *Kubernetes) ConfigVolumes(name string, service kobject.ServiceConfig) ( volumeName = strings.Replace(volumeName, service.Name, name, 1) count++ } else { - volumeName = volume.VolumeName + volumeName = strings.ToLower(volume.VolumeName) } volMount := api.VolumeMount{ Name: volumeName, From d5de021f5136d6c161566b6d405b9cfc73e59264 Mon Sep 17 00:00:00 2001 From: Ludger Date: Wed, 30 Oct 2024 23:04:03 +0100 Subject: [PATCH 2/4] fix retract issue --- .gitignore | 3 +++ go.mod | 2 ++ go.sum | 4 ++-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index b01c0000..8a1c4abc 100644 --- a/.gitignore +++ b/.gitignore @@ -82,3 +82,6 @@ tags # Client Test generated files client/testdata/generated + + +pkg/mod \ No newline at end of file diff --git a/go.mod b/go.mod index 649e415e..9ece982b 100644 --- a/go.mod +++ b/go.mod @@ -4,6 +4,8 @@ go 1.22.0 toolchain go1.22.1 +replace github.com/openshift/api v3.9.0+incompatible => github.com/openshift/api v0.0.0-20230704153349-abb98ff04d03 + require ( github.com/compose-spec/compose-go/v2 v2.2.0 github.com/deckarep/golang-set v1.8.0 diff --git a/go.sum b/go.sum index a64dfd4b..ce82ce5b 100644 --- a/go.sum +++ b/go.sum @@ -96,8 +96,8 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug= github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM= -github.com/openshift/api v3.9.0+incompatible h1:fJ/KsefYuZAjmrr3+5U9yZIZbTOpVkDDLDLFresAeYs= -github.com/openshift/api v3.9.0+incompatible/go.mod h1:dh9o4Fs58gpFXGSYfnVxGR9PnV53I8TW84pQaJDdGiY= +github.com/openshift/api v0.0.0-20230704153349-abb98ff04d03 h1:qMeI0T0VAk3ydumBleYCbR7P2clyyEophp+dBCtCrJA= +github.com/openshift/api v0.0.0-20230704153349-abb98ff04d03/go.mod h1:yimSGmjsI+XF1mr+AKBs2//fSXIOhhetHGbMlBEfXbs= github.com/pelletier/go-toml/v2 v2.2.1 h1:9TA9+T8+8CUCO2+WYnDLCgrYi9+omqKXyjDtosvtEhg= github.com/pelletier/go-toml/v2 v2.2.1/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= From 470fb50146b08a8d908381214d3d2e7e8cd60e1c Mon Sep 17 00:00:00 2001 From: Ludger Date: Wed, 30 Oct 2024 23:27:42 +0100 Subject: [PATCH 3/4] fix upercas issue --- pkg/transformer/kubernetes/kubernetes.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/transformer/kubernetes/kubernetes.go b/pkg/transformer/kubernetes/kubernetes.go index 2b33af79..f71e7176 100644 --- a/pkg/transformer/kubernetes/kubernetes.go +++ b/pkg/transformer/kubernetes/kubernetes.go @@ -617,7 +617,7 @@ func (k *Kubernetes) CreatePVC(name string, mode string, size string, selectorVa APIVersion: "v1", }, ObjectMeta: metav1.ObjectMeta{ - Name: name, + Name: FormatResourceName(name), Labels: transformer.ConfigLabels(name), }, Spec: api.PersistentVolumeClaimSpec{ From d529bb9c418eb18265d84ba29c2fd0487f4b6960 Mon Sep 17 00:00:00 2001 From: Ludger Date: Wed, 30 Oct 2024 23:37:49 +0100 Subject: [PATCH 4/4] clean double to lower --- pkg/transformer/kubernetes/kubernetes.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/transformer/kubernetes/kubernetes.go b/pkg/transformer/kubernetes/kubernetes.go index f71e7176..4feb191d 100644 --- a/pkg/transformer/kubernetes/kubernetes.go +++ b/pkg/transformer/kubernetes/kubernetes.go @@ -985,7 +985,7 @@ func (k *Kubernetes) ConfigVolumes(name string, service kobject.ServiceConfig) ( volumeName = strings.Replace(volumeName, service.Name, name, 1) count++ } else { - volumeName = strings.ToLower(volume.VolumeName) + volumeName = volume.VolumeName } volMount := api.VolumeMount{ Name: volumeName,