Skip to content

Commit b95ca3a

Browse files
author
Craig Ingram
authored
Updating PDB from v1beta to v1 (#73)
* Updated PDB to use the v1 policy Updated Go dependencies Updated kind versions used for testing on PR Signed-off-by: Craig Ingram <[email protected]> * Had to update to Go 1.19 for dependencies Signed-off-by: Craig Ingram <[email protected]> * Fixed deprecated `io/ioutil` references Ran `make fmt` Signed-off-by: Craig Ingram <[email protected]> Signed-off-by: Craig Ingram <[email protected]>
1 parent a5b3517 commit b95ca3a

19 files changed

+164
-631
lines changed

‎.github/workflows/pull_request.yml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- main
77

88
env:
9-
GO_VERSION: 1.17
9+
GO_VERSION: 1.19
1010
HELM_VERSION: v3.6.3
1111
PYTHON_VERSION: 3.7 # required for helm tester
1212

@@ -136,16 +136,18 @@ jobs:
136136
strategy:
137137
fail-fast: false
138138
matrix:
139-
kubernetes-version: ["1.24", "1.23", "1.22", "1.21"] #, "1.20", "1.19", "1.18"]
139+
kubernetes-version: ["1.25", "1.24", "1.23", "1.22"]
140140
include:
141+
- kubernetes-version: "1.25"
142+
kind-node: kindest/node:v1.25.3@sha256:f52781bc0d7a19fb6c405c2af83abfeb311f130707a0e219175677e366cc45d1
141143
- kubernetes-version: "1.24"
142-
kind-node: kindest/node:v1.24.0@sha256:0866296e693efe1fed79d5e6c7af8df71fc73ae45e3679af05342239cdc5bc8e
144+
kind-node: kindest/node:v1.24.7@sha256:577c630ce8e509131eab1aea12c022190978dd2f745aac5eb1fe65c0807eb315
143145
- kubernetes-version: "1.23"
144-
kind-node: kindest/node:v1.23.6@sha256:b1fa224cc6c7ff32455e0b1fd9cbfd3d3bc87ecaa8fcb06961ed1afb3db0f9ae
146+
kind-node: kindest/node:v1.23.13@sha256:ef453bb7c79f0e3caba88d2067d4196f427794086a7d0df8df4f019d5e336b61
145147
- kubernetes-version: "1.22"
146-
kind-node: kindest/node:v1.22.9@sha256:8135260b959dfe320206eb36b3aeda9cffcb262f4b44cda6b33f7bb73f453105
147-
- kubernetes-version: "1.21"
148-
kind-node: kindest/node:v1.21.1@sha256:69860bda5563ac81e3c0057d654b5253219618a22ec3a346306239bba8cfa1a6
148+
kind-node: kindest/node:v1.22.15@sha256:7d9708c4b0873f0fe2e171e2b1b7f45ae89482617778c1c875f1053d4cef2e41
149+
# - kubernetes-version: "1.21"
150+
# kind-node: kindest/node:v1.21.1@sha256:69860bda5563ac81e3c0057d654b5253219618a22ec3a346306239bba8cfa1a6
149151
# - kubernetes-version: "1.20"
150152
# kind-node: kindest/node:v1.20.15@sha256:6f2d011dffe182bad80b85f6c00e8ca9d86b5b8922cdf433d53575c4c5212248
151153
# - kubernetes-version: "1.19"

‎.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- published
77

88
env:
9-
GO_VERSION: 1.17
9+
GO_VERSION: 1.19
1010
HELM_VERSION: v3.6.3
1111
REDIS_VERSION: 6.2.7
1212
CRD_PATH: charts/operator-for-redis/crds/db.ibm.com_redisclusters.yaml

‎Dockerfile.metrics

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG BUILDIMAGE=golang:1.17-bullseye
1+
ARG BUILDIMAGE=golang:1.19-bullseye
22
ARG BASEIMAGE=debian:bullseye-slim
33
ARG DOCKER_PROXY_REGISTRY
44

‎Dockerfile.node

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ARG REDIS_VERSION=6.2.7
2-
ARG BUILDIMAGE=golang:1.17-bullseye
2+
ARG BUILDIMAGE=golang:1.19-bullseye
33
ARG BASEIMAGE=redis:${REDIS_VERSION}-bullseye
44
ARG DOCKER_PROXY_REGISTRY
55

‎Dockerfile.operator

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG BUILDIMAGE=golang:1.17-bullseye
1+
ARG BUILDIMAGE=golang:1.19-bullseye
22
ARG BASEIMAGE=debian:bullseye-slim
33
ARG DOCKER_PROXY_REGISTRY
44

‎api/v1alpha1/groupversion_info.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ limitations under the License.
1515
*/
1616

1717
// Package v1alpha1 contains API Schema definitions for the db v1alpha1 API group
18-
//+kubebuilder:object:generate=true
19-
//+groupName=db.ibm.com
18+
// +kubebuilder:object:generate=true
19+
// +groupName=db.ibm.com
2020
package v1alpha1
2121

2222
import (

‎go.mod

Lines changed: 42 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,92 +1,94 @@
11
module github.com/IBM/operator-for-redis-cluster
22

3-
go 1.17
3+
go 1.19
44

55
require (
6-
github.com/caarlos0/env/v6 v6.9.3
6+
github.com/caarlos0/env/v6 v6.10.1
77
github.com/gogo/protobuf v1.3.2
88
github.com/golang/glog v1.0.0
99
github.com/heptiolabs/healthcheck v0.0.0-20211123025425-613501dd5deb
10-
github.com/mediocregopher/radix/v4 v4.1.0
10+
github.com/mediocregopher/radix/v4 v4.1.1
1111
github.com/olekukonko/tablewriter v0.0.5
1212
github.com/onsi/ginkgo v1.16.5
13-
github.com/onsi/gomega v1.19.0
14-
github.com/prometheus/client_golang v1.12.2
13+
github.com/onsi/gomega v1.24.1
14+
github.com/prometheus/client_golang v1.14.0
1515
github.com/spf13/pflag v1.0.5
1616
gopkg.in/yaml.v3 v3.0.1
17-
k8s.io/api v0.24.2
18-
k8s.io/apimachinery v0.24.2
19-
k8s.io/client-go v0.24.2
20-
sigs.k8s.io/controller-runtime v0.12.3
17+
k8s.io/api v0.25.4
18+
k8s.io/apimachinery v0.25.4
19+
k8s.io/client-go v0.25.4
20+
sigs.k8s.io/controller-runtime v0.13.1
2121
)
2222

2323
require (
24-
cloud.google.com/go/compute v1.7.0 // indirect
24+
cloud.google.com/go/compute v1.12.1 // indirect
25+
cloud.google.com/go/compute/metadata v0.2.1 // indirect
2526
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
26-
github.com/Azure/go-autorest/autorest v0.11.27 // indirect
27-
github.com/Azure/go-autorest/autorest/adal v0.9.20 // indirect
27+
github.com/Azure/go-autorest/autorest v0.11.28 // indirect
28+
github.com/Azure/go-autorest/autorest/adal v0.9.21 // indirect
2829
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
2930
github.com/Azure/go-autorest/logger v0.2.1 // indirect
3031
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
3132
github.com/beorn7/perks v1.0.1 // indirect
3233
github.com/cespare/xxhash/v2 v2.1.2 // indirect
3334
github.com/davecgh/go-spew v1.1.1 // indirect
34-
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
35+
github.com/emicklei/go-restful/v3 v3.10.0 // indirect
3536
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
36-
github.com/fsnotify/fsnotify v1.5.4 // indirect
37+
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
38+
github.com/fsnotify/fsnotify v1.6.0 // indirect
3739
github.com/go-logr/logr v1.2.3 // indirect
3840
github.com/go-logr/zapr v1.2.3 // indirect
3941
github.com/go-openapi/jsonpointer v0.19.5 // indirect
4042
github.com/go-openapi/jsonreference v0.20.0 // indirect
41-
github.com/go-openapi/swag v0.21.1 // indirect
43+
github.com/go-openapi/swag v0.22.3 // indirect
4244
github.com/golang-jwt/jwt/v4 v4.4.2 // indirect
4345
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
4446
github.com/golang/protobuf v1.5.2 // indirect
4547
github.com/google/gnostic v0.6.9 // indirect
46-
github.com/google/go-cmp v0.5.8 // indirect
48+
github.com/google/go-cmp v0.5.9 // indirect
4749
github.com/google/gofuzz v1.2.0 // indirect
4850
github.com/google/uuid v1.3.0 // indirect
4951
github.com/imdario/mergo v0.3.13 // indirect
5052
github.com/josharian/intern v1.0.0 // indirect
5153
github.com/json-iterator/go v1.1.12 // indirect
54+
github.com/kr/pretty v0.2.1 // indirect
5255
github.com/mailru/easyjson v0.7.7 // indirect
53-
github.com/mattn/go-runewidth v0.0.13 // indirect
54-
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
56+
github.com/mattn/go-runewidth v0.0.14 // indirect
57+
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
5558
github.com/moby/spdystream v0.2.0 // indirect
5659
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5760
github.com/modern-go/reflect2 v1.0.2 // indirect
5861
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
5962
github.com/nxadm/tail v1.4.8 // indirect
6063
github.com/pkg/errors v0.9.1 // indirect
61-
github.com/prometheus/client_model v0.2.0 // indirect
62-
github.com/prometheus/common v0.36.0 // indirect
63-
github.com/prometheus/procfs v0.7.3 // indirect
64-
github.com/rivo/uniseg v0.2.0 // indirect
64+
github.com/prometheus/client_model v0.3.0 // indirect
65+
github.com/prometheus/common v0.37.0 // indirect
66+
github.com/prometheus/procfs v0.8.0 // indirect
67+
github.com/rivo/uniseg v0.4.3 // indirect
6568
github.com/tilinna/clock v1.1.0 // indirect
66-
go.uber.org/atomic v1.9.0 // indirect
69+
go.uber.org/atomic v1.10.0 // indirect
6770
go.uber.org/multierr v1.8.0 // indirect
68-
go.uber.org/zap v1.21.0 // indirect
69-
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d // indirect
70-
golang.org/x/net v0.0.0-20220708220712-1185a9018129 // indirect
71-
golang.org/x/oauth2 v0.0.0-20220630143837-2104d58473e0 // indirect
72-
golang.org/x/sys v0.0.0-20220712014510-0a85c31ab51e // indirect
73-
golang.org/x/term v0.0.0-20220526004731-065cf7ba2467 // indirect
74-
golang.org/x/text v0.3.7 // indirect
75-
golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
71+
go.uber.org/zap v1.23.0 // indirect
72+
golang.org/x/crypto v0.2.0 // indirect
73+
golang.org/x/net v0.2.0 // indirect
74+
golang.org/x/oauth2 v0.2.0 // indirect
75+
golang.org/x/sys v0.2.0 // indirect
76+
golang.org/x/term v0.2.0 // indirect
77+
golang.org/x/text v0.4.0 // indirect
78+
golang.org/x/time v0.2.0 // indirect
7679
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
7780
google.golang.org/appengine v1.6.7 // indirect
78-
google.golang.org/protobuf v1.28.0 // indirect
81+
google.golang.org/protobuf v1.28.1 // indirect
7982
gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0 // indirect
80-
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
8183
gopkg.in/inf.v0 v0.9.1 // indirect
8284
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
8385
gopkg.in/yaml.v2 v2.4.0 // indirect
84-
k8s.io/apiextensions-apiserver v0.24.2 // indirect
85-
k8s.io/component-base v0.24.2 // indirect
86-
k8s.io/klog/v2 v2.70.1 // indirect
87-
k8s.io/kube-openapi v0.0.0-20220627174259-011e075b9cb8 // indirect
88-
k8s.io/utils v0.0.0-20220706174534-f6158b442e7c // indirect
89-
sigs.k8s.io/json v0.0.0-20220525155127-227cbc7cc124 // indirect
90-
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
86+
k8s.io/apiextensions-apiserver v0.25.4 // indirect
87+
k8s.io/component-base v0.25.4 // indirect
88+
k8s.io/klog/v2 v2.80.1 // indirect
89+
k8s.io/kube-openapi v0.0.0-20221110221610-a28e98eb7c70 // indirect
90+
k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2 // indirect
91+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
92+
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
9193
sigs.k8s.io/yaml v1.3.0 // indirect
9294
)

0 commit comments

Comments
 (0)