diff --git a/go.mod b/go.mod index 72756eae7..41b2c6d87 100644 --- a/go.mod +++ b/go.mod @@ -6,35 +6,35 @@ toolchain go1.23.8 replace ( github.com/rancher/rke => github.com/rancher/rke v1.5.13 - 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/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 => 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/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.28.6 - k8s.io/endpointslice => k8s.io/endpointslice 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/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/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation 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-20230717233707-2695361300d9 - 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/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/kubernetes => k8s.io/kubernetes v1.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 sigs.k8s.io/structured-merge-diff/v4 => sigs.k8s.io/structured-merge-diff/v4 v4.2.3 ) @@ -58,8 +58,8 @@ require ( k8s.io/apimachinery v0.30.0 k8s.io/apiserver v0.28.12 k8s.io/client-go v12.0.0+incompatible - k8s.io/kubernetes v1.28.9 - k8s.io/pod-security-admission v0.28.6 + k8s.io/kubernetes v1.28.12 + k8s.io/pod-security-admission v0.28.12 k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 sigs.k8s.io/controller-runtime v0.16.6 sigs.k8s.io/yaml v1.4.0 @@ -156,15 +156,15 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/apiextensions-apiserver v0.28.9 // indirect k8s.io/cloud-provider v0.0.0 // indirect - k8s.io/code-generator v0.28.9 // indirect + k8s.io/code-generator v0.28.12 // indirect k8s.io/component-base v0.28.12 // indirect - k8s.io/component-helpers v0.28.6 // indirect - k8s.io/controller-manager v0.28.6 // indirect + k8s.io/component-helpers v0.28.12 // indirect + k8s.io/controller-manager v0.28.12 // indirect k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 // indirect k8s.io/klog v1.0.0 // indirect k8s.io/klog/v2 v2.130.1 // indirect - k8s.io/kms v0.28.9 // indirect - k8s.io/kube-aggregator v0.28.6 // indirect + k8s.io/kms v0.28.12 // indirect + k8s.io/kube-aggregator v0.28.12 // indirect k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect k8s.io/kubelet v0.0.0 // indirect sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect diff --git a/go.sum b/go.sum index c21834ee6..505167204 100644 --- a/go.sum +++ b/go.sum @@ -701,24 +701,24 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -k8s.io/api v0.28.6 h1:yy6u9CuIhmg55YvF/BavPBBXB+5QicB64njJXxVnzLo= -k8s.io/api v0.28.6/go.mod h1:AM6Ys6g9MY3dl/XNaNfg/GePI0FT7WBGu8efU/lirAo= -k8s.io/apiextensions-apiserver v0.28.6 h1:myB3iG/3v3jqCg28JDbOefu4sH2/erNEXgytRzJKBOo= -k8s.io/apiextensions-apiserver v0.28.6/go.mod h1:qlp6xRKBgyRhe5AYc81TQpLx4kLNK8/sGQUOwMkVjRk= -k8s.io/apimachinery v0.28.6 h1:RsTeR4z6S07srPg6XYrwXpTJVMXsjPXn0ODakMytSW0= -k8s.io/apimachinery v0.28.6/go.mod h1:QFNX/kCl/EMT2WTSz8k4WLCv2XnkOLMaL8GAVRMdpsA= -k8s.io/apiserver v0.28.6 h1:SfS5v4I5UGvh0q/1rzvNwLFsK+r7YzcsixnUc0NwoEk= -k8s.io/apiserver v0.28.6/go.mod h1:8n0aerS3kPm9usyB8B+an6/BZ5+Fa9fNqlASFdDDVwk= -k8s.io/cloud-provider v0.28.6 h1:KfexGkg8UVsfb7Jq163V/eyMVm0/IUHrnJnZ9m/qN8A= -k8s.io/cloud-provider v0.28.6/go.mod h1:J8X7fNWmekayasdhQGSab4hm7hk0KQssDsA5WQlPi8k= -k8s.io/code-generator v0.28.6 h1:5RnSOAvdcvuhqAp7LV5I2wwE/9DgEz2vV2llA78ubV8= -k8s.io/code-generator v0.28.6/go.mod h1:IaYGMqYjgj0zE3L9mnHo7hIL9GkY08GvGyyracaIxTA= -k8s.io/component-base v0.28.6 h1:G4T8VrcQ7xZou3by/fY5NU5mfxOBlWaivS2lPrEltAo= -k8s.io/component-base v0.28.6/go.mod h1:Dg62OOG3ALu2P4nAG00UdsuHoNLQJ5VsUZKQlLDcS+E= -k8s.io/component-helpers v0.28.6 h1:0vkzt/Oesntc8TJ1LrD5g4IIKAZljHcgTd7aMHkmULg= -k8s.io/component-helpers v0.28.6/go.mod h1:E1wTMmZYIdNZEUnglIbSf314IsvI0K1elnBIsdJwTM4= -k8s.io/controller-manager v0.28.6 h1:Gw/SN1z9AVWMpO7bsl7SGYFvRFQ3v5zmiLMS/DXfDsY= -k8s.io/controller-manager v0.28.6/go.mod h1:LHG+7FwwANxLrXD3Zn0EGMTMQ6mEYrFMkQ/CmqLOveo= +k8s.io/api v0.28.12 h1:C2hpsaso18pqn0Dmkfnbv/YCctozTC3KGGuZ6bF7zhQ= +k8s.io/api v0.28.12/go.mod h1:qjswI+whxvf9LAKD4sEYHfy+WgHGWeH+H5sCRQMwZAQ= +k8s.io/apiextensions-apiserver v0.28.12 h1:6GA64rylk5q0mbXfHHFVgfL1jx/4p6RU+Y+ni2DUuZc= +k8s.io/apiextensions-apiserver v0.28.12/go.mod h1:Len29ySvb/fnrXvioTxg2l6iFi97B53Bm3/jBMBllCE= +k8s.io/apimachinery v0.28.12 h1:VepMEVOi9o7L/4wMAXJq+3BK9tqBIeerTB+HSOTKeo0= +k8s.io/apimachinery v0.28.12/go.mod h1:zUG757HaKs6Dc3iGtKjzIpBfqTM4yiRsEe3/E7NX15o= +k8s.io/apiserver v0.28.12 h1:fvZItMw20ySP/QAU5//Ov1pJFyvrr8abeUsh3ZyF8FI= +k8s.io/apiserver v0.28.12/go.mod h1:46S3UWu620UhP5skPJ+WQWC3iWCrl1AiYJPyHxVueE4= +k8s.io/cloud-provider v0.28.12 h1:AJd4BgDjagX6WSm5fMRA/V0rH9rteIkx7j6Jg2z9yNQ= +k8s.io/cloud-provider v0.28.12/go.mod h1:SFM1GGNoLGXROMWyuU+ovUzqVUmUk0Y8Y7O4yYnhf/M= +k8s.io/code-generator v0.28.12 h1:DgFfCtvjfbSHSga//Gq695/YllrxrQl/vJiF1UnJvhU= +k8s.io/code-generator v0.28.12/go.mod h1:WiJgVNDFAlT90nq6IOxhZ1gxL2JexbcfAx9ZBsyQ3Do= +k8s.io/component-base v0.28.12 h1:ZNq6QFFGCPjaAzWqYHaQRoAY5seoK3vP0pZOjgxOzNc= +k8s.io/component-base v0.28.12/go.mod h1:8zI5TmGuHX6R5Lay61Ox7wb+dsEENl0NBmVSiHMQu1c= +k8s.io/component-helpers v0.28.12 h1:tHF4FcM/CxviA684futgMXhQeC2NOFPvHVKseixc7Cs= +k8s.io/component-helpers v0.28.12/go.mod h1:VbQ5E9qnr8alyAS3b3pqXKvkEOJKoj6z6PA8S+6Wlws= +k8s.io/controller-manager v0.28.12 h1:A/A14ErMuTuBW8myUCSfDr2QG5qS90ZV2DohyueAN8A= +k8s.io/controller-manager v0.28.12/go.mod h1:SEIMkdUzB4saf4sdTU2wzST6PU9zHGsTDwhoM/pVoko= k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 h1:pWEwq4Asjm4vjW7vcsmijwBhOr1/shsbSYiWXmNGlks= k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8= @@ -726,18 +726,18 @@ k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= -k8s.io/kms v0.28.9 h1:ApCWJulBl+uFRTr2jtTpG1lffmqqMuLnOH/RUbtO4UY= -k8s.io/kms v0.28.9/go.mod h1:VgyAIRMFqZX9lHyixecU/JTI0wnPD1wCIlquvlXRJ+Y= -k8s.io/kube-aggregator v0.28.6 h1:opRVDw+inLPIyAqG9Fu3+EYWcmbTHOHJNrmuKoeuzQM= -k8s.io/kube-aggregator v0.28.6/go.mod h1:NXzqtkCuAfv/modgRbAkPdfUZF+koazCy8Qrs8L+WyE= +k8s.io/kms v0.28.12 h1:YEcJWelR7ChLI7le/slHpeIkx7v6MoPkITo3JyL8s1M= +k8s.io/kms v0.28.12/go.mod h1:EZtSJo9PoqEe/aB/X5sXPRl5LHukSuXlDrDnY76lJjY= +k8s.io/kube-aggregator v0.28.12 h1:P2ykxwoJDBgvaBzLSMnfFY7352YUX1oB7qgTx+LXwPk= +k8s.io/kube-aggregator v0.28.12/go.mod h1:+bG2AZI09KZhAcdJ8unfNblsqxkfCKwu/DwNFQqwajM= k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 h1:LyMgNKD2P8Wn1iAwQU5OhxCKlKJy0sHc+PcDwFB24dQ= k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9/go.mod h1:wZK2AVp1uHCp4VamDVgBP2COHZjqD1T68Rf0CM3YjSM= -k8s.io/kubelet v0.28.6 h1:Ofn26Lr/4MCApqNPbRHEALIx5YTnKjNxC1CfEgwbrUA= -k8s.io/kubelet v0.28.6/go.mod h1:ANu5Pa5P4beDu2BGTW588WsFPfjmkgKbikiUvatdzAo= -k8s.io/kubernetes v1.28.6 h1:Nn2fXNjaqmKyXeFq6verbdqzlj1aqUpBcyeC1OhRFa4= -k8s.io/kubernetes v1.28.6/go.mod h1:0qpyGJTR3blkbQOmZA3Z0u1VDZJNxJM8ifLUVNJN0X8= -k8s.io/pod-security-admission v0.28.6 h1:EkObQaDPU7y+b4ODafwKIZlK9M6P8Ss23D77TZ+8hqs= -k8s.io/pod-security-admission v0.28.6/go.mod h1:TYNCxTgViyOELpDYOMn81PQsa+hd9Co00HTQI9c6qXk= +k8s.io/kubelet v0.28.12 h1:ACRS1b6XxIxAJoOJ95bsy0qm0DoxD6h/Dwi4U6Pot74= +k8s.io/kubelet v0.28.12/go.mod h1:DYlF/KqAA4WoiBElCjeDKGv2K37FLTUmTWyxMDv9s8A= +k8s.io/kubernetes v1.28.12 h1:DtWB8ZjoYiN/PXD4qDXFppf9IouVUavn6r3S+3NMUkU= +k8s.io/kubernetes v1.28.12/go.mod h1:chlmcCDBnOA/y+572cw8dO0Rci1wiA8bm5+zhPdFLCk= +k8s.io/pod-security-admission v0.28.12 h1:v6kTu1bYj95uAUyuAbkGbRpw4iN+kRL3jTxIXJzofrk= +k8s.io/pod-security-admission v0.28.12/go.mod h1:CZq1eSToAggIIojQ7GEa77TEJMH5g7B5R22rI9KlfAU= k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A= k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=