Skip to content

Commit

Permalink
Upgrade k8s dependencies to 1.27 (#929)
Browse files Browse the repository at this point in the history 
Updating whole autoscaling to k8s version 1.27

In particular:
* Update all k8s dependency to 1.27.15
* latest k3d/k3s is 1.27.14
* latest kind is 1.27.13
* Update sigs.k8s.io/controller-runtime to 0.15.1
* Update Validate methods of the hooks to new interface, they need to
return warnings, returning always nil for now.
* Update all other versions in Makefile
* Update cluster-autoscaler to be based on 1.27.8
* Update crictl to 1.27 (
https://neondb.slack.com/archives/C03TN5G758R/p1718632719461499 )

cc: neondatabase/cloud#7922

---------

Signed-off-by: Oleg Vasilev <oleg@neon.tech>
Co-authored-by: Em Sharnoff <sharnoff@neon.tech>
Co-authored-by: Oleg Vasilev <oleg@neon.tech>
  • Loading branch information
@SergeyMelnikov @sharnoff @Omrigan
3 people authored Jul 10, 2024
1 parent 2063bad commit 5bb326d
Show file tree
Hide file tree
Showing 17 changed files with 1,362 additions and 359 deletions.
22 changes: 14 additions & 8 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -400,28 +400,34 @@ $(LOCALBIN):

## Tools
KUSTOMIZE ?= $(LOCALBIN)/kustomize
KUSTOMIZE_VERSION ?= v4.5.7# same as used in kubectl v1.26.x ; see https://github.com/kubernetes-sigs/kustomize/tree/48d79c745a142b440eae1e13445bb8343cd0ca23?tab=readme-ov-file#kubectl-integration
# same as used in kubectl v1.27.x ; see https://github.com/kubernetes-sigs/kustomize/tree/master?tab=readme-ov-file#kubectl-integration
KUSTOMIZE_VERSION ?= v5.0.1

ENVTEST ?= $(LOCALBIN)/setup-envtest
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
# List of available versions: https://storage.googleapis.com/kubebuilder-tools
ENVTEST_K8S_VERSION = 1.26.1
ENVTEST_K8S_VERSION = 1.27.1

CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen
CONTROLLER_TOOLS_VERSION ?= v0.11.4# k8s deps @ 1.26.1
CODE_GENERATOR_VERSION ?= v0.26.15
# k8s deps @ 1.27.1 https://github.com/kubernetes-sigs/controller-tools
CONTROLLER_TOOLS_VERSION ?= v0.12.1

CODE_GENERATOR_VERSION ?= v0.27.15

KUTTL ?= $(LOCALBIN)/kuttl
KUTTL_VERSION ?= v0.15.0# k8s deps @ 1.26.0
# k8s deps @ 1.28.3
KUTTL_VERSION ?= v0.16.0

KUBECTL ?= $(LOCALBIN)/kubectl
KUBECTL_VERSION ?= v1.26.15
KUBECTL_VERSION ?= v1.27.15

KIND ?= $(LOCALBIN)/kind
KIND_VERSION ?= v0.23.0# https://github.com/kubernetes-sigs/kind/releases/tag/v0.23.0
# https://github.com/kubernetes-sigs/kind/releases/tag/v0.23.0, supports k8s up to 1.30
KIND_VERSION ?= v0.23.0

K3D ?= $(LOCALBIN)/k3d
K3D_VERSION ?= v5.5.1# k8s deps in go.mod @ v1.27.1 (nb: binary, separate from images)
# k8s deps in go.mod @ v1.27.1 (nb: binary, separate from images)
K3D_VERSION ?= v5.5.1

## Install tools
KUSTOMIZE_INSTALL_SCRIPT ?= "https://github.com/raw/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
Expand Down
2 changes: 1 addition & 1 deletion cluster-autoscaler/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# NOTE: This must match CA's builder/Dockerfile:
# https://github.com/kubernetes/autoscaler/blob/<GIT_TAG>/builder/Dockerfile
FROM golang:1.19.7 AS builder
FROM golang:1.20.12 AS builder

WORKDIR /workspace

Expand Down
2 changes: 1 addition & 1 deletion cluster-autoscaler/ca.tag
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
cluster-autoscaler-1.26.8
cluster-autoscaler-1.27.8
112 changes: 59 additions & 53 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,36 +3,36 @@ module github.com/neondatabase/autoscaling
go 1.21

replace (
github.com/google/gnostic => github.com/google/gnostic v0.7.0
github.com/optiopay/kafka => github.com/optiopay/kafka v0.0.0
k8s.io/api => k8s.io/api v0.26.15
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.15
k8s.io/apimachinery => k8s.io/apimachinery v0.26.15
k8s.io/apiserver => k8s.io/apiserver v0.26.15
k8s.io/cli-runtime => k8s.io/cli-runtime v0.26.15
k8s.io/client-go => k8s.io/client-go v0.26.15
k8s.io/cloud-provider => k8s.io/cloud-provider v0.26.15
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.26.15
k8s.io/code-generator => k8s.io/code-generator v0.26.15
k8s.io/component-base => k8s.io/component-base v0.26.15
k8s.io/component-helpers => k8s.io/component-helpers v0.26.15
k8s.io/controller-manager => k8s.io/controller-manager v0.26.15
k8s.io/cri-api => k8s.io/cri-api v0.26.15
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.26.15
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.26.15
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.26.15
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.26.15
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1
k8s.io/kube-proxy => k8s.io/kube-proxy v0.26.15
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.26.15
k8s.io/kubectl => k8s.io/kubectl v0.26.15
k8s.io/kubelet => k8s.io/kubelet v0.26.15
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.26.15
k8s.io/metrics => k8s.io/metrics v0.26.15
k8s.io/mount-utils => k8s.io/mount-utils v0.26.15
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.26.15
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.26.15
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.26.15
k8s.io/sample-controller => k8s.io/sample-controller v0.26.15
k8s.io/api => k8s.io/api v0.27.15
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.27.15
k8s.io/apimachinery => k8s.io/apimachinery v0.27.15
k8s.io/apiserver => k8s.io/apiserver v0.27.15
k8s.io/cli-runtime => k8s.io/cli-runtime v0.27.15
k8s.io/client-go => k8s.io/client-go v0.27.15
k8s.io/cloud-provider => k8s.io/cloud-provider v0.27.15
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.27.15
k8s.io/code-generator => k8s.io/code-generator v0.27.15
k8s.io/component-base => k8s.io/component-base v0.27.15
k8s.io/component-helpers => k8s.io/component-helpers v0.27.15
k8s.io/controller-manager => k8s.io/controller-manager v0.27.15
k8s.io/cri-api => k8s.io/cri-api v0.27.15
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.27.15
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.27.15
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.27.15
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f
k8s.io/kube-proxy => k8s.io/kube-proxy v0.27.15
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.27.15
k8s.io/kubectl => k8s.io/kubectl v0.27.15
k8s.io/kubelet => k8s.io/kubelet v0.27.15
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.27.15
k8s.io/metrics => k8s.io/metrics v0.27.15
k8s.io/mount-utils => k8s.io/mount-utils v0.27.15
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.27.15
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.27.15
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.27.15
k8s.io/sample-controller => k8s.io/sample-controller v0.27.15
)

require (
Expand All @@ -50,19 +50,19 @@ require (
github.com/docker/docker v24.0.9+incompatible
github.com/docker/libnetwork v0.8.0-dev.2.0.20210525090646-64b7a4574d14
github.com/go-logr/logr v1.4.1
github.com/go-logr/zapr v1.2.3
github.com/go-logr/zapr v1.2.4
github.com/jpillora/backoff v1.0.0
github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.4.0
github.com/k8snetworkplumbingwg/whereabouts v0.6.1
github.com/kdomanski/iso9660 v0.3.3
github.com/lithammer/shortuuid v3.0.0+incompatible
github.com/onsi/ginkgo/v2 v2.17.2
github.com/onsi/gomega v1.33.1
github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417
github.com/opencontainers/runtime-spec v1.0.3-0.20220909204839-494a5a6aca78
github.com/orlangure/gnomock v0.30.0
github.com/prometheus/client_golang v1.14.0
github.com/prometheus/client_model v0.3.0
github.com/prometheus/common v0.37.0
github.com/prometheus/client_golang v1.15.1
github.com/prometheus/client_model v0.4.0
github.com/prometheus/common v0.42.0
github.com/samber/lo v1.39.0
github.com/stretchr/testify v1.9.0
github.com/tychoish/fun v0.8.5
Expand All @@ -78,9 +78,9 @@ require (
k8s.io/apiserver v0.30.2
k8s.io/client-go v0.28.1
k8s.io/klog/v2 v2.120.1
k8s.io/kubernetes v1.26.15
k8s.io/kubernetes v1.27.13
nhooyr.io/websocket v1.8.7
sigs.k8s.io/controller-runtime v0.14.5
sigs.k8s.io/controller-runtime v0.15.1
)

require (
Expand All @@ -91,6 +91,7 @@ require (
github.com/Microsoft/go-winio v0.6.0 // indirect
github.com/NYTimes/gziphandler v1.1.1 // indirect
github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
github.com/aws/aws-sdk-go-v2 v1.26.1 // indirect
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.2 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.17.12 // indirect
Expand Down Expand Up @@ -119,7 +120,7 @@ require (
github.com/docker/distribution v2.8.2+incompatible // indirect
github.com/docker/go-connections v0.4.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/felixge/httpsnoop v1.0.3 // indirect
Expand All @@ -136,12 +137,13 @@ require (
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/cel-go v0.12.7 // indirect
github.com/google/gnostic v0.6.9 // indirect
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/inconshreveable/mousetrap v1.0.1 // indirect
github.com/ishidawataru/sctp v0.0.0-20210707070123-9a39160e9062 // indirect
Expand All @@ -150,7 +152,8 @@ require (
github.com/klauspost/compress v1.15.9 // indirect
github.com/kylelemons/godebug v1.1.0 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/moby/sys/mountinfo v0.6.2 // indirect
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
Expand All @@ -163,16 +166,16 @@ require (
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/procfs v0.8.0 // indirect
github.com/prometheus/procfs v0.9.0 // indirect
github.com/sirupsen/logrus v1.9.0 // indirect
github.com/spf13/cobra v1.6.1 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/stoewer/go-strcase v1.2.0 // indirect
github.com/stretchr/objx v0.5.2 // indirect
github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74 // indirect
go.etcd.io/etcd/api/v3 v3.5.6 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.6 // indirect
go.etcd.io/etcd/client/v3 v3.5.6 // indirect
github.com/vishvananda/netns v0.0.2 // indirect
go.etcd.io/etcd/api/v3 v3.5.7 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.7 // indirect
go.etcd.io/etcd/client/v3 v3.5.7 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.1 // indirect
go.opentelemetry.io/otel v1.10.0 // indirect
Expand All @@ -191,28 +194,31 @@ require (
golang.org/x/text v0.16.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230525234025-438c736192d0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230525234020-1aefcd67740a // indirect
google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect
google.golang.org/grpc v1.56.3 // indirect
google.golang.org/protobuf v1.33.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
k8s.io/apiextensions-apiserver v0.26.15 // indirect
gotest.tools/v3 v3.5.1 // indirect
k8s.io/apiextensions-apiserver v0.27.15 // indirect
k8s.io/cloud-provider v0.0.0 // indirect
k8s.io/component-base v0.26.15 // indirect
k8s.io/component-helpers v0.26.15 // indirect
k8s.io/component-base v0.27.15 // indirect
k8s.io/component-helpers v0.27.15 // indirect
k8s.io/controller-manager v0.27.15 // indirect
k8s.io/csi-translation-lib v0.0.0 // indirect
k8s.io/dynamic-resource-allocation v0.0.0 // indirect
k8s.io/kms v0.26.15 // indirect
k8s.io/dynamic-resource-allocation v0.27.15 // indirect
k8s.io/kms v0.27.15 // indirect
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
k8s.io/kube-scheduler v0.0.0 // indirect
k8s.io/kubelet v0.27.15 // indirect
k8s.io/mount-utils v0.0.0 // indirect
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.37 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
Expand Down
Loading

0 comments on commit 5bb326d

Please sign in to comment.