Skip to content

Commit

Permalink
Drop Kuberenetes v1.21 and introduce Kubernetes v1.24 (#1953)
Browse files Browse the repository at this point in the history
Signed-off-by: tenzen-y <yuki.iwai.tz@gmail.com>

Signed-off-by: tenzen-y <yuki.iwai.tz@gmail.com>
  • Loading branch information
tenzen-y committed Sep 17, 2022
1 parent b1e912c commit e02eb6e
Show file tree
Hide file tree
Showing 14 changed files with 96 additions and 85 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/darts-cifar10-e2e-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,7 @@ jobs:
strategy:
fail-fast: false
matrix:
# TODO (tenzen-y): We need to consider running tests on more kubernetes versions.
# kubernetes-version: ["v1.20.15", "v1.21.13", "v1.22.10", "v1.23.7", "v1.24.1"]
kubernetes-version: ["v1.21.13", "v1.22.10", "v1.23.7"]
kubernetes-version: ["v1.22.14", "v1.23.11", "1.24.5"]
# Comma Delimited
experiments: ["darts-cpu"]
database-type: ["mysql", "postgres"]
4 changes: 1 addition & 3 deletions .github/workflows/enas-cifar10-e2e-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,7 @@ jobs:
strategy:
fail-fast: false
matrix:
# TODO (tenzen-y): We need to consider running tests on more kubernetes versions.
# kubernetes-version: ["v1.20.15", "v1.21.13", "v1.22.10", "v1.23.7", "v1.24.1"]
kubernetes-version: ["v1.21.13", "v1.22.10", "v1.23.7"]
kubernetes-version: ["v1.22.14", "v1.23.11", "1.24.5"]
# Comma Delimited
experiments: ["enas-cpu"]
database-type: ["mysql", "postgres"]
4 changes: 1 addition & 3 deletions .github/workflows/katib-ui-e2e-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,4 @@ jobs:
strategy:
fail-fast: false
matrix:
# TODO (tenzen-y): We need to consider running tests on more kubernetes versions.
# kubernetes-version: ["v1.20.15", "v1.21.13", "v1.22.10", "v1.23.7", "v1.24.1"]
kubernetes-version: ["v1.21.13", "v1.22.10", "v1.23.7"]
kubernetes-version: ["v1.22.14", "v1.23.11", "1.24.5"]
4 changes: 1 addition & 3 deletions .github/workflows/mxnet-mnist-e2e-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,7 @@ jobs:
strategy:
fail-fast: false
matrix:
# TODO (tenzen-y): We need to consider running tests on more kubernetes versions.
# kubernetes-version: ["v1.20.15", "v1.21.13", "v1.22.10", "v1.23.7", "v1.24.1"]
kubernetes-version: ["v1.21.13", "v1.22.10", "v1.23.7"]
kubernetes-version: ["v1.22.14", "v1.23.11", "1.24.5"]
# Comma Delimited
experiments:
# suggestion-hyperopt
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/pytorch-mnist-e2e-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,7 @@ jobs:
strategy:
fail-fast: false
matrix:
# TODO (tenzen-y): We need to consider running tests on more kubernetes versions.
# kubernetes-version: ["v1.20.15", "v1.21.13", "v1.22.10", "v1.23.7", "v1.24.1"]
kubernetes-version: ["v1.21.13", "v1.22.10", "v1.23.7"]
kubernetes-version: ["v1.22.14", "v1.23.11", "1.24.5"]
# Comma Delimited
experiments:
- "file-metrics-collector,pytorchjob-mnist"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-go.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,4 @@ jobs:
fail-fast: false
matrix:
# Detail: `setup-envtest list --arch amd64`
kubernetes-version: ["1.21.4", "1.22.1", "1.23.5"]
kubernetes-version: ["1.22.1", "1.23.5", "1.24.2"]
4 changes: 1 addition & 3 deletions .github/workflows/tf-mnist-with-summaries-e2e-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,7 @@ jobs:
strategy:
fail-fast: false
matrix:
# TODO (tenzen-y): We need to consider running tests on more kubernetes versions.
# kubernetes-version: ["v1.20.15", "v1.21.13", "v1.22.10", "v1.23.7", "v1.24.1"]
kubernetes-version: ["v1.21.13", "v1.22.10", "v1.23.7"]
kubernetes-version: ["v1.22.14", "v1.23.11", "1.24.5"]
# Comma Delimited
experiments: ["tfjob-mnist-with-summaries"]
database-type: ["mysql", "postgres"]
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ HAS_SETUP_ENVTEST := $(shell command -v setup-envtest;)
COMMIT := v1beta1-$(shell git rev-parse --short=7 HEAD)
KATIB_REGISTRY := docker.io/kubeflowkatib
CPU_ARCH ?= amd64
ENVTEST_K8S_VERSION ?= 1.23
ENVTEST_K8S_VERSION ?= 1.24

# for pytest
PYTHONPATH := $(PYTHONPATH):$(CURDIR)/pkg/apis/manager/v1beta1/python:$(CURDIR)/pkg/apis/manager/health/python
Expand All @@ -20,7 +20,7 @@ test: envtest

envtest:
ifndef HAS_SETUP_ENVTEST
go install sigs.k8s.io/controller-runtime/tools/setup-envtest@bf71fc56485f6bf03e95ef6b0233ff36c695d4c9 # v0.11.2
go install sigs.k8s.io/controller-runtime/tools/setup-envtest@c7a98aa706379c4e5c79ea675c7f333192677971 # v0.12.3
@echo "setup-envtest has been installed"
endif
@echo "setup-envtest has already installed"
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,8 @@ Follow the next steps to install Katib standalone.

This is the minimal requirements to install Katib:

- Kubernetes >= 1.21
- `kubectl` >= 1.21
- Kubernetes >= 1.22
- `kubectl` >= 1.22

## Latest Version

Expand Down
4 changes: 2 additions & 2 deletions examples/v1beta1/kind-cluster/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ require any public or private cloud to run Katib Experiments.
Install the following tools to run the example:

- [Docker](https://docs.docker.com/get-docker) >= 20.10
- [Kind](https://kind.sigs.k8s.io/docs/user/quick-start/#installation) >= 0.11
- [`kubectl`](https://kubernetes.io/docs/tasks/tools/#kubectl) >= 1.21
- [Kind](https://kind.sigs.k8s.io/docs/user/quick-start/#installation) >= 0.13
- [`kubectl`](https://kubernetes.io/docs/tasks/tools/#kubectl) >= 1.22

## Installation

Expand Down
4 changes: 2 additions & 2 deletions examples/v1beta1/kind-cluster/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ if [ -z "$(command -v kubectl)" ]; then
exit 1
fi

# Step 1. Create Kind cluster with Kubernetes v1.23.6
kind create cluster --image kindest/node:v1.23.6
# Step 1. Create Kind cluster with Kubernetes v1.24.4
kind create cluster --image kindest/node:v1.24.4
echo -e "\nKind cluster has been created\n"

# Step 2. Set context for kubectl
Expand Down
37 changes: 19 additions & 18 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,21 @@ require (
github.com/hpcloud/tail v1.0.1-0.20180514194441-a1dbeea552b7
github.com/lib/pq v1.10.6
github.com/mattbaird/jsonpatch v0.0.0-20171005235357-81af80346b1a
github.com/onsi/gomega v1.17.0
github.com/prometheus/client_golang v1.11.0
github.com/onsi/gomega v1.18.1
github.com/prometheus/client_golang v1.12.1
github.com/shirou/gopsutil/v3 v3.22.5
github.com/spf13/cobra v1.4.0
github.com/spf13/viper v1.9.0
github.com/tidwall/gjson v1.14.1
golang.org/x/net v0.0.0-20220516155154-20f960328961
google.golang.org/grpc v1.47.0
k8s.io/api v0.23.5
k8s.io/apimachinery v0.23.5
k8s.io/client-go v0.23.5
k8s.io/code-generator v0.23.5
k8s.io/api v0.24.5
k8s.io/apimachinery v0.24.5
k8s.io/client-go v0.24.5
k8s.io/code-generator v0.24.5
k8s.io/klog v1.0.0
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65
sigs.k8s.io/controller-runtime v0.11.2
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42
sigs.k8s.io/controller-runtime v0.12.3
)

require (
Expand All @@ -48,7 +48,7 @@ require (
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
github.com/aws/aws-sdk-go v1.36.30 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.1.1 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/docker/cli v20.10.16+incompatible // indirect
github.com/docker/distribution v2.8.1+incompatible // indirect
Expand All @@ -66,10 +66,10 @@ require (
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang-jwt/jwt/v4 v4.2.0 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/google/gnostic v0.5.7-v3refs // 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/googleapis/gnostic v0.5.5 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
Expand All @@ -84,14 +84,15 @@ require (
github.com/mitchellh/mapstructure v1.4.2 // 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/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.0.3-0.20220114050600-8b9d41f48198 // indirect
github.com/pelletier/go-toml v1.9.4 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.28.0 // indirect
github.com/prometheus/procfs v0.6.0 // indirect
github.com/prometheus/common v0.32.1 // indirect
github.com/prometheus/procfs v0.7.3 // indirect
github.com/sirupsen/logrus v1.8.1 // indirect
github.com/spf13/afero v1.6.0 // indirect
github.com/spf13/cast v1.4.1 // indirect
Expand All @@ -107,14 +108,14 @@ require (
go.uber.org/atomic v1.7.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
go.uber.org/zap v1.19.1 // indirect
golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 // indirect
golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
golang.org/x/sync v0.0.0-20220513210516-0976fa681c29 // indirect
golang.org/x/sys v0.0.0-20220513210249-45d2b4557a2a // indirect
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
golang.org/x/tools v0.1.10 // indirect
golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
Expand All @@ -129,14 +130,14 @@ require (
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.0 // indirect
gotest.tools/v3 v3.1.0 // indirect
k8s.io/apiextensions-apiserver v0.23.5 // indirect
k8s.io/apiextensions-apiserver v0.24.2 // indirect
k8s.io/cloud-provider v0.21.0 // indirect
k8s.io/component-base v0.23.5 // indirect
k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c // indirect
k8s.io/component-base v0.24.2 // indirect
k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 // indirect
k8s.io/klog/v2 v2.60.1 // indirect
k8s.io/legacy-cloud-providers v0.21.0 // indirect
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)

0 comments on commit e02eb6e

Please sign in to comment.