Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions .github/workflows/ccm-integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,21 @@ permissions:
contents: read

env:
GO_VERSION: 1.21
GO_VERSION: 1.22

jobs:
lint:
name: "Run Linters"
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v4
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: '${{ env.GO_VERSION }}'

- name: Restore cache
uses: actions/cache/restore@v3
uses: actions/cache/restore@v4
with:
path: |
~/.cache/golangci-lint
Expand All @@ -50,7 +50,7 @@ jobs:
run: make lint

- name: Save cache
uses: actions/cache/save@v3
uses: actions/cache/save@v4
with:
path: |
~/.cache/golangci-lint
Expand All @@ -62,8 +62,8 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v4
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: '${{ env.GO_VERSION }}'

Expand All @@ -75,7 +75,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: "Generate Test Matrix"
id: list
Expand All @@ -89,7 +89,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Evaluate image name
run: 'helpers/image-from-ref >> $GITHUB_ENV'
Expand Down Expand Up @@ -145,7 +145,7 @@ jobs:
group: integration-${{ matrix.kubernetes }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Load image
uses: actions/download-artifact@v4
Expand All @@ -155,7 +155,7 @@ jobs:
- name: Validate hash
run: 'shasum --check image.tar.sha256'

- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version: '${{ env.GO_VERSION }}'

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.21-alpine AS build
FROM golang:1.22-alpine AS build
ARG VERSION

RUN apk add --no-cache git
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/cloudscale-ch/cloudscale-cloud-controller-manager

go 1.21
go 1.22

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

Expand Down Expand Up @@ -85,7 +86,6 @@ require (
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.26.0 // indirect
golang.org/x/crypto v0.17.0 // indirect
golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc // indirect
golang.org/x/net v0.19.0 // indirect
golang.org/x/sync v0.6.0 // indirect
golang.org/x/sys v0.16.0 // indirect
Expand Down