Skip to content

Commit bb8eed1

Browse files
authored
Merge pull request spotahome#642 from spotahome/kooper
Update kooper and kubernetes dependencies
2 parents 8974171 + ef35cf9 commit bb8eed1

File tree

10 files changed

+1647
-536
lines changed

10 files changed

+1647
-536
lines changed

.github/workflows/ci.yaml

+13-7
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,17 @@ jobs:
1010
check:
1111
name: Golang Check
1212
runs-on: ubuntu-latest
13-
# Execute the checks inside the container instead the VM.
14-
container: golangci/golangci-lint:v1.50-alpine
1513
steps:
1614
- uses: actions/checkout@v3
17-
- run: ./scripts/check.sh
15+
- uses: actions/setup-go@v4
16+
with:
17+
go-version-file: go.mod
18+
cache: false
19+
- name: golangci-lint
20+
uses: golangci/golangci-lint-action@v3
21+
with:
22+
version: v1.53
23+
args: --timeout=15m
1824

1925
unit-test:
2026
name: Unit test
@@ -23,7 +29,7 @@ jobs:
2329
- uses: actions/checkout@v3
2430
- uses: actions/setup-go@v4
2531
with:
26-
go-version: 1.19
32+
go-version-file: go.mod
2733
- run: make ci-unit-test
2834

2935
integration-test:
@@ -32,18 +38,18 @@ jobs:
3238
needs: [check, unit-test]
3339
strategy:
3440
matrix:
35-
kubernetes: [1.22.12, 1.23.9, 1.24.3]
41+
kubernetes: [1.24.16, 1.25.12, 1.26.7, 1.27.3 ]
3642
steps:
3743
- uses: actions/checkout@v3
3844
- uses: actions/setup-go@v4
3945
with:
40-
go-version: 1.19
46+
go-version-file: go.mod
4147
- name: Install conntrack
4248
run: sudo apt-get install -y conntrack
4349
- uses: medyagh/[email protected]
4450
with:
4551
kubernetes-version: ${{ matrix.kubernetes }}
46-
minikube-version: 1.28.0
52+
minikube-version: 1.31.1
4753
driver: none
4854
- name: Add redisfailover CRD
4955
run: kubectl create -f manifests/databases.spotahome.com_redisfailovers.yaml

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ endif
4040

4141

4242
PROJECT_PACKAGE := github.com/spotahome/redis-operator
43-
CODEGEN_IMAGE := quay.io/slok/kube-code-generator:v1.23.0
43+
CODEGEN_IMAGE := ghcr.io/slok/kube-code-generator:v1.27.0
4444
PORT := 9710
4545

4646
# CMDs

client/k8s/clientset/versioned/clientset.go

+5-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client/k8s/clientset/versioned/fake/register.go

+7-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client/k8s/clientset/versioned/scheme/register.go

+7-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client/k8s/clientset/versioned/typed/redisfailover/v1/fake/fake_redisfailover.go

+25-26
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

go.mod

+19-20
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
module github.com/spotahome/redis-operator
22

3-
go 1.19
3+
go 1.20
44

55
require (
66
github.com/go-redis/redis/v8 v8.11.5
7-
github.com/prometheus/client_golang v1.15.0
7+
github.com/prometheus/client_golang v1.16.0
88
github.com/sirupsen/logrus v1.9.3
9-
github.com/spotahome/kooper/v2 v2.3.0
9+
github.com/spotahome/kooper/v2 v2.4.0
1010
github.com/stretchr/testify v1.8.4
11-
k8s.io/api v0.25.3
11+
k8s.io/api v0.27.3
1212
k8s.io/apiextensions-apiserver v0.24.4
13-
k8s.io/apimachinery v0.25.3
14-
k8s.io/client-go v0.25.3
13+
k8s.io/apimachinery v0.27.3
14+
k8s.io/client-go v0.27.3
1515
)
1616

1717
require (
@@ -22,9 +22,9 @@ require (
2222
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
2323
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
2424
github.com/go-logr/logr v1.2.3 // indirect
25-
github.com/go-openapi/jsonpointer v0.19.5 // indirect
26-
github.com/go-openapi/jsonreference v0.20.0 // indirect
27-
github.com/go-openapi/swag v0.19.14 // indirect
25+
github.com/go-openapi/jsonpointer v0.19.6 // indirect
26+
github.com/go-openapi/jsonreference v0.20.1 // indirect
27+
github.com/go-openapi/swag v0.22.3 // indirect
2828
github.com/gogo/protobuf v1.3.2 // indirect
2929
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
3030
github.com/golang/protobuf v1.5.3 // indirect
@@ -35,7 +35,7 @@ require (
3535
github.com/imdario/mergo v0.3.12 // indirect
3636
github.com/josharian/intern v1.0.0 // indirect
3737
github.com/json-iterator/go v1.1.12 // indirect
38-
github.com/mailru/easyjson v0.7.6 // indirect
38+
github.com/mailru/easyjson v0.7.7 // indirect
3939
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
4040
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4141
github.com/modern-go/reflect2 v1.0.2 // indirect
@@ -44,25 +44,24 @@ require (
4444
github.com/pmezard/go-difflib v1.0.0 // indirect
4545
github.com/prometheus/client_model v0.3.0 // indirect
4646
github.com/prometheus/common v0.42.0 // indirect
47-
github.com/prometheus/procfs v0.9.0 // indirect
48-
github.com/rogpeppe/go-internal v1.10.0 // indirect
47+
github.com/prometheus/procfs v0.10.1 // indirect
4948
github.com/spf13/pflag v1.0.5 // indirect
5049
github.com/stretchr/objx v0.5.0 // indirect
51-
golang.org/x/net v0.7.0 // indirect
50+
golang.org/x/net v0.8.0 // indirect
5251
golang.org/x/oauth2 v0.5.0 // indirect
53-
golang.org/x/sys v0.6.0 // indirect
54-
golang.org/x/term v0.5.0 // indirect
55-
golang.org/x/text v0.7.0 // indirect
52+
golang.org/x/sys v0.8.0 // indirect
53+
golang.org/x/term v0.6.0 // indirect
54+
golang.org/x/text v0.8.0 // indirect
5655
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
5756
google.golang.org/appengine v1.6.7 // indirect
5857
google.golang.org/protobuf v1.30.0 // indirect
5958
gopkg.in/inf.v0 v0.9.1 // indirect
6059
gopkg.in/yaml.v2 v2.4.0 // indirect
6160
gopkg.in/yaml.v3 v3.0.1 // indirect
62-
k8s.io/klog/v2 v2.80.1 // indirect
63-
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
64-
k8s.io/utils v0.0.0-20221107191617-1a15be271d1d // indirect
65-
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
61+
k8s.io/klog/v2 v2.90.1 // indirect
62+
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
63+
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
64+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
6665
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
6766
sigs.k8s.io/yaml v1.3.0 // indirect
6867
)

0 commit comments

Comments
 (0)