From 500d197e3e145cfe3068bb8d69094cf3d202b0bc Mon Sep 17 00:00:00 2001 From: Tim Riffer Date: Thu, 21 Mar 2024 16:10:28 +0100 Subject: [PATCH] Update to go 1.22 (#682) --- .github/workflows/ui-tests.yaml | 2 +- go.mod | 2 +- pkg/lib/sidecars/test/helpers/helpers.go | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ui-tests.yaml b/.github/workflows/ui-tests.yaml index f1322f406..a91d0ff3d 100644 --- a/.github/workflows/ui-tests.yaml +++ b/.github/workflows/ui-tests.yaml @@ -29,7 +29,7 @@ jobs: fetch-depth: 0 - uses: actions/setup-go@v5 with: - go-version-file: 'go.mod' + go-version-file: "go.mod" - name: Run tests run: | sudo echo "127.0.0.1 local.kyma.dev" | sudo tee -a /etc/hosts diff --git a/go.mod b/go.mod index 06be69f47..58aea3a45 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/kyma-project/istio/operator -go 1.21 +go 1.22 // Client-go does not handle different versions of mergo due to some breaking changes - use the matching version replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.5 diff --git a/pkg/lib/sidecars/test/helpers/helpers.go b/pkg/lib/sidecars/test/helpers/helpers.go index ca338ff02..fa267cd5f 100644 --- a/pkg/lib/sidecars/test/helpers/helpers.go +++ b/pkg/lib/sidecars/test/helpers/helpers.go @@ -37,6 +37,7 @@ var DefaultSidecarResources = v1.ResourceRequirements{ } func NewSidecarPodBuilder() *SidecarPodFixtureBuilder { + resources := DefaultSidecarResources.DeepCopy() return &SidecarPodFixtureBuilder{ name: "app", namespace: "custom", @@ -50,7 +51,7 @@ func NewSidecarPodBuilder() *SidecarPodFixtureBuilder { conditionStatus: "True", hostNetwork: false, ownerReference: metav1.OwnerReference{Kind: "ReplicaSet"}, - resources: DefaultSidecarResources, + resources: *resources, } }