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

Upgrade k8s dependencies to 1.26.15 #928

Merged
merged 16 commits into from
Jun 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 8 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -398,28 +398,28 @@ $(LOCALBIN):

## Tools
KUSTOMIZE ?= $(LOCALBIN)/kustomize
KUSTOMIZE_VERSION ?= v4.5.7
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

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.25.0
ENVTEST_K8S_VERSION = 1.26.1

CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen
CONTROLLER_TOOLS_VERSION ?= v0.10.0
CODE_GENERATOR_VERSION ?= v0.25.16
CONTROLLER_TOOLS_VERSION ?= v0.11.4# k8s deps @ 1.26.1
CODE_GENERATOR_VERSION ?= v0.26.15

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

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

KIND ?= $(LOCALBIN)/kind
KIND_VERSION ?= v0.20.0
KIND_VERSION ?= v0.23.0# https://github.com/kubernetes-sigs/kind/releases/tag/v0.23.0

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

## 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 cluster-autoscaler/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ $ # create a temporary directory for kubernetes/autoscaler
$ tmpdir=$(mktemp -d | tee /dev/tty)
/tmp/tmp./tmp/tmp.MCMXmnprG0
$ # clone the source repo
$ git clone --quiet --branch $(cat cluster-autoscaler/ca.tag) https://github.com/kubernetes/autsocaler $tmpdir
$ git clone --quiet --branch $(cat cluster-autoscaler/ca.tag) https://github.com/kubernetes/autoscaler $tmpdir
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oops! 🤦 😅

Cloning into '/tmp/tmp.MCMXmnprG0'...
remote: Enumerating objects: 23946, done.
remote: Counting objects: 100% (23946/23946), done.
Expand Down
2 changes: 1 addition & 1 deletion cluster-autoscaler/ca.tag
Original file line number Diff line number Diff line change
@@ -1 +1 @@
cluster-autoscaler-1.25.1
cluster-autoscaler-1.26.8
136 changes: 68 additions & 68 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -11,33 +11,34 @@ replace (
)

replace (
k8s.io/api => k8s.io/api v0.25.16
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.25.16
k8s.io/apimachinery => k8s.io/apimachinery v0.25.16
k8s.io/apiserver => k8s.io/apiserver v0.25.16
k8s.io/cli-runtime => k8s.io/cli-runtime v0.25.16
k8s.io/client-go => k8s.io/client-go v0.25.16
k8s.io/cloud-provider => k8s.io/cloud-provider v0.25.16
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.25.16
k8s.io/code-generator => k8s.io/code-generator v0.25.16
k8s.io/component-base => k8s.io/component-base v0.25.16
k8s.io/component-helpers => k8s.io/component-helpers v0.25.16
k8s.io/controller-manager => k8s.io/controller-manager v0.25.16
k8s.io/cri-api => k8s.io/cri-api v0.25.16
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.25.16
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.25.16
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.25.16
k8s.io/kube-proxy => k8s.io/kube-proxy v0.25.16
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.25.16
k8s.io/kubectl => k8s.io/kubectl v0.25.16
k8s.io/kubelet => k8s.io/kubelet v0.25.16
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.25.16
k8s.io/metrics => k8s.io/metrics v0.25.16
k8s.io/mount-utils => k8s.io/mount-utils v0.25.16
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.25.16
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.25.16
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.25.16
k8s.io/sample-controller => k8s.io/sample-controller v0.25.16
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-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
)

