From 9b586704a211264ca86b22f2a0b4617b00412235 Mon Sep 17 00:00:00 2001 From: Brooks Newberry Date: Tue, 17 Sep 2024 14:40:20 -0700 Subject: [PATCH] [release-1.30] Update Kubernetes to v1.30.5-k3s2 (#10909) Signed-off-by: Brooks Newberry Co-authored-by: Derek Nola Co-authored-by: Brad Davidson --- go.mod | 64 +++++++++++++------------- go.sum | 112 ++++++++++++++++++++++----------------------- scripts/version.sh | 2 +- 3 files changed, 89 insertions(+), 89 deletions(-) diff --git a/go.mod b/go.mod index d8bcbbba078b..cff8112084dc 100644 --- a/go.mod +++ b/go.mod @@ -39,40 +39,40 @@ replace ( google.golang.org/genproto => google.golang.org/genproto v0.0.0-20230525234035-dd9d682886f9 google.golang.org/grpc => google.golang.org/grpc v1.64.0 gopkg.in/square/go-jose.v2 => gopkg.in/square/go-jose.v2 v2.6.0 - k8s.io/api => github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.30.5-k3s1 - k8s.io/apiextensions-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.30.5-k3s1 - k8s.io/apimachinery => github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.30.5-k3s1 - k8s.io/apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.30.5-k3s1 - k8s.io/cli-runtime => github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.30.5-k3s1 - k8s.io/client-go => github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.30.5-k3s1 - k8s.io/cloud-provider => github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.30.5-k3s1 - k8s.io/cluster-bootstrap => github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.30.5-k3s1 - k8s.io/code-generator => github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.30.5-k3s1 - k8s.io/component-base => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.30.5-k3s1 - k8s.io/component-helpers => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.30.5-k3s1 - k8s.io/controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.30.5-k3s1 - k8s.io/cri-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.30.5-k3s1 - k8s.io/csi-translation-lib => github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.30.5-k3s1 - k8s.io/dynamic-resource-allocation => github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.30.5-k3s1 - k8s.io/endpointslice => github.com/k3s-io/kubernetes/staging/src/k8s.io/endpointslice v1.30.5-k3s1 + k8s.io/api => github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.30.5-k3s2 + k8s.io/apiextensions-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.30.5-k3s2 + k8s.io/apimachinery => github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.30.5-k3s2 + k8s.io/apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.30.5-k3s2 + k8s.io/cli-runtime => github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.30.5-k3s2 + k8s.io/client-go => github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.30.5-k3s2 + k8s.io/cloud-provider => github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.30.5-k3s2 + k8s.io/cluster-bootstrap => github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.30.5-k3s2 + k8s.io/code-generator => github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.30.5-k3s2 + k8s.io/component-base => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.30.5-k3s2 + k8s.io/component-helpers => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.30.5-k3s2 + k8s.io/controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.30.5-k3s2 + k8s.io/cri-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.30.5-k3s2 + k8s.io/csi-translation-lib => github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.30.5-k3s2 + k8s.io/dynamic-resource-allocation => github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.30.5-k3s2 + k8s.io/endpointslice => github.com/k3s-io/kubernetes/staging/src/k8s.io/endpointslice v1.30.5-k3s2 k8s.io/klog => github.com/k3s-io/klog v1.0.0-k3s2 // k3s-release-1.x k8s.io/klog/v2 => github.com/k3s-io/klog/v2 v2.120.1-k3s1 // k3s-main - k8s.io/kms => github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.30.5-k3s1 - k8s.io/kube-aggregator => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.30.5-k3s1 - k8s.io/kube-controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.30.5-k3s1 - k8s.io/kube-proxy => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.30.5-k3s1 - k8s.io/kube-scheduler => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.30.5-k3s1 - k8s.io/kubectl => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.30.5-k3s1 - k8s.io/kubelet => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.30.5-k3s1 - k8s.io/kubernetes => github.com/k3s-io/kubernetes v1.30.5-k3s1 - k8s.io/legacy-cloud-providers => github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.30.5-k3s1 - k8s.io/metrics => github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.30.5-k3s1 - k8s.io/mount-utils => github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.30.5-k3s1 - k8s.io/node-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/node-api v1.30.5-k3s1 - k8s.io/pod-security-admission => github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.30.5-k3s1 - k8s.io/sample-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.30.5-k3s1 - k8s.io/sample-cli-plugin => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-cli-plugin v1.30.5-k3s1 - k8s.io/sample-controller => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-controller v1.30.5-k3s1 + k8s.io/kms => github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.30.5-k3s2 + k8s.io/kube-aggregator => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.30.5-k3s2 + k8s.io/kube-controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.30.5-k3s2 + k8s.io/kube-proxy => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.30.5-k3s2 + k8s.io/kube-scheduler => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.30.5-k3s2 + k8s.io/kubectl => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.30.5-k3s2 + k8s.io/kubelet => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.30.5-k3s2 + k8s.io/kubernetes => github.com/k3s-io/kubernetes v1.30.5-k3s2 + k8s.io/legacy-cloud-providers => github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.30.5-k3s2 + k8s.io/metrics => github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.30.5-k3s2 + k8s.io/mount-utils => github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.30.5-k3s2 + k8s.io/node-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/node-api v1.30.5-k3s2 + k8s.io/pod-security-admission => github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.30.5-k3s2 + k8s.io/sample-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.30.5-k3s2 + k8s.io/sample-cli-plugin => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-cli-plugin v1.30.5-k3s2 + k8s.io/sample-controller => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-controller v1.30.5-k3s2 sourcegraph.com/sourcegraph/go-diff => github.com/sourcegraph/go-diff v0.6.0 ) diff --git a/go.sum b/go.sum index 9ba103d8dd73..60be8ec95cdd 100644 --- a/go.sum +++ b/go.sum @@ -973,62 +973,62 @@ github.com/k3s-io/klog/v2 v2.120.1-k3s1 h1:7twAHPFpZA21KdMnMNnj68STQMPldAxF2Zsao github.com/k3s-io/klog/v2 v2.120.1-k3s1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= github.com/k3s-io/kube-router/v2 v2.2.1 h1:LrU6l4khFt67+QCIvgok9B/C9JY/U2/TaF9TCVUw0vw= github.com/k3s-io/kube-router/v2 v2.2.1/go.mod h1:OWqBKftzZRXF79mDv1MLiYbvD7RP/kzrk5X5NupAawM= -github.com/k3s-io/kubernetes v1.30.5-k3s1 h1:NNeG82AqCV+mgqX4vGx7TF2g09IBWd90eBcQkjz4B6Q= -github.com/k3s-io/kubernetes v1.30.5-k3s1/go.mod h1:eWEwBuUIgunE32nhS0xM5hiN4BIp3ISrAIlGTyNN2JY= -github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.30.5-k3s1 h1:5fPwHuQLeEC4oFgAy1f5CBk0efVLqTn8COWETBFtSXg= -github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.30.5-k3s1/go.mod h1:MT0Wu+tcrQr/oMnfrjzdSZ7mzCiwx4+KDhIqa/+Br/I= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.30.5-k3s1 h1:Ng1JAC6lRmyegrTcD+OkuAGQc6sFi8ZolujgxT0SBzg= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.30.5-k3s1/go.mod h1:DPOzzIf6n1/l8+PABfoqj81RjqyBLI6+/Pjkys3zrQo= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.30.5-k3s1 h1:eyqIuZHeQ+pv6u8t23+ZcxqzHSf81eXgpojQiNG/c7s= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.30.5-k3s1/go.mod h1:t8MQn0aJW4Wz3tmdr/QDNyBZquwqtqEUKqbKhQKjbp0= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.30.5-k3s1 h1:EkZ3oCZagdVf7S353rwffbdacynbcfc7l0pJpqeTBWE= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.30.5-k3s1/go.mod h1:CUVmmmibyDvJRSdzgx+XZGcX4B6BBIyQWJ0XaZQDQ7U= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.30.5-k3s1 h1:OdTQDZxd/MNdMSwJcMacxi1glQJPFIy7K1bAbRgT8LU= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.30.5-k3s1/go.mod h1:qzsasJdVj8wPJy0h4FrdC+Cqc6LGDP0PRlMUHxXx4mM= -github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.30.5-k3s1 h1:sPEVxhugotwnuyy1uMhIlu/nFrf/hsGisvwlXkU0Ar8= -github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.30.5-k3s1/go.mod h1:JD8I9iUwU+k8A7QHfmBGYfu5UrkbQW3nDnG28rLlkFE= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.30.5-k3s1 h1:dhw8jM0S5KMHry3Tf3pN1QgcgNpBDQnI5VmmzZrl0Tc= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.30.5-k3s1/go.mod h1:xi+XvU2vbnQtFkiU1pqn+dxcXwQADYeC1is21ciK2ss= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.30.5-k3s1 h1:3XNwtGNX1Z9towTFXFyMqIsfqW/icsPctGB35vrbm+E= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.30.5-k3s1/go.mod h1:UQkCN/yAyK9GkwLx9OvIewMG++WMMmqM1ol0dZeih0Q= -github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.30.5-k3s1 h1:xRyG+xRhx6WScFJsr55sZ5pww2B6/xVo1i3xgBk0mew= -github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.30.5-k3s1/go.mod h1:qScwQGpXISa51dfNhWqVbb+fquwFK6WPdwcvGWR2hyI= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.30.5-k3s1 h1:Kec415NOX2qanp88ACHireF6jxW7lQDwPUMNKs9gnOM= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.30.5-k3s1/go.mod h1:z0h1kSKwTKBb7mekPRApPIiQKjQ/97LEewIX0U2fTco= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.30.5-k3s1 h1:acK2DkfLWY+5zJWrFT0zqYDuajxP2m1WDbftROUFuGI= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.30.5-k3s1/go.mod h1:JnDaovXMrRoLaNWAFTTYwljG5uo1YoITYNw/8P0m/Zo= -github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.30.5-k3s1 h1:pmrqvVmAIvXYhiw4zobLtAA9T+CeMVty7zBBJL5XYzk= -github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.30.5-k3s1/go.mod h1:tGylrLWeY7AO4OR0evvI0CxLsmJZy83yPrtysLsGDXg= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.30.5-k3s1 h1:N6Jy+NjaYlMBKZyRthpdQ6MKdA+Jr/ieyF4viMr9Tps= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.30.5-k3s1/go.mod h1:/fkfIpAg9LQ3JKsBg3Zqxq1kpwX7uK8K66o573HlRZc= -github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.30.5-k3s1 h1:GV75gAQCK5xuojTONhGTxf/cbnGwTxpm9vqhWdgqtro= -github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.30.5-k3s1/go.mod h1:ef38HCcCShGOPx8s6rnAlzS1hYCCGmiLGw3A2GGZ1pg= -github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.30.5-k3s1 h1:vE2ryG0BEFKWKuWojpgrsWW6MD7HriaQYyGXSEuX37A= -github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.30.5-k3s1/go.mod h1:bLEkcQbwz8O7Q8Mb6O42blnLPr8T3OX+FoGuNSQZjqM= -github.com/k3s-io/kubernetes/staging/src/k8s.io/endpointslice v1.30.5-k3s1 h1:kehLDByyPW4TAEdH4rigms0hFidJriJuLWEun8FAN4w= -github.com/k3s-io/kubernetes/staging/src/k8s.io/endpointslice v1.30.5-k3s1/go.mod h1:BIBwT7suEpxuEi3NZ7UVDtHYnRaurx9FZShAXM4wHLQ= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.30.5-k3s1 h1:FPl5byQhYjaIH4fbqrrgDrwgTICj2JVGxXZkehelvdo= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.30.5-k3s1/go.mod h1:tig/CdAZHSLnfo7HOBGtZEUcX2ym3ksoloM6gnm3/ws= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.30.5-k3s1 h1:m+QlaRTCWWytFdudWLTxFk2XWvdiebEBrBTAB+v0Ur0= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.30.5-k3s1/go.mod h1:w5RFyNnjfeptLtXFfHgzLwXaVNy+ESLZQJCbRdFzjN8= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.30.5-k3s1 h1:Fd22MZ6IaacVMbHSlqznq0sztFcYI1BTe9tAPO8TX8M= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.30.5-k3s1/go.mod h1:tGb0LmTLtAqnOfXUlj+Ex+mNXxTlmGdkJFcI+JgnyAs= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.30.5-k3s1 h1:X2C7oKoV5J9oyrJn+Ka+ATdCSVt1V+e8CxyH9O/ZZo8= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.30.5-k3s1/go.mod h1:jlYTzNX+XdkW78Tbu7zNj9n/lnSEKQNl8McQPhMhmwM= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.30.5-k3s1 h1:Tj+pV49g4CjBM9RKH7Qrmb2Xw7b+shzW6EV05mB3oSA= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.30.5-k3s1/go.mod h1:2tg98tG689zt0TE5sHNPDd49OztHg0/wqaXIz7RLEoI= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.30.5-k3s1 h1:6J1OzOggYeqqGKXE9AVVjFwTxYXmqI+FZQl9rGBaz2k= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.30.5-k3s1/go.mod h1:WuomGAL3Q6+EQK2bfHud4HD3RruJvIQRA4uuoZ4Ew+w= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.30.5-k3s1 h1:Fb2WwlP2oyJxEdKkgVEGaAK4SA65okjWWMJkgbiAKVQ= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.30.5-k3s1/go.mod h1:J3s04GUInRh4RD9N0tbJpkP1lciQ3WqFk69BvbNRtaQ= -github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.30.5-k3s1 h1:8LYxASkkhvjB9W0b/wt7B4b7a31Z3aum7ki7Vlxks6E= -github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.30.5-k3s1/go.mod h1:FJ958oArq2Ca4R+aGj08ySB5IZU3CBIhhDihWp6tqiI= -github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.30.5-k3s1 h1:WjynrIL/o44OW2FLnavJx2pugQlSwePyHPygZaR6aqg= -github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.30.5-k3s1/go.mod h1:zuttgbAy71QJ952slY86DBJu3fexyrTMXqfaTU1i3dE= -github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.30.5-k3s1 h1:+RcaWTmHbafPwuN5lKy2tMsNQchTFzHpoMaaVYkc4/g= -github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.30.5-k3s1/go.mod h1:4xH05OdueH2hpDdvzFGddYb+1GoCt/1GzcYN7ci1S14= -github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.30.5-k3s1 h1:XNhbd5J1T5s/hcT7y7c1YslDjFgrhHAe/Bi80P4q4mY= -github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.30.5-k3s1/go.mod h1:TkJPz7+fWPDnOlud9WxO+KEu1KMBxQ6i9xsWryJd0l8= +github.com/k3s-io/kubernetes v1.30.5-k3s2 h1:CsXfwojvRSaptGCJ2tHdKkI3b9E4zW99Qqx7T8nASIg= +github.com/k3s-io/kubernetes v1.30.5-k3s2/go.mod h1:eWEwBuUIgunE32nhS0xM5hiN4BIp3ISrAIlGTyNN2JY= +github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.30.5-k3s2 h1:1UnJJj0GfH4T7gLQ6NttDXLhJgZBk0ld3V0dTSlo32k= +github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.30.5-k3s2/go.mod h1:MT0Wu+tcrQr/oMnfrjzdSZ7mzCiwx4+KDhIqa/+Br/I= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.30.5-k3s2 h1:7x8O4p7bGmo63mOPniNWf24/C2mzVz00tsN+4lrKZA0= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.30.5-k3s2/go.mod h1:DPOzzIf6n1/l8+PABfoqj81RjqyBLI6+/Pjkys3zrQo= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.30.5-k3s2 h1:VVemjFYMMH++pagp6wamEVCQ4VT1EER/S0U+DD727T8= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.30.5-k3s2/go.mod h1:t8MQn0aJW4Wz3tmdr/QDNyBZquwqtqEUKqbKhQKjbp0= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.30.5-k3s2 h1:2+sS+uR5+4YMRGjumMuS00QPIfqlJ3KtyAz/7YznFzs= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.30.5-k3s2/go.mod h1:CUVmmmibyDvJRSdzgx+XZGcX4B6BBIyQWJ0XaZQDQ7U= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.30.5-k3s2 h1:2DqlNRRYMxikljt7Y35cifaBjpmJZ+9042Hizc0VW0M= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.30.5-k3s2/go.mod h1:qzsasJdVj8wPJy0h4FrdC+Cqc6LGDP0PRlMUHxXx4mM= +github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.30.5-k3s2 h1:t1MTJvN7BoTHVZcrwyQxi6Iz8j2+OFI5vM525iEBAhM= +github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.30.5-k3s2/go.mod h1:JD8I9iUwU+k8A7QHfmBGYfu5UrkbQW3nDnG28rLlkFE= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.30.5-k3s2 h1:AzEvFQZd9BeWEL3HEduvO+I/Pa3gmSCG0Pn3KeiF9o4= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.30.5-k3s2/go.mod h1:xi+XvU2vbnQtFkiU1pqn+dxcXwQADYeC1is21ciK2ss= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.30.5-k3s2 h1:QSDTQPpP4a7sf5sCsbNJcKoNDr3TJDgGh2HsI4ss4dE= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.30.5-k3s2/go.mod h1:UQkCN/yAyK9GkwLx9OvIewMG++WMMmqM1ol0dZeih0Q= +github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.30.5-k3s2 h1:YjHfYZn+PWDZiWHrkbgsnQoTTt7wYIDsT4/M+YUWXbI= +github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.30.5-k3s2/go.mod h1:qScwQGpXISa51dfNhWqVbb+fquwFK6WPdwcvGWR2hyI= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.30.5-k3s2 h1:iW5l9W1f55wWjVvogYHpOQLAEUyW2cREdMnYLiVjRwU= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.30.5-k3s2/go.mod h1:z0h1kSKwTKBb7mekPRApPIiQKjQ/97LEewIX0U2fTco= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.30.5-k3s2 h1:z6J1bI06pqpcLLdMMMS4NXZXTEflqIOPeUwYxWUvVgk= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.30.5-k3s2/go.mod h1:JnDaovXMrRoLaNWAFTTYwljG5uo1YoITYNw/8P0m/Zo= +github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.30.5-k3s2 h1:/IzRaM/PmxjCOPa6LH+qkBIEDipOo2XU4gxWoXIUSAo= +github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.30.5-k3s2/go.mod h1:tGylrLWeY7AO4OR0evvI0CxLsmJZy83yPrtysLsGDXg= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.30.5-k3s2 h1:3N5usSCHzwVPmMwqhW26dy9wWDK/f//OpuJ+VQrYujs= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.30.5-k3s2/go.mod h1:/fkfIpAg9LQ3JKsBg3Zqxq1kpwX7uK8K66o573HlRZc= +github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.30.5-k3s2 h1:IRnT7PAuY+ShQQ/0OpmcjPNkws4jJZja15oL0OVZRiE= +github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.30.5-k3s2/go.mod h1:ef38HCcCShGOPx8s6rnAlzS1hYCCGmiLGw3A2GGZ1pg= +github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.30.5-k3s2 h1:hfFUIvOLNPw9u0lthFfc49CMmqfoZTvGe4uGhhn0S5g= +github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.30.5-k3s2/go.mod h1:bLEkcQbwz8O7Q8Mb6O42blnLPr8T3OX+FoGuNSQZjqM= +github.com/k3s-io/kubernetes/staging/src/k8s.io/endpointslice v1.30.5-k3s2 h1:YCPqDa7rzluGd98ZGtMVr9xQxoJEMU3DoxhotcGAUmI= +github.com/k3s-io/kubernetes/staging/src/k8s.io/endpointslice v1.30.5-k3s2/go.mod h1:BIBwT7suEpxuEi3NZ7UVDtHYnRaurx9FZShAXM4wHLQ= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.30.5-k3s2 h1:qdDDD8kRDowqLEPtmLGtjRMHDEAPzwtPWa7AIg0vOP0= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.30.5-k3s2/go.mod h1:tig/CdAZHSLnfo7HOBGtZEUcX2ym3ksoloM6gnm3/ws= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.30.5-k3s2 h1:SuJs2DuTGyr7lRypDN9ElWL85pRY1W9S4WEtzij8DFo= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.30.5-k3s2/go.mod h1:w5RFyNnjfeptLtXFfHgzLwXaVNy+ESLZQJCbRdFzjN8= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.30.5-k3s2 h1:gDCQs6dQDpuAZCNBZw2Ga8uC7bDSKRnwJjFDu+9JriA= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.30.5-k3s2/go.mod h1:tGb0LmTLtAqnOfXUlj+Ex+mNXxTlmGdkJFcI+JgnyAs= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.30.5-k3s2 h1:dYAkx7fVIUfegGS+xkfX2LiWXXOG349BAqpGudGLP7M= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.30.5-k3s2/go.mod h1:jlYTzNX+XdkW78Tbu7zNj9n/lnSEKQNl8McQPhMhmwM= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.30.5-k3s2 h1:culKBdvcjPABpkuFDTNq4Szp2oHFKXd2SHXJZCQld0M= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.30.5-k3s2/go.mod h1:2tg98tG689zt0TE5sHNPDd49OztHg0/wqaXIz7RLEoI= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.30.5-k3s2 h1:4OwrOXtWEKlb+S0ti/p8cZgu4u0N9XQl9h02TUEDB6o= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.30.5-k3s2/go.mod h1:WuomGAL3Q6+EQK2bfHud4HD3RruJvIQRA4uuoZ4Ew+w= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.30.5-k3s2 h1:BwRGF/y4x/+gBFERq895bVRdT0QE0jvWASRo4PxKd+8= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.30.5-k3s2/go.mod h1:J3s04GUInRh4RD9N0tbJpkP1lciQ3WqFk69BvbNRtaQ= +github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.30.5-k3s2 h1:HsBld9PLhOdnOyXsWCJyzvCx3cFf1SB084fkrcDYMgU= +github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.30.5-k3s2/go.mod h1:FJ958oArq2Ca4R+aGj08ySB5IZU3CBIhhDihWp6tqiI= +github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.30.5-k3s2 h1:cQdJQdhmRP52NVof8QNOHhgiX/QFTmc7fxN8H31tUj8= +github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.30.5-k3s2/go.mod h1:zuttgbAy71QJ952slY86DBJu3fexyrTMXqfaTU1i3dE= +github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.30.5-k3s2 h1:LDAJIiHMiJ3zvrdqMwW706rwKw8xW1PATjMuoqpvPng= +github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.30.5-k3s2/go.mod h1:4xH05OdueH2hpDdvzFGddYb+1GoCt/1GzcYN7ci1S14= +github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.30.5-k3s2 h1:l6mLk3zFbnr/H2qrkcfOZTyad4pjWqtToz0NT2VbMs4= +github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.30.5-k3s2/go.mod h1:TkJPz7+fWPDnOlud9WxO+KEu1KMBxQ6i9xsWryJd0l8= github.com/k3s-io/runc v1.1.14-k3s1 h1:PcwbBuIfjI9A0T1fq7XIdIxqYHWarDlRln7QsppQQmQ= github.com/k3s-io/runc v1.1.14-k3s1/go.mod h1:E4C2z+7BxR7GHXp0hAY53mek+x49X1LjPNeMTfRGvOA= github.com/k3s-io/spegel v0.0.23-0.20240516234953-f3d2c4072314 h1:TrZb/yM0OtBuifPXlKaOfcxpJqzakA8+KsoO4c69ZLM= diff --git a/scripts/version.sh b/scripts/version.sh index b32ccf5f41c3..cffaa0346f74 100755 --- a/scripts/version.sh +++ b/scripts/version.sh @@ -43,7 +43,7 @@ if [ -z "$VERSION_CRICTL" ]; then fi VERSION_K8S_K3S=$(get-module-version k8s.io/kubernetes) -VERSION_K8S=${VERSION_K8S_K3S%"-k3s1"} +VERSION_K8S=${VERSION_K8S_K3S%-k3s*} if [ -z "$VERSION_K8S" ]; then VERSION_K8S="v0.0.0" fi