Skip to content

Commit

Permalink
Dependency Updates (#46)
Browse files Browse the repository at this point in the history
* Updated go version from 1.15 to 1.17
Updated all dependencies

* Missed some places that still referenced go 1.15

* Updated kind version and their respective node images
Updated k8s versions to be tested in e2e tests

Signed-off-by: Craig Ingram <cingram@us.ibm.com>

* Updated redis_exporter image version
Tested to make sure dashboards are still working too
Running performance tests right now

Signed-off-by: Craig Ingram <cingram@us.ibm.com>
  • Loading branch information
Craig Ingram authored Jul 13, 2022
1 parent 16005d0 commit 67e45df
Show file tree
Hide file tree
Showing 10 changed files with 727 additions and 311 deletions.
24 changes: 15 additions & 9 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- main

env:
GO_VERSION: 1.15
GO_VERSION: 1.17
HELM_VERSION: v3.6.3
PYTHON_VERSION: 3.7 # required for helm tester

Expand Down Expand Up @@ -136,16 +136,22 @@ jobs:
strategy:
fail-fast: false
matrix:
kubernetes-version: ["1.21", "1.20", "1.19", "1.18"]
kubernetes-version: ["1.24", "1.23", "1.22", "1.21"] #, "1.20", "1.19", "1.18"]
include:
- kubernetes-version: "1.24"
kind-node: kindest/node:v1.24.0@sha256:0866296e693efe1fed79d5e6c7af8df71fc73ae45e3679af05342239cdc5bc8e
- kubernetes-version: "1.23"
kind-node: kindest/node:v1.23.6@sha256:b1fa224cc6c7ff32455e0b1fd9cbfd3d3bc87ecaa8fcb06961ed1afb3db0f9ae
- kubernetes-version: "1.22"
kind-node: kindest/node:v1.22.9@sha256:8135260b959dfe320206eb36b3aeda9cffcb262f4b44cda6b33f7bb73f453105
- kubernetes-version: "1.21"
kind-node: kindest/node:v1.21.1@sha256:69860bda5563ac81e3c0057d654b5253219618a22ec3a346306239bba8cfa1a6
- kubernetes-version: "1.20"
kind-node: kindest/node:v1.20.7@sha256:cbeaf907fc78ac97ce7b625e4bf0de16e3ea725daf6b04f930bd14c67c671ff9
- kubernetes-version: "1.19"
kind-node: kindest/node:v1.19.11@sha256:07db187ae84b4b7de440a73886f008cf903fcf5764ba8106a9fd5243d6f32729
- kubernetes-version: "1.18"
kind-node: kindest/node:v1.18.19@sha256:7af1492e19b3192a79f606e43c35fb741e520d195f96399284515f077b3b622c
# - kubernetes-version: "1.20"
# kind-node: kindest/node:v1.20.15@sha256:6f2d011dffe182bad80b85f6c00e8ca9d86b5b8922cdf433d53575c4c5212248
# - kubernetes-version: "1.19"
# kind-node: kindest/node:v1.19.16@sha256:d9c819e8668de8d5030708e484a9fdff44d95ec4675d136ef0a0a584e587f65c
# - kubernetes-version: "1.18"
# kind-node: kindest/node:v1.18.20@sha256:738cdc23ed4be6cc0b7ea277a2ebcc454c8373d7d8fb991a7fcdbd126188e6d7
steps:
- name: Checkout
uses: actions/checkout@v3
Expand All @@ -164,7 +170,7 @@ jobs:
- name: kind create cluster
uses: helm/kind-action@v1.3.0
with:
version: v0.11.1
version: v0.14.0
config: ./test/e2e/kind_config.yml
cluster_name: kind
node_image: ${{ matrix.kind-node }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- published

env:
GO_VERSION: 1.15
GO_VERSION: 1.17
HELM_VERSION: v3.6.3
REDIS_VERSION: 6.2.6
CRD_PATH: charts/operator-for-redis/crds/db.ibm.com_redisclusters.yaml
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,4 @@ vendor
.idea
*.iml
examples
skaffold.yaml
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ PREFIX=ibmcom/
SOURCES := $(shell find . ! -name "*_test.go" -name '*.go')

CMDBINS := operator node metrics
CRD_OPTIONS ?= "crd:crdVersions=v1,trivialVersions=false,generateEmbeddedObjectMeta=true"
CRD_OPTIONS ?= "crd:crdVersions=v1,generateEmbeddedObjectMeta=true"

ifeq (,$(shell go env GOBIN))
GOBIN=$(shell go env GOPATH)/bin
Expand Down Expand Up @@ -57,7 +57,7 @@ ifeq (, $(shell which controller-gen))
CONTROLLER_GEN_TMP_DIR=$$(mktemp -d) ;\
cd $$CONTROLLER_GEN_TMP_DIR ;\
go mod init tmp ;\
go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.6.1 ;\
go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.9.2 ;\
rm -rf $$CONTROLLER_GEN_TMP_DIR ;\
}
CONTROLLER_GEN=$(GOBIN)/controller-gen
Expand Down
3 changes: 2 additions & 1 deletion api/v1alpha1/zz_generated.deepcopy.go

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

2 changes: 1 addition & 1 deletion charts/node-for-redis/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ metrics:
exporter:
image:
repository: oliver006/redis_exporter
tag: v1.32.0
tag: v1.43.0
pullPolicy: IfNotPresent
port:
name: metrics
Expand Down
2 changes: 1 addition & 1 deletion docs/docs/cookbook.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Operator for Redis Cluster is written in [Go](https://golang.org/).
### Required Dependencies

* `make`
* [Go 1.15+](https://golang.org/doc/install)
* [Go 1.17+](https://golang.org/doc/install)
* [Docker](https://www.docker.com/)
* [Helm 3](https://helm.sh)

Expand Down
96 changes: 82 additions & 14 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,24 +1,92 @@
module github.com/IBM/operator-for-redis-cluster

go 1.15
go 1.17

require (
github.com/caarlos0/env/v6 v6.5.0
github.com/caarlos0/env/v6 v6.9.3
github.com/gogo/protobuf v1.3.2
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
github.com/heptiolabs/healthcheck v0.0.0-20180807145615-6ff867650f40
github.com/mattn/go-runewidth v0.0.10 // indirect
github.com/mediocregopher/radix/v4 v4.0.0-beta.1
github.com/golang/glog v1.0.0
github.com/heptiolabs/healthcheck v0.0.0-20211123025425-613501dd5deb
github.com/mediocregopher/radix/v4 v4.1.0
github.com/olekukonko/tablewriter v0.0.5
github.com/onsi/ginkgo v1.15.0
github.com/onsi/gomega v1.10.5
github.com/prometheus/client_golang v1.9.0
github.com/onsi/ginkgo v1.16.5
github.com/onsi/gomega v1.19.0
github.com/prometheus/client_golang v1.12.2
github.com/spf13/pflag v1.0.5
gopkg.in/yaml.v3 v3.0.1
k8s.io/api v0.24.2
k8s.io/apimachinery v0.24.2
k8s.io/client-go v0.24.2
sigs.k8s.io/controller-runtime v0.12.3
)

require (
cloud.google.com/go/compute v1.7.0 // indirect
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
github.com/Azure/go-autorest/autorest v0.11.27 // indirect
github.com/Azure/go-autorest/autorest/adal v0.9.20 // indirect
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
github.com/Azure/go-autorest/logger v0.2.1 // indirect
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
github.com/fsnotify/fsnotify v1.5.4 // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-logr/zapr v1.2.3 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/jsonreference v0.20.0 // indirect
github.com/go-openapi/swag v0.21.1 // indirect
github.com/golang-jwt/jwt/v4 v4.4.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/gnostic v0.6.9 // indirect
github.com/google/go-cmp v0.5.8 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/imdario/mergo v0.3.13 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-runewidth v0.0.13 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
github.com/moby/spdystream v0.2.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/nxadm/tail v1.4.8 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.36.0 // indirect
github.com/prometheus/procfs v0.7.3 // indirect
github.com/rivo/uniseg v0.2.0 // indirect
github.com/tilinna/clock v1.1.0 // indirect
go.uber.org/atomic v1.9.0 // indirect
go.uber.org/multierr v1.8.0 // indirect
go.uber.org/zap v1.21.0 // indirect
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d // indirect
golang.org/x/net v0.0.0-20220708220712-1185a9018129 // indirect
golang.org/x/oauth2 v0.0.0-20220630143837-2104d58473e0 // indirect
golang.org/x/sys v0.0.0-20220712014510-0a85c31ab51e // indirect
golang.org/x/term v0.0.0-20220526004731-065cf7ba2467 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.28.0 // indirect
gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0 // indirect
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776
k8s.io/api v0.20.2
k8s.io/apimachinery v0.20.2
k8s.io/client-go v0.20.2
sigs.k8s.io/controller-runtime v0.8.3
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
k8s.io/apiextensions-apiserver v0.24.2 // indirect
k8s.io/component-base v0.24.2 // indirect
k8s.io/klog/v2 v2.70.1 // indirect
k8s.io/kube-openapi v0.0.0-20220627174259-011e075b9cb8 // indirect
k8s.io/utils v0.0.0-20220706174534-f6158b442e7c // indirect
sigs.k8s.io/json v0.0.0-20220525155127-227cbc7cc124 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)
Loading

0 comments on commit 67e45df

Please sign in to comment.