Skip to content

Commit

Permalink
squashed autoscaling
Browse files Browse the repository at this point in the history
  • Loading branch information
edude03 committed Nov 25, 2024
1 parent e59f6ae commit af8ec49
Show file tree
Hide file tree
Showing 9 changed files with 363 additions and 1,629 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ jobs:
- uses: codespell-project/actions-codespell@406322ec52dd7b488e48c1c4b82e2a8b3a1bf630 # v2.1
with:
check_hidden: true
ignore_words_list: NotIn # k8s match selectors; codespell tries to correct it to 'noting', 'not in', or 'notion'
ignore_words_list: NotIn, notin # k8s match selectors; codespell tries to correct it to 'noting', 'not in', or 'notion'
skip: go.sum,./cluster-autoscaler/ca.patch,./neonvm/config/multus-common/nad-crd.yaml

actionlint:
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -494,15 +494,15 @@ KUTTL ?= $(LOCALBIN)/kuttl
KUTTL_VERSION ?= v0.16.0

KUBECTL ?= $(LOCALBIN)/kubectl
KUBECTL_VERSION ?= v1.28.12
KUBECTL_VERSION ?= v1.29.10

KIND ?= $(LOCALBIN)/kind
# 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
# k8s deps in go.mod @ v1.29.4 (nb: binary, separate from images)
K3D_VERSION ?= v5.6.3
K3D_VERSION ?= v5.7.4

## Install tools
KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
Expand Down
2 changes: 1 addition & 1 deletion autoscale-scheduler/config_map.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
namespace: kube-system
data:
scheduler-config.yaml: |
apiVersion: kubescheduler.config.k8s.io/v1beta3
apiVersion: kubescheduler.config.k8s.io/v1
kind: KubeSchedulerConfiguration
leaderElection:
leaderElect: false
Expand Down
152 changes: 75 additions & 77 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,35 +5,35 @@ go 1.23.0
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.28.12
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.28.12
k8s.io/apimachinery => k8s.io/apimachinery v0.28.12
k8s.io/apiserver => k8s.io/apiserver v0.28.12
k8s.io/cli-runtime => k8s.io/cli-runtime v0.28.12
k8s.io/client-go => k8s.io/client-go v0.28.12
k8s.io/cloud-provider => k8s.io/cloud-provider v0.28.12
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.28.12
k8s.io/code-generator => k8s.io/code-generator v0.28.12
k8s.io/component-base => k8s.io/component-base v0.28.12
k8s.io/component-helpers => k8s.io/component-helpers v0.28.12
k8s.io/controller-manager => k8s.io/controller-manager v0.28.12
k8s.io/cri-api => k8s.io/cri-api v0.28.12
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.28.12
k8s.io/endpointslice => k8s.io/endpointslice v0.28.12
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.28.12
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.28.12
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f
k8s.io/kube-proxy => k8s.io/kube-proxy v0.28.12
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.28.12
k8s.io/kubectl => k8s.io/kubectl v0.28.12
k8s.io/kubelet => k8s.io/kubelet v0.28.12
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.28.12
k8s.io/metrics => k8s.io/metrics v0.28.12
k8s.io/mount-utils => k8s.io/mount-utils v0.28.12
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.28.12
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.28.12
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.28.12
k8s.io/sample-controller => k8s.io/sample-controller v0.28.12
k8s.io/api => k8s.io/api v0.29.10
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.10
k8s.io/apimachinery => k8s.io/apimachinery v0.29.10
k8s.io/apiserver => k8s.io/apiserver v0.29.10
k8s.io/cli-runtime => k8s.io/cli-runtime v0.29.10
k8s.io/client-go => k8s.io/client-go v0.29.10
k8s.io/cloud-provider => k8s.io/cloud-provider v0.29.10
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.29.10
k8s.io/code-generator => k8s.io/code-generator v0.29.10
k8s.io/component-base => k8s.io/component-base v0.29.10
k8s.io/component-helpers => k8s.io/component-helpers v0.29.10
k8s.io/controller-manager => k8s.io/controller-manager v0.29.10
k8s.io/cri-api => k8s.io/cri-api v0.29.10
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.29.10
k8s.io/endpointslice => k8s.io/endpointslice v0.29.10
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.29.10
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.29.10
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00
k8s.io/kube-proxy => k8s.io/kube-proxy v0.29.10
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.29.10
k8s.io/kubectl => k8s.io/kubectl v0.29.10
k8s.io/kubelet => k8s.io/kubelet v0.29.10
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.29.10
k8s.io/metrics => k8s.io/metrics v0.29.10
k8s.io/mount-utils => k8s.io/mount-utils v0.29.10
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.10
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.10
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.29.10
k8s.io/sample-controller => k8s.io/sample-controller v0.29.10
)