require (
Expand Down Expand Up @@ -70,33 +71,26 @@ require (
go.uber.org/zap v1.24.0
golang.org/x/crypto v0.21.0
golang.org/x/exp v0.0.0-20230425010034-47ecfdc1ba53
golang.org/x/sync v0.1.0
golang.org/x/sync v0.3.0
golang.org/x/term v0.18.0
gopkg.in/yaml.v3 v3.0.1
k8s.io/api v0.25.16
k8s.io/apimachinery v0.25.16
k8s.io/apiserver v0.25.16
k8s.io/client-go v0.25.16
k8s.io/api v0.26.15
k8s.io/apimachinery v0.26.15
k8s.io/apiserver v0.26.15
k8s.io/client-go v0.26.15
k8s.io/klog/v2 v2.80.1
k8s.io/kubernetes v1.25.16
k8s.io/kubernetes v1.26.15
nhooyr.io/websocket v1.8.7
sigs.k8s.io/controller-runtime v0.13.1
sigs.k8s.io/controller-runtime v0.14.5
sigs.k8s.io/controller-tools v0.10.0
)

require (
cloud.google.com/go/compute v1.19.1 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
github.com/Azure/go-autorest/autorest v0.11.27 // indirect
github.com/Azure/go-autorest/autorest/adal v0.9.20 // indirect
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
github.com/Azure/go-autorest/logger v0.2.1 // indirect
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
github.com/BurntSushi/toml v1.2.1 // indirect
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/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 All @@ -116,6 +110,7 @@ require (
github.com/benbjohnson/clock v1.3.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/cilium/ebpf v0.10.0 // indirect
github.com/coreos/go-semver v0.3.0 // indirect
Expand All @@ -125,28 +120,29 @@ 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.8.0 // indirect
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/fatih/color v1.13.0 // indirect
github.com/felixge/httpsnoop v1.0.1 // indirect
github.com/felixge/httpsnoop v1.0.3 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-logr/zapr v1.2.3 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/jsonreference v0.20.0 // indirect
github.com/go-openapi/swag v0.21.1 // indirect
github.com/gobuffalo/flect v0.3.0 // indirect
github.com/godbus/dbus/v5 v5.0.6 // indirect
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/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/go-cmp v0.5.9 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // 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 @@ -156,7 +152,7 @@ require (
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-colorable v0.1.12 // indirect
github.com/mattn/go-isatty v0.0.14 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2 // 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 @@ -172,47 +168,51 @@ require (
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/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
go.opentelemetry.io/contrib v0.20.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0 // indirect
go.opentelemetry.io/otel v0.20.0 // indirect
go.opentelemetry.io/otel/exporters/otlp v0.20.0 // indirect
go.opentelemetry.io/otel/metric v0.20.0 // indirect
go.opentelemetry.io/otel/sdk v0.20.0 // indirect
go.opentelemetry.io/otel/sdk/export/metric v0.20.0 // indirect
go.opentelemetry.io/otel/sdk/metric v0.20.0 // indirect
go.opentelemetry.io/otel/trace v0.20.0 // indirect
go.opentelemetry.io/proto/otlp v0.7.0 // 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.uber.org/atomic v1.10.0 // indirect
go.uber.org/multierr v1.9.0 // indirect
golang.org/x/mod v0.8.0 // indirect
golang.org/x/net v0.23.0 // indirect
golang.org/x/mod v0.12.0 // indirect
golang.org/x/net v0.21.0 // indirect
golang.org/x/oauth2 v0.7.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
golang.org/x/tools v0.6.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.12.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-20230410155749-daa745c078e1 // 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/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.25.16 // indirect
k8s.io/apiextensions-apiserver v0.26.15 // indirect
k8s.io/cloud-provider v0.0.0 // indirect
k8s.io/component-base v0.25.16 // indirect
k8s.io/component-helpers v0.25.16 // indirect
k8s.io/component-base v0.26.15 // indirect
k8s.io/component-helpers v0.26.15 // indirect
k8s.io/csi-translation-lib v0.0.0 // indirect
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
k8s.io/dynamic-resource-allocation v0.0.0 // indirect
k8s.io/kms v0.26.15 // indirect
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
k8s.io/kube-scheduler v0.0.0 // indirect
k8s.io/mount-utils v0.0.0 // indirect
k8s.io/utils v0.0.0-20221107191617-1a15be271d1d // indirect
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.37 // indirect
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
Expand Down
Loading
Loading