Skip to content

Commit 47623d5

Browse files
committed
Revert "Support for k8s v1.25 in CI"
This reverts commit 16e6fe4.
1 parent 16e6fe4 commit 47623d5

10 files changed

+160
-97
lines changed

.github/workflows/darts-cifar10-e2e-test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
strategy:
3030
fail-fast: false
3131
matrix:
32-
kubernetes-version: ["v1.23.12", "v1.24.6", "v1.25.2"]
32+
kubernetes-version: ["v1.22.14", "v1.23.11", "1.24.5"]
3333
# Comma Delimited
3434
experiments: ["darts-cpu"]
3535
database-type: ["mysql", "postgres"]

.github/workflows/enas-cifar10-e2e-test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
strategy:
3030
fail-fast: false
3131
matrix:
32-
kubernetes-version: ["v1.23.12", "v1.24.6", "v1.25.2"]
32+
kubernetes-version: ["v1.22.14", "v1.23.11", "1.24.5"]
3333
# Comma Delimited
3434
experiments: ["enas-cpu"]
3535
database-type: ["mysql", "postgres"]

.github/workflows/katib-ui-e2e-test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ jobs:
2727
strategy:
2828
fail-fast: false
2929
matrix:
30-
kubernetes-version: ["v1.23.12", "v1.24.6", "v1.25.2"]
30+
kubernetes-version: ["v1.22.14", "v1.23.11", "1.24.5"]

.github/workflows/mxnet-mnist-e2e-test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
strategy:
3030
fail-fast: false
3131
matrix:
32-
kubernetes-version: ["v1.23.12", "v1.24.6", "v1.25.2"]
32+
kubernetes-version: ["v1.22.14", "v1.23.11", "1.24.5"]
3333
# Comma Delimited
3434
experiments:
3535
# suggestion-hyperopt

.github/workflows/pytorch-mnist-e2e-test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
strategy:
3131
fail-fast: false
3232
matrix:
33-
kubernetes-version: ["v1.23.12", "v1.24.6", "v1.25.2"]
33+
kubernetes-version: ["v1.22.14", "v1.23.11", "1.24.5"]
3434
# Comma Delimited
3535
experiments:
3636
- "file-metrics-collector,pytorchjob-mnist"

.github/workflows/simple-pbt-e2e-test.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ jobs:
3030
fail-fast: false
3131
matrix:
3232
# Detail: https://hub.docker.com/r/kindest/node
33-
kubernetes-version: ["v1.23.12", "v1.24.6", "v1.25.2"]
33+
# TODO (tenzen-y): We need to consider running tests on more kubernetes versions.
34+
# kubernetes-version: ["v1.20.15", "v1.21.12", "v1.22.9", "v1.23.6", "v1.24.1"]
35+
kubernetes-version: ["v1.21.12", "v1.22.9", "v1.23.6"]
3436
# Comma Delimited
3537
experiments: ["simple-pbt"]
3638
database-type: ["mysql", "postgres"]

.github/workflows/test-go.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,4 +70,4 @@ jobs:
7070
fail-fast: false
7171
matrix:
7272
# Detail: `setup-envtest list --arch amd64`
73-
kubernetes-version: ["1.23.5", "1.24.2", "1.25.0"]
73+
kubernetes-version: ["1.22.1", "1.23.5", "1.24.2"]

.github/workflows/tf-mnist-with-summaries-e2e-test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
strategy:
3131
fail-fast: false
3232
matrix:
33-
kubernetes-version: ["v1.23.12", "v1.24.6", "v1.25.2"]
33+
kubernetes-version: ["v1.22.14", "v1.23.11", "1.24.5"]
3434
# Comma Delimited
3535
experiments: ["tfjob-mnist-with-summaries"]
3636
database-type: ["mysql", "postgres"]

