Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Kubernetes 1.26 upgrade #2458

Open
wants to merge 38 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
87f2e34
went through most of the steps in versions.md up to Non-versioned mod…
tfriedel May 31, 2023
e7ae142
updated nvidia device plugin to 0.14.0
tfriedel May 31, 2023
380a25c
updated Neuron device plugin and scheduler
tfriedel May 31, 2023
98d2ab3
updated prometheus dcgm exporter, statsd exporter, prometheus, promet…
tfriedel May 31, 2023
ea5a449
incorporated changes in Prometheus Kubelet Exporter
tfriedel Jun 1, 2023
80823c9
updated Prometheus kube-state-metrics Exporter
tfriedel Jun 1, 2023
1aa8e19
updated prometheus node exporter to 1.5.0
tfriedel Jun 2, 2023
98a0e52
update grafana from 8.0.4 to 9.5.2
tfriedel Jun 2, 2023
7a2c9e5
updated event exporter
tfriedel Jun 2, 2023
02d5295
updated to alpine 3.18
tfriedel Jun 2, 2023
1242e73
updated Python client dependencies to python 3.7 and newest ver of se…
tfriedel Jun 2, 2023
f83a91c
replaced Handler with ProbeHandler
tfriedel Jun 2, 2023
9f2eedc
changed cortex version to 0.42.2
tfriedel Jun 2, 2023
bd5402e
newest istio go-client changed to pointers
tfriedel Jun 2, 2023
7da2f36
resolved some conflicting packages related to controller-runtime, ist…
tfriedel Jun 2, 2023
38e64a9
changed to kubernetes 1.26 because of incompatibility of amazon-vpc-c…
tfriedel Jun 2, 2023
c168ca1
tests are passing now
tfriedel Jun 2, 2023
4d5ca1a
formatting
tfriedel Jun 3, 2023
16b652c
update of go tools
tfriedel Jun 3, 2023
5633900
some fixes. golang version set to same as in other files
tfriedel Jun 9, 2023
774986d
linter: disabled looppointer because of some errors I couldn't fix. d…
tfriedel Jun 9, 2023
a097eda
set AMI Family to AmazonLinux2 (this was used in previous version per…
tfriedel Jun 9, 2023
aca7d70
downgraded cluster-autoscaler to a version for kubernetes 1.26
tfriedel Jun 12, 2023
7963093
downgraded promotheus operator to 0.62 because of some issues
tfriedel Jun 12, 2023
d639980
use autoscaling v2 instead of b2beta2 + other fixes
tfriedel Jun 12, 2023
5384483
remove mounting of /var/run/docker.sock because we switched from dock…
tfriedel Jun 12, 2023
4f5b109
k8s-device-plugin:v0.14.0-ubuntu20.04 -> k8s-device-plugin:v0.14.0
tfriedel Jun 13, 2023
c594507
fix: nvidia device plugin was not installed
tfriedel Jun 13, 2023
f89cf45
updated go version in CONTRIBUTING.md
tfriedel Jun 13, 2023
7d63258
disabled use of docker for validating docker images as it's not suppo…
tfriedel Jun 13, 2023
8858679
get yaml, go-input and autosccaler from our fork at PEAT-AI
tfriedel Jun 13, 2023
1cf0e42
formatting / make linter happy
tfriedel Jun 13, 2023
6d56744
removed unneccesary file
tfriedel Jun 13, 2023
a1435ea
replaced all remaining references from k8s.gcr.io to registry.k8s.io
tfriedel Jun 13, 2023
81fb67b
fix for "failed to create iamserviceaccount(s)" in case two clusters …
tfriedel Jun 16, 2023
a388d20
fix for ListTagsLogGroup, has been deprecated
tfriedel Jun 11, 2024
08c47ca
update python in manager to ver 3.10 because boto3 for 3.7 is deprecated
tfriedel Jun 12, 2024
98b59ef
updated ami for gpu and updated nvidia device plugin from 0.14.0 to 0…
tfriedel Jun 12, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
tests are passing now
tfriedel committed Jun 2, 2023

Verified

This commit was signed with the committer’s verified signature.
tfriedel Thomas Friedel
commit c168ca163304a7aa5c053d9617241fda27f1c963
6 changes: 3 additions & 3 deletions dev/versions.md
Original file line number Diff line number Diff line change
@@ -147,11 +147,11 @@ see https://github.com/moby/moby/issues/39302#issuecomment-639687466_
1. `rm -rf go.mod go.sum && go mod init && go clean -modcache`
1. `go get k8s.io/[email protected] && go get k8s.io/[email protected] && go get k8s.io/[email protected]`
1. `go get istio.io/[email protected] && go get istio.io/[email protected]`
1. `go get github.com/aws/amazon-vpc-cni-k8s/pkg/awsutils@v1.11.0`
1. `go get github.com/aws/amazon-vpc-cni-k8s/pkg/awsutils@v1.13.0`
1. `go get github.com/cortexlabs/yaml@31e52ba8433b683c471ef92cf1711fe67671dac5`
1. `go get github.com/cortexlabs/go-input@8b67a7a7b28d1c45f5c588171b3b50148462b247`
1. `go get github.com/xlab/treeprint@v1.0.0`
1. `go get -u sigs.k8s.io/controller-runtime@v0.8.3`
1. `go get github.com/xlab/treeprint@v1.1.0`
1. `go get -u sigs.k8s.io/controller-runtime@v0.14.6`
1. `echo -e '\nreplace github.com/docker/docker => github.com/docker/engine v19.03.13' >> go.mod`
1. `go get -u github.com/docker/distribution`
1. `go mod tidy`
49 changes: 23 additions & 26 deletions go.mod
Original file line number Diff line number Diff line change
@@ -13,20 +13,20 @@ require (
github.com/docker/docker v20.10.21+incompatible
github.com/fatih/color v1.13.0
github.com/getsentry/sentry-go v0.21.0
github.com/go-logr/logr v1.2.4
github.com/go-logr/logr v1.2.3
github.com/gobwas/glob v0.2.3
github.com/google/uuid v1.3.0
github.com/gorilla/handlers v1.5.1
github.com/gorilla/mux v1.8.0
github.com/gorilla/websocket v1.4.2
github.com/mitchellh/go-homedir v1.1.0
github.com/onsi/ginkgo v1.16.5
github.com/onsi/gomega v1.27.7
github.com/onsi/ginkgo/v2 v2.9.1
github.com/onsi/gomega v1.27.4
github.com/ory/dockertest/v3 v3.10.0
github.com/patrickmn/go-cache v2.1.0+incompatible
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.15.1
github.com/prometheus/common v0.44.0
github.com/prometheus/client_golang v1.14.0
github.com/prometheus/common v0.39.0
github.com/segmentio/analytics-go/v3 v3.2.1
github.com/shirou/gopsutil v3.21.11+incompatible
github.com/spf13/cobra v1.6.1
@@ -59,27 +59,27 @@ require (
github.com/containerd/continuity v0.3.0 // indirect
github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964 // indirect
github.com/docker/cli v20.10.21+incompatible // indirect
github.com/docker/distribution v2.8.1+incompatible // indirect
github.com/docker/distribution v2.8.2+incompatible // indirect
github.com/docker/go-connections v0.4.0 // indirect
github.com/docker/go-units v0.4.0 // indirect
github.com/emicklei/go-restful/v3 v3.10.1 // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/felixge/httpsnoop v1.0.3 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/go-logr/zapr v1.2.4 // indirect
github.com/go-logr/zapr v1.2.3 // indirect
github.com/go-ole/go-ole v1.2.6 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.1 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
github.com/gofrs/flock v0.8.1 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/gnostic v0.6.9 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
github.com/imdario/mergo v0.3.13 // indirect
github.com/inconshreveable/mousetrap v1.0.1 // indirect
@@ -97,13 +97,11 @@ require (
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/morikuni/aec v1.0.0 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/nxadm/tail v1.4.8 // indirect
github.com/onsi/ginkgo/v2 v2.9.5 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.0-rc2 // indirect
github.com/opencontainers/image-spec v1.1.0-rc3 // indirect
github.com/opencontainers/runc v1.1.5 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_model v0.4.0 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/procfs v0.9.0 // indirect
github.com/segmentio/backo-go v1.0.0 // indirect
github.com/sirupsen/logrus v1.9.0 // indirect
@@ -113,27 +111,26 @@ require (
github.com/yusufpapurcu/wmi v1.2.3 // indirect
go.uber.org/multierr v1.6.0 // indirect
golang.org/x/crypto v0.7.0 // indirect
golang.org/x/mod v0.10.0 // indirect
golang.org/x/net v0.10.0 // indirect
golang.org/x/oauth2 v0.8.0 // indirect
golang.org/x/sys v0.8.0 // indirect
golang.org/x/term v0.8.0 // indirect
golang.org/x/text v0.9.0 // indirect
golang.org/x/mod v0.9.0 // indirect
golang.org/x/net v0.8.0 // indirect
golang.org/x/oauth2 v0.4.0 // indirect
golang.org/x/sys v0.7.0 // indirect
golang.org/x/term v0.6.0 // indirect
golang.org/x/text v0.8.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.9.1 // indirect
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
golang.org/x/tools v0.7.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20221018160656-63c7b68cfc55 // indirect
google.golang.org/grpc v1.51.0 // indirect
google.golang.org/protobuf v1.30.0 // indirect
google.golang.org/grpc v1.50.1 // indirect
google.golang.org/protobuf v1.29.1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
gotest.tools v2.2.0+incompatible // indirect
k8s.io/apiextensions-apiserver v0.26.5 // indirect
k8s.io/component-base v0.26.5 // indirect
k8s.io/apiextensions-apiserver v0.26.1 // indirect
k8s.io/component-base v0.26.1 // indirect
k8s.io/klog/v2 v2.90.1 // indirect
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
135 changes: 55 additions & 80 deletions go.sum

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion pkg/crds/controllers/batch/batchjob_controller_test.go
Original file line number Diff line number Diff line change
@@ -27,7 +27,8 @@ import (
"github.com/cortexlabs/cortex/pkg/types/spec"
"github.com/cortexlabs/cortex/pkg/types/status"
"github.com/cortexlabs/cortex/pkg/types/userconfig"
. "github.com/onsi/ginkgo"

. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
kbatch "k8s.io/api/batch/v1"
kerrors "k8s.io/apimachinery/pkg/api/errors"
6 changes: 5 additions & 1 deletion pkg/lib/files/files_test.go
Original file line number Diff line number Diff line change
@@ -19,6 +19,7 @@ package files
import (
"os"
"path/filepath"
"strings"
"testing"

"github.com/stretchr/testify/require"
@@ -52,7 +53,7 @@ func TestPrintFileTree(t *testing.T) {
└── 5
└── 6.txt
`

expectedTree = strings.ReplaceAll(expectedTree, "\u00a0", " ")
cwd = ""
expectedHeader = "/1/2/"
require.Equal(t, expectedHeader+expectedTree, FileTree(filesList, cwd, DirsSorted))
@@ -112,6 +113,7 @@ func TestPrintFileTree(t *testing.T) {
├── 1
└── 2
`
expectedTree = strings.ReplaceAll(expectedTree, "\u00a0", " ")
require.Equal(t, "/"+expectedTree, FileTree(filesList, cwd, DirsSorted))

expectedTree = `
@@ -136,6 +138,7 @@ func TestPrintFileTree(t *testing.T) {
├── 1
└── 2
`
expectedTree = strings.ReplaceAll(expectedTree, "\u00a0", " ")
require.Equal(t, "/"+expectedTree, FileTree(filesList, cwd, DirsOnBottom))

expectedTree = `
@@ -160,6 +163,7 @@ func TestPrintFileTree(t *testing.T) {
├── 1
└── 2
`
expectedTree = strings.ReplaceAll(expectedTree, "\u00a0", " ")
require.Equal(t, "/"+expectedTree, FileTree(filesList, cwd, DirsOnTop))
}