-
Notifications
You must be signed in to change notification settings - Fork 62
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
Bump to k8s 1.29 #366
Merged
tomleb
merged 6 commits into
rancher:release/v0.5
from
ericpromislow:45351-bump-to-k8s-1.29
Jun 20, 2024
Merged
Bump to k8s 1.29 #366
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
e084766
Bump to k8s modules v0.29.3 (for k8s 1.29)
ericpromislow c05ef29
Remove local replacement module.
ericpromislow 984fb40
Bump to a rancher/rancher commit that has k8s 1.29 support
ericpromislow 2b30237
Back out rancher 2.9 change that breaks drone integration tests.
ericpromislow 1289ab9
Remove the minimum k8s version from this chart.
ericpromislow 1f7b267
No need to use an older rancher image.
ericpromislow File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,171 +1,165 @@ | ||
module github.com/rancher/webhook | ||
|
||
go 1.22 | ||
go 1.22.0 | ||
|
||
toolchain go1.22.1 | ||
|
||
replace ( | ||
k8s.io/api => k8s.io/api v0.28.6 | ||
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.28.6 | ||
k8s.io/apimachinery => k8s.io/apimachinery v0.28.6 | ||
k8s.io/apiserver => k8s.io/apiserver v0.28.6 | ||
k8s.io/cli-runtime => k8s.io/cli-runtime v0.28.6 | ||
k8s.io/client-go => github.com/rancher/client-go v1.28.6-rancher1 | ||
k8s.io/cloud-provider => k8s.io/cloud-provider v0.28.6 | ||
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.28.6 | ||
k8s.io/code-generator => k8s.io/code-generator v0.28.6 | ||
k8s.io/component-base => k8s.io/component-base v0.28.6 | ||
k8s.io/component-helpers => k8s.io/component-helpers v0.28.6 | ||
k8s.io/controller-manager => k8s.io/controller-manager v0.28.6 | ||
k8s.io/cri-api => k8s.io/cri-api v0.28.6 | ||
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.28.6 | ||
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.28.6 | ||
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.28.6 | ||
k8s.io/kube-proxy => k8s.io/kube-proxy v0.28.6 | ||
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.28.6 | ||
k8s.io/kubectl => k8s.io/kubectl v0.28.6 | ||
k8s.io/kubelet => k8s.io/kubelet v0.28.6 | ||
k8s.io/kubernetes => k8s.io/kubernetes v1.28.6 | ||
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.28.6 | ||
k8s.io/metrics => k8s.io/metrics v0.28.6 | ||
k8s.io/mount-utils => k8s.io/mount-utils v0.28.6 | ||
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.28.6 | ||
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.28.6 | ||
k8s.io/api => k8s.io/api v0.29.3 | ||
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.3 | ||
k8s.io/apimachinery => k8s.io/apimachinery v0.29.3 | ||
k8s.io/apiserver => k8s.io/apiserver v0.29.3 | ||
k8s.io/cli-runtime => k8s.io/cli-runtime v0.29.3 | ||
k8s.io/client-go => github.com/rancher/client-go v1.29.3-rancher1 | ||
k8s.io/cloud-provider => k8s.io/cloud-provider v0.29.3 | ||
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.29.3 | ||
k8s.io/code-generator => k8s.io/code-generator v0.29.3 | ||
k8s.io/component-helpers => k8s.io/component-helpers v0.29.3 | ||
k8s.io/controller-manager => k8s.io/controller-manager v0.29.3 | ||
k8s.io/cri-api => k8s.io/cri-api v0.29.3 | ||
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.29.3 | ||
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.29.3 | ||
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.29.3 | ||
k8s.io/kube-proxy => k8s.io/kube-proxy v0.29.3 | ||
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.29.3 | ||
k8s.io/kubectl => k8s.io/kubectl v0.29.3 | ||
k8s.io/kubelet => k8s.io/kubelet v0.29.3 | ||
k8s.io/kubernetes => k8s.io/kubernetes v1.29.3 | ||
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.29.3 | ||
k8s.io/metrics => k8s.io/metrics v0.29.3 | ||
k8s.io/mount-utils => k8s.io/mount-utils v0.29.3 | ||
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.3 | ||
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.3 | ||
) | ||
|
||
require ( | ||
github.com/blang/semver v3.5.1+incompatible | ||
github.com/evanphx/json-patch v5.6.0+incompatible | ||
github.com/evanphx/json-patch v5.9.0+incompatible | ||
github.com/golang/mock v1.6.0 | ||
github.com/gorilla/mux v1.8.0 | ||
github.com/rancher/dynamiclistener v0.5.0-rc2 | ||
github.com/rancher/lasso v0.0.0-20240123150939-7055397d6dfa | ||
github.com/rancher/rancher/pkg/apis v0.0.0-20240328110445-91a4620d7e49 | ||
github.com/rancher/rke v1.5.7-rc2 | ||
github.com/rancher/wrangler/v2 v2.1.4 | ||
github.com/gorilla/mux v1.8.1 | ||
github.com/rancher/dynamiclistener v0.5.0-rc6 | ||
github.com/rancher/lasso v0.0.0-20240424194130-d87ec407d941 | ||
github.com/rancher/rancher/pkg/apis v0.0.0-20240529165126-aacda464b851 | ||
github.com/rancher/rke v1.6.0-rc4 | ||
github.com/rancher/wrangler/v2 v2.2.0-rc6 | ||
github.com/robfig/cron v1.2.0 | ||
github.com/sirupsen/logrus v1.9.3 | ||
github.com/stretchr/testify v1.8.4 | ||
golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 | ||
golang.org/x/text v0.14.0 | ||
golang.org/x/tools v0.16.1 | ||
k8s.io/api v0.28.6 | ||
k8s.io/apimachinery v0.28.6 | ||
k8s.io/apiserver v0.28.6 | ||
github.com/stretchr/testify v1.9.0 | ||
golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f | ||
golang.org/x/text v0.15.0 | ||
golang.org/x/tools v0.20.0 | ||
k8s.io/api v0.29.4 | ||
k8s.io/apimachinery v0.29.4 | ||
k8s.io/apiserver v0.29.4 | ||
k8s.io/client-go v12.0.0+incompatible | ||
k8s.io/kubernetes v1.28.6 | ||
k8s.io/pod-security-admission v0.28.6 | ||
k8s.io/utils v0.0.0-20230726121419-3b25d923346b | ||
sigs.k8s.io/controller-runtime v0.15.3 | ||
k8s.io/kubernetes v1.29.4 | ||
k8s.io/pod-security-admission v0.29.3 | ||
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 | ||
sigs.k8s.io/controller-runtime v0.17.4 | ||
sigs.k8s.io/yaml v1.4.0 | ||
) | ||
|
||
require ( | ||
github.com/NYTimes/gziphandler v1.1.1 // indirect | ||
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect | ||
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect | ||
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect | ||
github.com/beorn7/perks v1.0.1 // indirect | ||
github.com/blang/semver/v4 v4.0.0 // indirect | ||
github.com/cenkalti/backoff/v4 v4.2.1 // indirect | ||
github.com/cespare/xxhash/v2 v2.2.0 // indirect | ||
github.com/cenkalti/backoff/v4 v4.3.0 // indirect | ||
github.com/cespare/xxhash/v2 v2.3.0 // indirect | ||
github.com/coreos/go-semver v0.3.1 // indirect | ||
github.com/coreos/go-systemd/v22 v22.5.0 // indirect | ||
github.com/davecgh/go-spew v1.1.1 // indirect | ||
github.com/docker/distribution v2.8.2+incompatible // indirect | ||
github.com/emicklei/go-restful/v3 v3.11.0 // 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/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect | ||
github.com/distribution/reference v0.6.0 // indirect | ||
github.com/emicklei/go-restful/v3 v3.12.0 // indirect | ||
github.com/felixge/httpsnoop v1.0.4 // indirect | ||
github.com/fsnotify/fsnotify v1.7.0 // indirect | ||
github.com/ghodss/yaml v1.0.0 // indirect | ||
github.com/go-logr/logr v1.3.0 // indirect | ||
github.com/go-logr/logr v1.4.1 // indirect | ||
github.com/go-logr/stdr v1.2.2 // indirect | ||
github.com/go-openapi/jsonpointer v0.20.0 // indirect | ||
github.com/go-openapi/jsonreference v0.20.2 // indirect | ||
github.com/go-openapi/swag v0.22.4 // indirect | ||
github.com/go-openapi/jsonpointer v0.21.0 // indirect | ||
github.com/go-openapi/jsonreference v0.21.0 // indirect | ||
github.com/go-openapi/swag v0.23.0 // 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/cel-go v0.16.1 // indirect | ||
github.com/golang/protobuf v1.5.4 // indirect | ||
github.com/google/cel-go v0.17.8 // indirect | ||
github.com/google/gnostic-models v0.6.8 // indirect | ||
github.com/google/go-cmp v0.6.0 // indirect | ||
github.com/google/gofuzz v1.2.0 // indirect | ||
github.com/google/uuid v1.5.0 // 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.19.1 // indirect | ||
github.com/imdario/mergo v0.3.16 // indirect | ||
github.com/inconshreveable/mousetrap v1.1.0 // indirect | ||
github.com/josharian/intern v1.0.0 // indirect | ||
github.com/json-iterator/go v1.1.12 // indirect | ||
github.com/mailru/easyjson v0.7.7 // indirect | ||
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect | ||
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect | ||
github.com/modern-go/reflect2 v1.0.2 // indirect | ||
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect | ||
github.com/opencontainers/go-digest v1.0.0 // indirect | ||
github.com/pkg/errors v0.9.1 // indirect | ||
github.com/pmezard/go-difflib v1.0.0 // indirect | ||
github.com/prometheus/client_golang v1.16.0 // indirect | ||
github.com/prometheus/client_model v0.4.0 // indirect | ||
github.com/prometheus/common v0.44.0 // indirect | ||
github.com/prometheus/procfs v0.11.1 // indirect | ||
github.com/rancher/aks-operator v1.3.0-rc5 // indirect | ||
github.com/rancher/eks-operator v1.4.0-rc5 // indirect | ||
github.com/rancher/fleet/pkg/apis v0.0.0-20231017140638-93432f288e79 // indirect | ||
github.com/rancher/gke-operator v1.3.0-rc6 // indirect | ||
github.com/rancher/norman v0.0.0-20240207153100-3bb70b772b52 // indirect | ||
github.com/rancher/wrangler v1.1.1 // indirect | ||
github.com/spf13/cobra v1.7.0 // indirect | ||
github.com/prometheus/client_golang v1.18.0 // indirect | ||
github.com/prometheus/client_model v0.6.1 // indirect | ||
github.com/prometheus/common v0.47.0 // indirect | ||
github.com/prometheus/procfs v0.14.0 // indirect | ||
github.com/rancher/aks-operator v1.9.0-rc.1 // indirect | ||
github.com/rancher/eks-operator v1.9.0-rc.1 // indirect | ||
github.com/rancher/fleet/pkg/apis v0.9.4 // indirect | ||
github.com/rancher/gke-operator v1.9.0-rc.1 // indirect | ||
github.com/rancher/norman v0.0.0-20240503193601-9f5f6586bb5b // indirect | ||
github.com/spf13/cobra v1.8.0 // indirect | ||
github.com/spf13/pflag v1.0.5 // indirect | ||
github.com/stoewer/go-strcase v1.2.0 // 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.uber.org/atomic v1.10.0 // indirect | ||
github.com/stoewer/go-strcase v1.3.0 // indirect | ||
go.etcd.io/etcd/api/v3 v3.5.13 // indirect | ||
go.etcd.io/etcd/client/pkg/v3 v3.5.13 // indirect | ||
go.etcd.io/etcd/client/v3 v3.5.13 // indirect | ||
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.51.0 // indirect | ||
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.51.0 // indirect | ||
go.opentelemetry.io/otel v1.26.0 // indirect | ||
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.26.0 // indirect | ||
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.26.0 // indirect | ||
go.opentelemetry.io/otel/metric v1.26.0 // indirect | ||
go.opentelemetry.io/otel/sdk v1.26.0 // indirect | ||
go.opentelemetry.io/otel/trace v1.26.0 // indirect | ||
go.opentelemetry.io/proto/otlp v1.2.0 // indirect | ||
go.uber.org/multierr v1.11.0 // indirect | ||
go.uber.org/zap v1.24.0 // indirect | ||
golang.org/x/crypto v0.19.0 // indirect | ||
golang.org/x/mod v0.14.0 // indirect | ||
golang.org/x/net v0.21.0 // indirect | ||
golang.org/x/oauth2 v0.16.0 // indirect | ||
golang.org/x/sync v0.5.0 // indirect | ||
golang.org/x/sys v0.17.0 // indirect | ||
golang.org/x/term v0.17.0 // indirect | ||
go.uber.org/zap v1.27.0 // indirect | ||
golang.org/x/crypto v0.23.0 // indirect | ||
golang.org/x/mod v0.17.0 // indirect | ||
golang.org/x/net v0.25.0 // indirect | ||
golang.org/x/oauth2 v0.20.0 // indirect | ||
golang.org/x/sync v0.7.0 // indirect | ||
golang.org/x/sys v0.20.0 // indirect | ||
golang.org/x/term v0.20.0 // indirect | ||
golang.org/x/time v0.5.0 // indirect | ||
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect | ||
google.golang.org/appengine v1.6.8 // indirect | ||
google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 // indirect | ||
google.golang.org/genproto/googleapis/api v0.0.0-20231030173426-d783a09b4405 // indirect | ||
google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect | ||
google.golang.org/grpc v1.59.0 // indirect | ||
google.golang.org/protobuf v1.33.0 // indirect | ||
google.golang.org/genproto/googleapis/api v0.0.0-20240429193739-8cf5692501f6 // indirect | ||
google.golang.org/genproto/googleapis/rpc v0.0.0-20240429193739-8cf5692501f6 // indirect | ||
google.golang.org/grpc v1.63.2 // indirect | ||
google.golang.org/protobuf v1.34.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 | ||
gopkg.in/yaml.v3 v3.0.1 // indirect | ||
k8s.io/apiextensions-apiserver v0.28.6 // indirect | ||
k8s.io/cloud-provider v0.0.0 // indirect | ||
k8s.io/code-generator v0.28.6 // indirect | ||
k8s.io/component-base v0.28.6 // indirect | ||
k8s.io/component-helpers v0.28.6 // indirect | ||
k8s.io/controller-manager v0.28.6 // indirect | ||
k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 // indirect | ||
k8s.io/apiextensions-apiserver v0.29.4 // indirect | ||
k8s.io/cloud-provider v0.29.3 // indirect | ||
k8s.io/code-generator v0.29.4 // indirect | ||
k8s.io/component-base v0.29.4 // indirect | ||
k8s.io/component-helpers v0.29.3 // indirect | ||
k8s.io/controller-manager v0.29.3 // indirect | ||
k8s.io/gengo v0.0.0-20240310015720-9cff6334dab4 // indirect | ||
k8s.io/klog v1.0.0 // indirect | ||
k8s.io/klog/v2 v2.100.1 // indirect | ||
k8s.io/kms v0.28.6 // indirect | ||
k8s.io/kube-aggregator v0.28.6 // indirect | ||
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect | ||
k8s.io/kubelet v0.0.0 // indirect | ||
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect | ||
sigs.k8s.io/cli-utils v0.28.0 // indirect | ||
sigs.k8s.io/cluster-api v1.5.0 // indirect | ||
k8s.io/klog/v2 v2.120.1 // indirect | ||
k8s.io/kms v0.29.3 // indirect | ||
k8s.io/kube-aggregator v0.29.3 // indirect | ||
k8s.io/kube-openapi v0.0.0-20240430033511-f0e62f92d13f // indirect | ||
k8s.io/kubelet v0.29.3 // indirect | ||
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect | ||
sigs.k8s.io/cli-utils v0.35.0 // indirect | ||
sigs.k8s.io/cluster-api v1.7.1 // indirect | ||
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect | ||
sigs.k8s.io/structured-merge-diff/v4 v4.3.0 // indirect | ||
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect | ||
) |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is there any particular reason why we want a specific version of the toolchain?
In the case we want to keep the toolchain explicit should we try to use the latest toolchain? E.g. rancher/rancher currently uses
go1.22.3
andtoolchain go1.22.4
is already available.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As discussed on Slack we'll merge as is and then revisit in a future PR that should follow pretty quickly.