go.mod

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,21 @@ require (
1616
github.com/hpcloud/tail v1.0.1-0.20180514194441-a1dbeea552b7
1717
github.com/lib/pq v1.10.6
1818
github.com/mattbaird/jsonpatch v0.0.0-20171005235357-81af80346b1a
19-
github.com/onsi/gomega v1.20.1
20-
github.com/prometheus/client_golang v1.12.2
19+
github.com/onsi/gomega v1.18.1
20+
github.com/prometheus/client_golang v1.12.1
2121
github.com/shirou/gopsutil/v3 v3.22.5
2222
github.com/spf13/cobra v1.4.0
2323
github.com/spf13/viper v1.9.0
2424
github.com/tidwall/gjson v1.14.1
25-
golang.org/x/net v0.0.0-20220722155237-a158d28d115b
25+
golang.org/x/net v0.0.0-20220516155154-20f960328961
2626
google.golang.org/grpc v1.47.0
27-
k8s.io/api v0.25.3
28-
k8s.io/apimachinery v0.25.3
29-
k8s.io/client-go v0.25.3
30-
k8s.io/code-generator v0.25.3
27+
k8s.io/api v0.24.5
28+
k8s.io/apimachinery v0.24.5
29+
k8s.io/client-go v0.24.5
30+
k8s.io/code-generator v0.24.5
3131
k8s.io/klog v1.0.0
32-
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1
33-
sigs.k8s.io/controller-runtime v0.13.0
32+
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42
33+
sigs.k8s.io/controller-runtime v0.12.3
3434
)
3535

3636
require (
@@ -54,12 +54,11 @@ require (
5454
github.com/docker/distribution v2.8.1+incompatible // indirect
5555
github.com/docker/docker v20.10.16+incompatible // indirect
5656
github.com/docker/docker-credential-helpers v0.6.4 // indirect
57-
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
57+
github.com/emicklei/go-restful v2.15.0+incompatible // indirect
5858
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
59-
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
60-
github.com/fsnotify/fsnotify v1.5.4 // indirect
59+
github.com/fsnotify/fsnotify v1.5.1 // indirect
6160
github.com/go-logr/logr v1.2.3 // indirect
62-
github.com/go-logr/zapr v1.2.3 // indirect
61+
github.com/go-logr/zapr v1.2.0 // indirect
6362
github.com/go-ole/go-ole v1.2.6 // indirect
6463
github.com/go-openapi/jsonpointer v0.19.5 // indirect
6564
github.com/go-openapi/jsonreference v0.19.5 // indirect
@@ -108,36 +107,37 @@ require (
108107
github.com/yusufpapurcu/wmi v1.2.2 // indirect
109108
go.uber.org/atomic v1.7.0 // indirect
110109
go.uber.org/multierr v1.6.0 // indirect
111-
go.uber.org/zap v1.21.0 // indirect
112-
golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd // indirect
113-
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
110+
go.uber.org/zap v1.19.1 // indirect
111+
golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect
112+
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
114113
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
115-
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
116-
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
114+
golang.org/x/sync v0.0.0-20220513210516-0976fa681c29 // indirect
115+
golang.org/x/sys v0.0.0-20220513210249-45d2b4557a2a // indirect
117116
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
118117
golang.org/x/text v0.3.7 // indirect
119-
golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
120-
golang.org/x/tools v0.1.12 // indirect
118+
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
119+
golang.org/x/tools v0.1.10 // indirect
120+
golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f // indirect
121121
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
122122
gonum.org/v1/gonum v0.8.2 // indirect
123123
google.golang.org/appengine v1.6.7 // indirect
124-
google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
124+
google.golang.org/genproto v0.0.0-20220421151946-72621c1f0bd3 // indirect
125125
google.golang.org/protobuf v1.28.0 // indirect
126126
gopkg.in/fsnotify/fsnotify.v1 v1.4.7 // indirect
127127
gopkg.in/inf.v0 v0.9.1 // indirect
128128
gopkg.in/ini.v1 v1.63.2 // indirect
129129
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
130130
gopkg.in/yaml.v2 v2.4.0 // indirect
131-
gopkg.in/yaml.v3 v3.0.1 // indirect
131+
gopkg.in/yaml.v3 v3.0.0 // indirect
132132
gotest.tools/v3 v3.1.0 // indirect
133-
k8s.io/apiextensions-apiserver v0.25.0 // indirect
133+
k8s.io/apiextensions-apiserver v0.24.2 // indirect
134134
k8s.io/cloud-provider v0.21.0 // indirect
135-
k8s.io/component-base v0.25.0 // indirect
135+
k8s.io/component-base v0.24.2 // indirect
136136
k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 // indirect
137-
k8s.io/klog/v2 v2.70.1 // indirect
137+
k8s.io/klog/v2 v2.60.1 // indirect
138138
k8s.io/legacy-cloud-providers v0.21.0 // indirect
139-
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect
140-
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
141-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
139+
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
140+
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
141+
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
142142
sigs.k8s.io/yaml v1.3.0 // indirect
143143
)

0 commit comments

Comments
 (0)