diff --git a/config/v1beta1/types.go b/config/v1beta1/types.go index b17d0a7a..1f7bbc93 100644 --- a/config/v1beta1/types.go +++ b/config/v1beta1/types.go @@ -851,6 +851,14 @@ type KubeletConfiguration struct { // If not specified, the value in containerRuntimeEndpoint is used. // +optional ImageServiceEndpoint string `json:"imageServiceEndpoint,omitempty"` + + // FailCgroupV1 prevents the kubelet from starting on hosts + // that use cgroup v1. By default, this is set to 'false', meaning + // the kubelet is allowed to start on cgroup v1 hosts unless this + // option is explicitly enabled. + // Default: false + // +optional + FailCgroupV1 *bool `json:"failCgroupV1,omitempty"` } type KubeletAuthorizationMode string diff --git a/config/v1beta1/zz_generated.deepcopy.go b/config/v1beta1/zz_generated.deepcopy.go index 0e20d63e..613a039a 100644 --- a/config/v1beta1/zz_generated.deepcopy.go +++ b/config/v1beta1/zz_generated.deepcopy.go @@ -485,6 +485,11 @@ func (in *KubeletConfiguration) DeepCopyInto(out *KubeletConfiguration) { *out = new(bool) **out = **in } + if in.FailCgroupV1 != nil { + in, out := &in.FailCgroupV1, &out.FailCgroupV1 + *out = new(bool) + **out = **in + } return } diff --git a/go.mod b/go.mod index bb483db0..056200e4 100644 --- a/go.mod +++ b/go.mod @@ -9,12 +9,12 @@ require ( github.com/gogo/protobuf v1.3.2 github.com/stretchr/testify v1.9.0 google.golang.org/grpc v1.65.0 - k8s.io/api v0.0.0-20240722223048-9516298b292e + k8s.io/api v0.0.0-20240723194852-3421a80713ae k8s.io/apimachinery v0.0.0-20240720202316-95b78024e3fe - k8s.io/apiserver v0.0.0-20240722230225-3319859ad034 - k8s.io/client-go v0.0.0-20240722223656-a9affb4c9c01 + k8s.io/apiserver v0.0.0-20240723030233-2b2a4b0fa8e4 + k8s.io/client-go v0.0.0-20240723200359-dcfcc90795cc k8s.io/component-base v0.0.0-20240722183709-6cc953a9d440 - k8s.io/cri-api v0.0.0-20240718173915-c20fa403eb24 + k8s.io/cri-api v0.0.0-20240624083443-3e7bd20f8b96 k8s.io/klog/v2 v2.130.1 k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 ) @@ -59,3 +59,7 @@ require ( sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect sigs.k8s.io/yaml v1.4.0 // indirect ) + +replace k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20240719190441-a8f449e276fe + +replace k8s.io/kms => k8s.io/kms v0.0.0-20240801005948-e16c35c51bb1 diff --git a/go.sum b/go.sum index 03ec35e1..89673a3e 100644 --- a/go.sum +++ b/go.sum @@ -151,18 +151,18 @@ gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -k8s.io/api v0.0.0-20240722223048-9516298b292e h1:n9SmHfxWHZKHj0n5U+45hjVVWLEWoL5wbCo2zChYpdo= -k8s.io/api v0.0.0-20240722223048-9516298b292e/go.mod h1:ytlEzqC2wOTwYET71W7+J+k7O2V7vrDuzmNLBSpgT+k= -k8s.io/apimachinery v0.0.0-20240720202316-95b78024e3fe h1:V9MwpYUwbKlfLKVrhpVuKWiat/LBIhm1pGB9/xdHm5Q= -k8s.io/apimachinery v0.0.0-20240720202316-95b78024e3fe/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo= -k8s.io/apiserver v0.0.0-20240722230225-3319859ad034 h1:7pvSo3NB33Lt2pV2bGUoqlbcwPH0ZSgpa6sf9vMffbY= -k8s.io/apiserver v0.0.0-20240722230225-3319859ad034/go.mod h1:w8i2gf9d/4Ekv0/rlPMPOQqyan8vM2QDMDsc+UD3IC0= -k8s.io/client-go v0.0.0-20240722223656-a9affb4c9c01 h1:TE4ubwehsWjL02lfGdBPVinDUdllJ4wrJk7jDBmTKvc= -k8s.io/client-go v0.0.0-20240722223656-a9affb4c9c01/go.mod h1:Wgx/rLokRD4svqqKioc4tu6b8pEptqpuk8JQXddN3ag= +k8s.io/api v0.0.0-20240723194852-3421a80713ae h1:mV43yijQh5/Wf7fwSuyATasDFY+YJxjuXs1ecY5M1Bc= +k8s.io/api v0.0.0-20240723194852-3421a80713ae/go.mod h1:ytlEzqC2wOTwYET71W7+J+k7O2V7vrDuzmNLBSpgT+k= +k8s.io/apimachinery v0.0.0-20240719190441-a8f449e276fe h1:lt6b7CTEYMgUTCGIZrATyWMZTQThE+qIQq5YTCbpMVQ= +k8s.io/apimachinery v0.0.0-20240719190441-a8f449e276fe/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo= +k8s.io/apiserver v0.0.0-20240723030233-2b2a4b0fa8e4 h1:7nrffLiDUbMAXLKzBvyU8rwLHw5WpCw2AjhDO5IZYRs= +k8s.io/apiserver v0.0.0-20240723030233-2b2a4b0fa8e4/go.mod h1:R1HYbPCD+ClvTmzeLBYaS4aktC3entK1o4hyD+WemtA= +k8s.io/client-go v0.0.0-20240723200359-dcfcc90795cc h1:qe0SREEjfE5w3ANvrSURWv00J/ISlqa9Sa3FCBYKRlg= +k8s.io/client-go v0.0.0-20240723200359-dcfcc90795cc/go.mod h1:XfEsPNNFOR0wNkr3BtkPUN668l7Sx1W4ECSUolQ0mA4= k8s.io/component-base v0.0.0-20240722183709-6cc953a9d440 h1:14X+5sRQRsul6tLxIKTP0/DotvWlMd9DFCgMqHP1hZY= k8s.io/component-base v0.0.0-20240722183709-6cc953a9d440/go.mod h1:dj2Pl05aLcVMZi2NXcwv+M/WdUVPEkisFPjDze7rbSk= -k8s.io/cri-api v0.0.0-20240718173915-c20fa403eb24 h1:23HpqrlxTSISi+bRRKn1yoh7CpdqHe3lIj0072znKTk= -k8s.io/cri-api v0.0.0-20240718173915-c20fa403eb24/go.mod h1:Po3TMAYH/+KrZabi7QiwQI4a692oZcUOUThd/rqwxrI= +k8s.io/cri-api v0.0.0-20240624083443-3e7bd20f8b96 h1:P0X5pqYdlMP1Isu1EqUPK41nEuNSX5dDei0Q/UbGWuI= +k8s.io/cri-api v0.0.0-20240624083443-3e7bd20f8b96/go.mod h1:Po3TMAYH/+KrZabi7QiwQI4a692oZcUOUThd/rqwxrI= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag=