Skip to content

Commit 2a3020e

Browse files
authored
Merge pull request #14 from cloudscale-ch/denis/go1.22
Update Go to 1.22
2 parents c73f6bb + 4fda8ab commit 2a3020e

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

.github/workflows/ccm-integration-tests.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,21 @@ permissions:
1919
contents: read
2020

2121
env:
22-
GO_VERSION: 1.21
22+
GO_VERSION: 1.22
2323

2424
jobs:
2525
lint:
2626
name: "Run Linters"
2727
runs-on: ubuntu-latest
2828

2929
steps:
30-
- uses: actions/checkout@v3
31-
- uses: actions/setup-go@v4
30+
- uses: actions/checkout@v4
31+
- uses: actions/setup-go@v5
3232
with:
3333
go-version: '${{ env.GO_VERSION }}'
3434

3535
- name: Restore cache
36-
uses: actions/cache/restore@v3
36+
uses: actions/cache/restore@v4
3737
with:
3838
path: |
3939
~/.cache/golangci-lint
@@ -50,7 +50,7 @@ jobs:
5050
run: make lint
5151

5252
- name: Save cache
53-
uses: actions/cache/save@v3
53+
uses: actions/cache/save@v4
5454
with:
5555
path: |
5656
~/.cache/golangci-lint
@@ -62,8 +62,8 @@ jobs:
6262
runs-on: ubuntu-latest
6363

6464
steps:
65-
- uses: actions/checkout@v3
66-
- uses: actions/setup-go@v4
65+
- uses: actions/checkout@v4
66+
- uses: actions/setup-go@v5
6767
with:
6868
go-version: '${{ env.GO_VERSION }}'
6969

@@ -75,7 +75,7 @@ jobs:
7575
runs-on: ubuntu-latest
7676

7777
steps:
78-
- uses: actions/checkout@v3
78+
- uses: actions/checkout@v4
7979

8080
- name: "Generate Test Matrix"
8181
id: list
@@ -89,7 +89,7 @@ jobs:
8989
runs-on: ubuntu-latest
9090

9191
steps:
92-
- uses: actions/checkout@v3
92+
- uses: actions/checkout@v4
9393

9494
- name: Evaluate image name
9595
run: 'helpers/image-from-ref >> $GITHUB_ENV'
@@ -145,7 +145,7 @@ jobs:
145145
group: integration-${{ matrix.kubernetes }}
146146

147147
steps:
148-
- uses: actions/checkout@v3
148+
- uses: actions/checkout@v4
149149

150150
- name: Load image
151151
uses: actions/download-artifact@v4
@@ -155,7 +155,7 @@ jobs:
155155
- name: Validate hash
156156
run: 'shasum --check image.tar.sha256'
157157

158-
- uses: actions/setup-go@v4
158+
- uses: actions/setup-go@v5
159159
with:
160160
go-version: '${{ env.GO_VERSION }}'
161161

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.21-alpine AS build
1+
FROM golang:1.22-alpine AS build
22
ARG VERSION
33

44
RUN apk add --no-cache git

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/cloudscale-ch/cloudscale-cloud-controller-manager
22

3-
go 1.21
3+
go 1.22
44

55
// https://github.com/kubernetes/apiserver/issues/97
66
replace github.com/google/cel-go => github.com/google/cel-go v0.17.7
@@ -18,6 +18,7 @@ require (
1818
github.com/cloudscale-ch/cloudscale-go-sdk/v4 v4.0.0
1919
github.com/google/uuid v1.5.0
2020
github.com/stretchr/testify v1.8.4
21+
golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc
2122
k8s.io/client-go v0.29.0
2223
)
2324

@@ -85,7 +86,6 @@ require (
8586
go.uber.org/multierr v1.11.0 // indirect
8687
go.uber.org/zap v1.26.0 // indirect
8788
golang.org/x/crypto v0.17.0 // indirect
88-
golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc // indirect
8989
golang.org/x/net v0.19.0 // indirect
9090
golang.org/x/sync v0.6.0 // indirect
9191
golang.org/x/sys v0.16.0 // indirect

0 commit comments

Comments
 (0)