Skip to content

Commit 9004291

Browse files
authored
Merge pull request #191 from spotahome/slok/k8s131
Update To Kubernetes v1.31
2 parents 540d815 + 05c581d commit 9004291

File tree

16 files changed

+245
-353
lines changed

16 files changed

+245
-353
lines changed

.github/workflows/ci.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
name: Check
88
runs-on: ubuntu-latest
99
# Execute the checks inside the container instead the VM.
10-
container: golangci/golangci-lint:v1.57.2-alpine
10+
container: golangci/golangci-lint:v1.60.3-alpine
1111
steps:
1212
- uses: actions/checkout@v4
1313
- run: |
@@ -32,16 +32,15 @@ jobs:
3232
needs: [check, unit-test]
3333
strategy:
3434
matrix:
35-
kubernetes:
36-
[1.23.17, 1.24.17, 1.25.16, 1.26.14, 1.27.11, 1.28.7, 1.29.2]
35+
kubernetes: [1.26.15, 1.27.16, 1.28.13, 1.29.8, 1.30.4, 1.31.0]
3736
steps:
3837
- uses: actions/checkout@v4
3938
- uses: actions/setup-go@v5
4039
with:
4140
go-version-file: go.mod
4241
- name: Execute tests
4342
env:
44-
KIND_VERSION: v0.22.0
43+
KIND_VERSION: v0.24.0
4544
run: |
4645
# Get dependencies.
4746
echo "Getting dependencies..."

controller/controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ func New(cfg *Config) (Controller, error) {
141141
// Create the queue that will have our received job changes.
142142
queue := newRateLimitingBlockingQueue(
143143
cfg.ProcessingJobRetries,
144-
workqueue.NewRateLimitingQueue(workqueue.DefaultControllerRateLimiter()),
144+
workqueue.NewTypedRateLimitingQueue(workqueue.DefaultTypedControllerRateLimiter[any]()),
145145
)
146146

147147
// Measure the queue.

controller/controllermock/handler.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

controller/queue.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ var (
3737

3838
type rateLimitingBlockingQueue struct {
3939
maxRetries int
40-
queue workqueue.RateLimitingInterface
40+
queue workqueue.TypedRateLimitingInterface[any]
4141
}
4242

43-
func newRateLimitingBlockingQueue(maxRetries int, queue workqueue.RateLimitingInterface) blockingQueue {
43+
func newRateLimitingBlockingQueue(maxRetries int, queue workqueue.TypedRateLimitingInterface[any]) blockingQueue {
4444
return rateLimitingBlockingQueue{
4545
maxRetries: maxRetries,
4646
queue: queue,

docker/dev/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
FROM golang:1.22
1+
FROM golang:1.23
22

3-
ARG GOLANGCI_LINT_VERSION="1.57.2"
4-
ARG MOCKERY_VERSION="2.42.1"
3+
ARG GOLANGCI_LINT_VERSION="1.60.3"
4+
ARG MOCKERY_VERSION="2.45.0"
55
ARG ostype=Linux
66

77
RUN apt-get update && apt-get install -y \

examples/pod-terminator-operator/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
IMAGE_GEN=ghcr.io/slok/kube-code-generator:v0.1.0
2+
IMAGE_GEN=ghcr.io/slok/kube-code-generator:v0.3.1
33

44
default: generate
55

examples/pod-terminator-operator/client/k8s/clientset/versioned/fake/clientset_generated.go

Lines changed: 5 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/pod-terminator-operator/client/k8s/clientset/versioned/typed/chaos/v1alpha1/fake/fake_podterminator.go

Lines changed: 17 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/pod-terminator-operator/client/k8s/clientset/versioned/typed/chaos/v1alpha1/podterminator.go

Lines changed: 9 additions & 110 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/pod-terminator-operator/client/k8s/informers/externalversions/factory.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)