require (
Expand All @@ -52,7 +52,7 @@ 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.4
github.com/go-logr/zapr v1.3.0
github.com/jpillora/backoff v1.0.0
github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.4.0
github.com/k8snetworkplumbingwg/whereabouts v0.6.1
Expand All @@ -62,27 +62,27 @@ require (
github.com/onsi/gomega v1.33.1
github.com/opencontainers/runtime-spec v1.0.3-0.20220909204839-494a5a6aca78
github.com/orlangure/gnomock v0.30.0
github.com/prometheus/client_golang v1.16.0
github.com/prometheus/client_model v0.4.0
github.com/prometheus/common v0.44.0
github.com/prometheus/client_golang v1.18.0
github.com/prometheus/client_model v0.5.0
github.com/prometheus/common v0.45.0
github.com/samber/lo v1.39.0
github.com/stretchr/testify v1.9.0
github.com/tychoish/fun v0.8.5
github.com/vishvananda/netlink v1.1.1-0.20220125195016-0639e7e787ba
go.uber.org/multierr v1.11.0
go.uber.org/zap v1.25.0
go.uber.org/zap v1.26.0
golang.org/x/crypto v0.24.0
golang.org/x/exp v0.0.0-20230425010034-47ecfdc1ba53
golang.org/x/term v0.21.0
gopkg.in/yaml.v3 v3.0.1
k8s.io/api v0.28.12
k8s.io/apimachinery v0.28.12
k8s.io/api v0.29.30
k8s.io/apimachinery v0.29.30
k8s.io/apiserver v0.30.2
k8s.io/client-go v0.28.12
k8s.io/client-go v0.29.30
k8s.io/klog/v2 v2.120.1
k8s.io/kubernetes v1.28.12
k8s.io/kubernetes v1.29.10
nhooyr.io/websocket v1.8.7
sigs.k8s.io/controller-runtime v0.16.6 // should match k8s dependencies versions
sigs.k8s.io/controller-runtime v0.17.6 // should match k8s dependencies versions
)

require (
Expand Down Expand Up @@ -125,38 +125,37 @@ require (
github.com/docker/go-units v0.5.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/evanphx/json-patch/v5 v5.8.0 // indirect
github.com/felixge/httpsnoop v1.0.3 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
github.com/godbus/dbus/v5 v5.0.6 // indirect
github.com/godbus/dbus/v5 v5.1.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/cel-go v0.16.1 // indirect
github.com/google/gnostic v0.6.9 // indirect
github.com/google/cel-go v0.17.7 // 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.11.3 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/ishidawataru/sctp v0.0.0-20210707070123-9a39160e9062 // indirect
github.com/ishidawataru/sctp v0.0.0-20230406120618-7ff4192f6ff2 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
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.4 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/mattn/go-isatty v0.0.16 // indirect
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.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 @@ -165,64 +164,63 @@ require (
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.1.0-rc2 // indirect
github.com/opencontainers/selinux v1.10.0 // indirect
github.com/opencontainers/selinux v1.11.0 // indirect
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.10.1 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/sirupsen/logrus v1.9.0 // indirect
github.com/spf13/cobra v1.7.0 // 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.4 // indirect
go.etcd.io/etcd/api/v3 v3.5.9 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.9 // indirect
go.etcd.io/etcd/client/v3 v3.5.9 // 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
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.10.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.10.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.10.0 // indirect
go.opentelemetry.io/otel/metric v0.31.0 // indirect
go.opentelemetry.io/otel/sdk v1.10.0 // indirect
go.opentelemetry.io/otel/trace v1.10.0 // indirect
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
go.etcd.io/etcd/api/v3 v3.5.10 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
go.etcd.io/etcd/client/v3 v3.5.10 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 // indirect
go.opentelemetry.io/otel v1.19.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 // indirect
go.opentelemetry.io/otel/metric v1.19.0 // indirect
go.opentelemetry.io/otel/sdk v1.19.0 // indirect
go.opentelemetry.io/otel/trace v1.19.0 // indirect
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
golang.org/x/mod v0.17.0 // indirect
golang.org/x/net v0.26.0 // indirect
golang.org/x/oauth2 v0.8.0 // indirect
golang.org/x/oauth2 v0.12.0 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/sys v0.21.0 // indirect
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.4.0 // indirect
google.golang.org/appengine v1.6.7 // 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/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
google.golang.org/grpc v1.58.3 // indirect
google.golang.org/protobuf v1.33.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gotest.tools/v3 v3.5.1 // indirect
k8s.io/apiextensions-apiserver v0.28.12 // indirect
k8s.io/apiextensions-apiserver v0.29.2 // indirect
k8s.io/cloud-provider v0.0.0 // indirect
k8s.io/component-base v0.28.12 // indirect
k8s.io/component-helpers v0.28.12 // indirect
k8s.io/controller-manager v0.28.12 // indirect
k8s.io/component-base v0.29.10 // indirect
k8s.io/component-helpers v0.29.10 // indirect
k8s.io/controller-manager v0.29.10 // indirect
k8s.io/csi-translation-lib v0.0.0 // indirect
k8s.io/dynamic-resource-allocation v0.28.12 // indirect
k8s.io/kms v0.28.12 // indirect
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
k8s.io/kms v0.29.10 // indirect
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
k8s.io/kube-scheduler v0.0.0 // indirect
k8s.io/kubelet v0.28.12 // 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.1.2 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 // 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
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
sigs.k8s.io/yaml v1.4.0 // indirect
)
Loading

0 comments on commit af8ec49

Please sign in to comment.