mirror of
https://github.com/ceph/ceph-csi.git
synced 2025-06-14 10:53:34 +00:00
rebase: update Kubernetes modules to x.29.1
Because `api/` updated to the newer version, it seems to be reuired to update to the same version in the main `go.mod` file. Signed-off-by: Niels de Vos <ndevos@ibm.com>
This commit is contained in:
Niels de Vos
committed by
mergify[bot]
mergify[bot]
parent
4d78e89458
commit
44561ddbee
2
vendor/k8s.io/apiserver/pkg/admission/plugin/cel/composition.go
generated
vendored
2
vendor/k8s.io/apiserver/pkg/admission/plugin/cel/composition.go
generated
vendored
@ -178,7 +178,7 @@ func (a *variableAccessor) Callback(_ *lazy.MapValue) ref.Val {
|
||||
return types.NewErr("composited variable %q fails to compile: %v", a.name, a.result.Error)
|
||||
}
|
||||
|
||||
v, details, err := a.result.Program.Eval(a.activation)
|
||||
v, details, err := a.result.Program.ContextEval(a.context, a.activation)
|
||||
if details == nil {
|
||||
return types.NewErr("unable to get evaluation details of variable %q", a.name)
|
||||
}
|
||||
|
||||
16
vendor/k8s.io/apiserver/pkg/cel/environment/base.go
generated
vendored
16
vendor/k8s.io/apiserver/pkg/cel/environment/base.go
generated
vendored
@ -62,10 +62,18 @@ var baseOpts = []VersionedOptions{
|
||||
library.URLs(),
|
||||
library.Regex(),
|
||||
library.Lists(),
|
||||
|
||||
// cel-go v0.17.7 change the cost of has() from 0 to 1, but also provided the CostEstimatorOptions option to preserve the old behavior, so we enabled it at the same time we bumped our cel version to v0.17.7.
|
||||
// Since it is a regression fix, we apply it uniformly to all code use v0.17.7.
|
||||
cel.CostEstimatorOptions(checker.PresenceTestHasCost(false)),
|
||||
},
|
||||
ProgramOptions: []cel.ProgramOption{
|
||||
cel.EvalOptions(cel.OptOptimize, cel.OptTrackCost),
|
||||
cel.CostLimit(celconfig.PerCallLimit),
|
||||
|
||||
// cel-go v0.17.7 change the cost of has() from 0 to 1, but also provided the CostEstimatorOptions option to preserve the old behavior, so we enabled it at the same time we bumped our cel version to v0.17.7.
|
||||
// Since it is a regression fix, we apply it uniformly to all code use v0.17.7.
|
||||
cel.CostTrackerOptions(interpreter.PresenceTestHasCost(false)),
|
||||
},
|
||||
},
|
||||
{
|
||||
@ -113,14 +121,6 @@ var baseOpts = []VersionedOptions{
|
||||
IntroducedVersion: version.MajorMinor(1, 29),
|
||||
EnvOptions: []cel.EnvOption{
|
||||
ext.Sets(),
|
||||
// cel-go v0.17.7 introduced CostEstimatorOptions.
|
||||
// Previous the presence has a cost of 0 but cel fixed it to 1. We still set to 0 here to avoid breaking changes.
|
||||
cel.CostEstimatorOptions(checker.PresenceTestHasCost(false)),
|
||||
},
|
||||
ProgramOptions: []cel.ProgramOption{
|
||||
// cel-go v0.17.7 introduced CostTrackerOptions.
|
||||
// Previous the presence has a cost of 0 but cel fixed it to 1. We still set to 0 here to avoid breaking changes.
|
||||
cel.CostTrackerOptions(interpreter.PresenceTestHasCost(false)),
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
3
vendor/k8s.io/kubernetes/pkg/features/kube_features.go
generated
vendored
3
vendor/k8s.io/kubernetes/pkg/features/kube_features.go
generated
vendored
@ -259,7 +259,6 @@ const (
|
||||
// owner: @harche
|
||||
// kep: http://kep.k8s.io/3386
|
||||
// alpha: v1.25
|
||||
// beta: v1.27
|
||||
//
|
||||
// Allows using event-driven PLEG (pod lifecycle event generator) through kubelet
|
||||
// which avoids frequent relisting of containers which helps optimize performance.
|
||||
@ -1048,7 +1047,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS
|
||||
|
||||
DynamicResourceAllocation: {Default: false, PreRelease: featuregate.Alpha},
|
||||
|
||||
EventedPLEG: {Default: false, PreRelease: featuregate.Beta}, // off by default, requires CRI Runtime support
|
||||
EventedPLEG: {Default: false, PreRelease: featuregate.Alpha},
|
||||
|
||||
ExecProbeTimeout: {Default: true, PreRelease: featuregate.GA}, // lock to default and remove after v1.22 based on KEP #1972 update
|
||||
|
||||
|
||||
2
vendor/k8s.io/kubernetes/test/utils/image/manifest.go
generated
vendored
2
vendor/k8s.io/kubernetes/test/utils/image/manifest.go
generated
vendored
@ -241,7 +241,7 @@ func initImageConfigs(list RegistryList) (map[ImageID]Config, map[ImageID]Config
|
||||
configs[BusyBox] = Config{list.PromoterE2eRegistry, "busybox", "1.36.1-1"}
|
||||
configs[CudaVectorAdd] = Config{list.PromoterE2eRegistry, "cuda-vector-add", "1.0"}
|
||||
configs[CudaVectorAdd2] = Config{list.PromoterE2eRegistry, "cuda-vector-add", "2.3"}
|
||||
configs[DistrolessIptables] = Config{list.BuildImageRegistry, "distroless-iptables", "v0.4.3"}
|
||||
configs[DistrolessIptables] = Config{list.BuildImageRegistry, "distroless-iptables", "v0.4.4"}
|
||||
configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.5.10-0"}
|
||||
configs[Httpd] = Config{list.PromoterE2eRegistry, "httpd", "2.4.38-4"}
|
||||
configs[HttpdNew] = Config{list.PromoterE2eRegistry, "httpd", "2.4.39-4"}
|
||||
|
||||
84
vendor/modules.txt
vendored
84
vendor/modules.txt
vendored
@ -862,7 +862,7 @@ gopkg.in/yaml.v2
|
||||
# gopkg.in/yaml.v3 v3.0.1
|
||||
## explicit
|
||||
gopkg.in/yaml.v3
|
||||
# k8s.io/api v0.29.0 => k8s.io/api v0.29.0
|
||||
# k8s.io/api v0.29.1 => k8s.io/api v0.29.1
|
||||
## explicit; go 1.21
|
||||
k8s.io/api/admission/v1
|
||||
k8s.io/api/admission/v1beta1
|
||||
@ -918,12 +918,12 @@ k8s.io/api/scheduling/v1beta1
|
||||
k8s.io/api/storage/v1
|
||||
k8s.io/api/storage/v1alpha1
|
||||
k8s.io/api/storage/v1beta1
|
||||
# k8s.io/apiextensions-apiserver v0.28.3 => k8s.io/apiextensions-apiserver v0.29.0
|
||||
# k8s.io/apiextensions-apiserver v0.28.3 => k8s.io/apiextensions-apiserver v0.29.1
|
||||
## explicit; go 1.21
|
||||
k8s.io/apiextensions-apiserver/pkg/apis/apiextensions
|
||||
k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1
|
||||
k8s.io/apiextensions-apiserver/pkg/features
|
||||
# k8s.io/apimachinery v0.29.0 => k8s.io/apimachinery v0.29.0
|
||||
# k8s.io/apimachinery v0.29.1 => k8s.io/apimachinery v0.29.1
|
||||
## explicit; go 1.21
|
||||
k8s.io/apimachinery/pkg/api/equality
|
||||
k8s.io/apimachinery/pkg/api/errors
|
||||
@ -986,7 +986,7 @@ k8s.io/apimachinery/pkg/watch
|
||||
k8s.io/apimachinery/third_party/forked/golang/json
|
||||
k8s.io/apimachinery/third_party/forked/golang/netutil
|
||||
k8s.io/apimachinery/third_party/forked/golang/reflect
|
||||
# k8s.io/apiserver v0.29.0 => k8s.io/apiserver v0.29.0
|
||||
# k8s.io/apiserver v0.29.1 => k8s.io/apiserver v0.29.1
|
||||
## explicit; go 1.21
|
||||
k8s.io/apiserver/pkg/admission
|
||||
k8s.io/apiserver/pkg/admission/cel
|
||||
@ -1134,7 +1134,7 @@ k8s.io/apiserver/plugin/pkg/audit/truncate
|
||||
k8s.io/apiserver/plugin/pkg/audit/webhook
|
||||
k8s.io/apiserver/plugin/pkg/authenticator/token/webhook
|
||||
k8s.io/apiserver/plugin/pkg/authorizer/webhook
|
||||
# k8s.io/client-go v12.0.0+incompatible => k8s.io/client-go v0.29.0
|
||||
# k8s.io/client-go v12.0.0+incompatible => k8s.io/client-go v0.29.1
|
||||
## explicit; go 1.21
|
||||
k8s.io/client-go/applyconfigurations/admissionregistration/v1
|
||||
k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1
|
||||
@ -1405,7 +1405,7 @@ k8s.io/client-go/util/homedir
|
||||
k8s.io/client-go/util/keyutil
|
||||
k8s.io/client-go/util/retry
|
||||
k8s.io/client-go/util/workqueue
|
||||
# k8s.io/cloud-provider v0.29.0 => k8s.io/cloud-provider v0.29.0
|
||||
# k8s.io/cloud-provider v0.29.1 => k8s.io/cloud-provider v0.29.1
|
||||
## explicit; go 1.21
|
||||
k8s.io/cloud-provider
|
||||
k8s.io/cloud-provider/app/config
|
||||
@ -1420,7 +1420,7 @@ k8s.io/cloud-provider/names
|
||||
k8s.io/cloud-provider/options
|
||||
k8s.io/cloud-provider/volume
|
||||
k8s.io/cloud-provider/volume/helpers
|
||||
# k8s.io/component-base v0.29.0 => k8s.io/component-base v0.29.0
|
||||
# k8s.io/component-base v0.29.1 => k8s.io/component-base v0.29.1
|
||||
## explicit; go 1.21
|
||||
k8s.io/component-base/cli/flag
|
||||
k8s.io/component-base/config
|
||||
@ -1442,13 +1442,13 @@ k8s.io/component-base/metrics/testutil
|
||||
k8s.io/component-base/tracing
|
||||
k8s.io/component-base/tracing/api/v1
|
||||
k8s.io/component-base/version
|
||||
# k8s.io/component-helpers v0.29.0 => k8s.io/component-helpers v0.29.0
|
||||
# k8s.io/component-helpers v0.29.1 => k8s.io/component-helpers v0.29.1
|
||||
## explicit; go 1.21
|
||||
k8s.io/component-helpers/node/util/sysctl
|
||||
k8s.io/component-helpers/scheduling/corev1
|
||||
k8s.io/component-helpers/scheduling/corev1/nodeaffinity
|
||||
k8s.io/component-helpers/storage/volume
|
||||
# k8s.io/controller-manager v0.29.0 => k8s.io/controller-manager v0.29.0
|
||||
# k8s.io/controller-manager v0.29.1 => k8s.io/controller-manager v0.29.1
|
||||
## explicit; go 1.21
|
||||
k8s.io/controller-manager/config
|
||||
k8s.io/controller-manager/config/v1
|
||||
@ -1469,7 +1469,7 @@ k8s.io/klog/v2/internal/dbg
|
||||
k8s.io/klog/v2/internal/serialize
|
||||
k8s.io/klog/v2/internal/severity
|
||||
k8s.io/klog/v2/internal/sloghandler
|
||||
# k8s.io/kms v0.29.0
|
||||
# k8s.io/kms v0.29.1
|
||||
## explicit; go 1.21
|
||||
k8s.io/kms/apis/v1beta1
|
||||
k8s.io/kms/apis/v2
|
||||
@ -1496,15 +1496,15 @@ k8s.io/kube-openapi/pkg/validation/errors
|
||||
k8s.io/kube-openapi/pkg/validation/spec
|
||||
k8s.io/kube-openapi/pkg/validation/strfmt
|
||||
k8s.io/kube-openapi/pkg/validation/strfmt/bson
|
||||
# k8s.io/kubectl v0.0.0 => k8s.io/kubectl v0.29.0
|
||||
# k8s.io/kubectl v0.0.0 => k8s.io/kubectl v0.29.1
|
||||
## explicit; go 1.21
|
||||
k8s.io/kubectl/pkg/scale
|
||||
k8s.io/kubectl/pkg/util/podutils
|
||||
# k8s.io/kubelet v0.0.0 => k8s.io/kubelet v0.29.0
|
||||
# k8s.io/kubelet v0.0.0 => k8s.io/kubelet v0.29.1
|
||||
## explicit; go 1.21
|
||||
k8s.io/kubelet/pkg/apis
|
||||
k8s.io/kubelet/pkg/apis/stats/v1alpha1
|
||||
# k8s.io/kubernetes v1.29.0
|
||||
# k8s.io/kubernetes v1.29.1
|
||||
## explicit; go 1.21
|
||||
k8s.io/kubernetes/pkg/api/legacyscheme
|
||||
k8s.io/kubernetes/pkg/api/service
|
||||
@ -1569,10 +1569,10 @@ k8s.io/kubernetes/test/utils
|
||||
k8s.io/kubernetes/test/utils/format
|
||||
k8s.io/kubernetes/test/utils/image
|
||||
k8s.io/kubernetes/test/utils/kubeconfig
|
||||
# k8s.io/mount-utils v0.29.0 => k8s.io/mount-utils v0.29.0
|
||||
# k8s.io/mount-utils v0.29.1 => k8s.io/mount-utils v0.29.1
|
||||
## explicit; go 1.21
|
||||
k8s.io/mount-utils
|
||||
# k8s.io/pod-security-admission v0.0.0 => k8s.io/pod-security-admission v0.29.0
|
||||
# k8s.io/pod-security-admission v0.0.0 => k8s.io/pod-security-admission v0.29.1
|
||||
## explicit; go 1.21
|
||||
k8s.io/pod-security-admission/api
|
||||
k8s.io/pod-security-admission/policy
|
||||
@ -1658,31 +1658,31 @@ sigs.k8s.io/yaml
|
||||
# github.com/ceph/ceph-csi/api => ./api
|
||||
# github.com/portworx/sched-ops => github.com/portworx/sched-ops v0.20.4-openstorage-rc3
|
||||
# gomodules.xyz/jsonpatch/v2 => github.com/gomodules/jsonpatch/v2 v2.2.0
|
||||
# k8s.io/api => k8s.io/api v0.29.0
|
||||
# k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.0
|
||||
# k8s.io/apimachinery => k8s.io/apimachinery v0.29.0
|
||||
# k8s.io/apiserver => k8s.io/apiserver v0.29.0
|
||||
# k8s.io/cli-runtime => k8s.io/cli-runtime v0.29.0
|
||||
# k8s.io/client-go => k8s.io/client-go v0.29.0
|
||||
# k8s.io/cloud-provider => k8s.io/cloud-provider v0.29.0
|
||||
# k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.29.0
|
||||
# k8s.io/code-generator => k8s.io/code-generator v0.29.0
|
||||
# k8s.io/component-base => k8s.io/component-base v0.29.0
|
||||
# k8s.io/component-helpers => k8s.io/component-helpers v0.29.0
|
||||
# k8s.io/controller-manager => k8s.io/controller-manager v0.29.0
|
||||
# k8s.io/cri-api => k8s.io/cri-api v0.29.0
|
||||
# k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.29.0
|
||||
# k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.29.0
|
||||
# k8s.io/endpointslice => k8s.io/endpointslice v0.29.0
|
||||
# k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.29.0
|
||||
# k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.29.0
|
||||
# k8s.io/kube-proxy => k8s.io/kube-proxy v0.29.0
|
||||
# k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.29.0
|
||||
# k8s.io/kubectl => k8s.io/kubectl v0.29.0
|
||||
# k8s.io/kubelet => k8s.io/kubelet v0.29.0
|
||||
# k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.29.0
|
||||
# k8s.io/metrics => k8s.io/metrics v0.29.0
|
||||
# k8s.io/mount-utils => k8s.io/mount-utils v0.29.0
|
||||
# k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.0
|
||||
# k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.0
|
||||
# k8s.io/api => k8s.io/api v0.29.1
|
||||
# k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.1
|
||||
# k8s.io/apimachinery => k8s.io/apimachinery v0.29.1
|
||||
# k8s.io/apiserver => k8s.io/apiserver v0.29.1
|
||||
# k8s.io/cli-runtime => k8s.io/cli-runtime v0.29.1
|
||||
# k8s.io/client-go => k8s.io/client-go v0.29.1
|
||||
# k8s.io/cloud-provider => k8s.io/cloud-provider v0.29.1
|
||||
# k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.29.1
|
||||
# k8s.io/code-generator => k8s.io/code-generator v0.29.1
|
||||
# k8s.io/component-base => k8s.io/component-base v0.29.1
|
||||
# k8s.io/component-helpers => k8s.io/component-helpers v0.29.1
|
||||
# k8s.io/controller-manager => k8s.io/controller-manager v0.29.1
|
||||
# k8s.io/cri-api => k8s.io/cri-api v0.29.1
|
||||
# k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.29.1
|
||||
# k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.29.1
|
||||
# k8s.io/endpointslice => k8s.io/endpointslice v0.29.1
|
||||
# k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.29.1
|
||||
# k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.29.1
|
||||
# k8s.io/kube-proxy => k8s.io/kube-proxy v0.29.1
|
||||
# k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.29.1
|
||||
# k8s.io/kubectl => k8s.io/kubectl v0.29.1
|
||||
# k8s.io/kubelet => k8s.io/kubelet v0.29.1
|
||||
# k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.29.1
|
||||
# k8s.io/metrics => k8s.io/metrics v0.29.1
|
||||
# k8s.io/mount-utils => k8s.io/mount-utils v0.29.1
|
||||
# k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.1
|
||||
# k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.1
|
||||
# layeh.com/radius => github.com/layeh/radius v0.0.0-20190322222518-890bc1058917
|
||||
|
||||
Reference in New Issue
Block a user