Skip to content

Commit

Permalink
Update to go 1.22 (#682)
Browse files Browse the repository at this point in the history
  • Loading branch information
Tim Riffer authored Mar 21, 2024
1 parent 77f813e commit 500d197
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ui-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion pkg/lib/sidecars/test/helpers/helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ var DefaultSidecarResources = v1.ResourceRequirements{
}

func NewSidecarPodBuilder() *SidecarPodFixtureBuilder {
resources := DefaultSidecarResources.DeepCopy()
return &SidecarPodFixtureBuilder{
name: "app",
namespace: "custom",
Expand All @@ -50,7 +51,7 @@ func NewSidecarPodBuilder() *SidecarPodFixtureBuilder {
conditionStatus: "True",
hostNetwork: false,
ownerReference: metav1.OwnerReference{Kind: "ReplicaSet"},
resources: DefaultSidecarResources,
resources: *resources,
}
}

Expand Down

0 comments on commit 500d197

Please sign in to comment.