Skip to content

Commit

Permalink
Merge pull request #191 from spotahome/slok/k8s131
Browse files Browse the repository at this point in the history
Update To Kubernetes v1.31
  • Loading branch information
slok authored Aug 31, 2024
2 parents 540d815 + 05c581d commit 9004291
Show file tree
Hide file tree
Showing 16 changed files with 245 additions and 353 deletions.
7 changes: 3 additions & 4 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
name: Check
runs-on: ubuntu-latest
# Execute the checks inside the container instead the VM.
container: golangci/golangci-lint:v1.57.2-alpine
container: golangci/golangci-lint:v1.60.3-alpine
steps:
- uses: actions/checkout@v4
- run: |
Expand All @@ -32,16 +32,15 @@ jobs:
needs: [check, unit-test]
strategy:
matrix:
kubernetes:
[1.23.17, 1.24.17, 1.25.16, 1.26.14, 1.27.11, 1.28.7, 1.29.2]
kubernetes: [1.26.15, 1.27.16, 1.28.13, 1.29.8, 1.30.4, 1.31.0]
steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version-file: go.mod
- name: Execute tests
env:
KIND_VERSION: v0.22.0
KIND_VERSION: v0.24.0
run: |
# Get dependencies.
echo "Getting dependencies..."
Expand Down
2 changes: 1 addition & 1 deletion controller/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ func New(cfg *Config) (Controller, error) {
// Create the queue that will have our received job changes.
queue := newRateLimitingBlockingQueue(
cfg.ProcessingJobRetries,
workqueue.NewRateLimitingQueue(workqueue.DefaultControllerRateLimiter()),
workqueue.NewTypedRateLimitingQueue(workqueue.DefaultTypedControllerRateLimiter[any]()),
)

// Measure the queue.
Expand Down
2 changes: 1 addition & 1 deletion controller/controllermock/handler.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions controller/queue.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ var (

type rateLimitingBlockingQueue struct {
maxRetries int
queue workqueue.RateLimitingInterface
queue workqueue.TypedRateLimitingInterface[any]
}

func newRateLimitingBlockingQueue(maxRetries int, queue workqueue.RateLimitingInterface) blockingQueue {
func newRateLimitingBlockingQueue(maxRetries int, queue workqueue.TypedRateLimitingInterface[any]) blockingQueue {
return rateLimitingBlockingQueue{
maxRetries: maxRetries,
queue: queue,
Expand Down
6 changes: 3 additions & 3 deletions docker/dev/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM golang:1.22
FROM golang:1.23

ARG GOLANGCI_LINT_VERSION="1.57.2"
ARG MOCKERY_VERSION="2.42.1"
ARG GOLANGCI_LINT_VERSION="1.60.3"
ARG MOCKERY_VERSION="2.45.0"
ARG ostype=Linux

RUN apt-get update && apt-get install -y \
Expand Down
2 changes: 1 addition & 1 deletion examples/pod-terminator-operator/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

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

default: generate

Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 9004291

Please sign in to comment.