23f11fdf59
- add new patch to advance autoscaling v2 as the preferred API version, to fix bsc#1219964, CVE-2024-0793 * autoscaling-advance-v2-as-the-preferred-API-version.patch OBS-URL: https://build.opensuse.org/request/show/1151200 OBS-URL: https://build.opensuse.org/package/show/devel:kubic/kubernetes1.25?expand=0&rev=24
79 lines
4.4 KiB
Diff
79 lines
4.4 KiB
Diff
From 40a6d6306a2c6c202ab33c3d90178ce19fabf7cf Mon Sep 17 00:00:00 2001
|
|
From: SataQiu <shidaqiu2018@gmail.com>
|
|
Date: Sun, 11 Dec 2022 13:09:39 +0800
|
|
Subject: [PATCH] autoscaling: advance v2 as the preferred API version over v1
|
|
|
|
---
|
|
pkg/apis/autoscaling/install/install.go | 3 +--
|
|
pkg/controlplane/storageversionhashdata/data.go | 4 ++--
|
|
test/integration/etcd/data.go | 6 +++---
|
|
3 files changed, 6 insertions(+), 7 deletions(-)
|
|
|
|
Index: kubernetes-1.25.16/pkg/apis/autoscaling/install/install.go
|
|
===================================================================
|
|
--- kubernetes-1.25.16.orig/pkg/apis/autoscaling/install/install.go
|
|
+++ kubernetes-1.25.16/pkg/apis/autoscaling/install/install.go
|
|
@@ -40,6 +40,5 @@ func Install(scheme *runtime.Scheme) {
|
|
utilruntime.Must(v2.AddToScheme(scheme))
|
|
utilruntime.Must(v2beta1.AddToScheme(scheme))
|
|
utilruntime.Must(v1.AddToScheme(scheme))
|
|
- // TODO: move v2 to the front of the list in 1.24
|
|
- utilruntime.Must(scheme.SetVersionPriority(v1.SchemeGroupVersion, v2.SchemeGroupVersion, v2beta1.SchemeGroupVersion, v2beta2.SchemeGroupVersion))
|
|
+ utilruntime.Must(scheme.SetVersionPriority(v2.SchemeGroupVersion, v1.SchemeGroupVersion, v2beta1.SchemeGroupVersion, v2beta2.SchemeGroupVersion))
|
|
}
|
|
Index: kubernetes-1.25.16/pkg/controlplane/storageversionhashdata/data.go
|
|
===================================================================
|
|
--- kubernetes-1.25.16.orig/pkg/controlplane/storageversionhashdata/data.go
|
|
+++ kubernetes-1.25.16/pkg/controlplane/storageversionhashdata/data.go
|
|
@@ -51,9 +51,9 @@ var GVRToStorageVersionHash = map[string
|
|
"v1/secrets": "S6u1pOWzb84=",
|
|
"v1/serviceaccounts": "pbx9ZvyFpBE=",
|
|
"v1/services": "0/CO1lhkEBI=",
|
|
- "autoscaling/v1/horizontalpodautoscalers": "oQlkt7f5j/A=",
|
|
- "autoscaling/v2/horizontalpodautoscalers": "oQlkt7f5j/A=",
|
|
- "autoscaling/v2beta2/horizontalpodautoscalers": "oQlkt7f5j/A=",
|
|
+ "autoscaling/v1/horizontalpodautoscalers": "qwQve8ut294=",
|
|
+ "autoscaling/v2/horizontalpodautoscalers": "qwQve8ut294=",
|
|
+ "autoscaling/v2beta2/horizontalpodautoscalers": "qwQve8ut294=",
|
|
"batch/v1/jobs": "mudhfqk/qZY=",
|
|
"batch/v1/cronjobs": "sd5LIXh4Fjs=",
|
|
"certificates.k8s.io/v1/certificatesigningrequests": "95fRKMXA+00=",
|
|
Index: kubernetes-1.25.16/test/integration/etcd/data.go
|
|
===================================================================
|
|
--- kubernetes-1.25.16.orig/test/integration/etcd/data.go
|
|
+++ kubernetes-1.25.16/test/integration/etcd/data.go
|
|
@@ -128,6 +128,7 @@ func GetEtcdStorageDataForNamespace(name
|
|
gvr("autoscaling", "v1", "horizontalpodautoscalers"): {
|
|
Stub: `{"metadata": {"name": "hpa2"}, "spec": {"maxReplicas": 3, "scaleTargetRef": {"kind": "something", "name": "cross"}}}`,
|
|
ExpectedEtcdPath: "/registry/horizontalpodautoscalers/" + namespace + "/hpa2",
|
|
+ ExpectedGVK: gvkP("autoscaling", "v2", "HorizontalPodAutoscaler"),
|
|
},
|
|
// --
|
|
|
|
@@ -135,7 +136,6 @@ func GetEtcdStorageDataForNamespace(name
|
|
gvr("autoscaling", "v2", "horizontalpodautoscalers"): {
|
|
Stub: `{"metadata": {"name": "hpa4"}, "spec": {"maxReplicas": 3, "scaleTargetRef": {"kind": "something", "name": "cross"}}}`,
|
|
ExpectedEtcdPath: "/registry/horizontalpodautoscalers/" + namespace + "/hpa4",
|
|
- ExpectedGVK: gvkP("autoscaling", "v1", "HorizontalPodAutoscaler"),
|
|
},
|
|
// --
|
|
|
|
@@ -143,7 +143,7 @@ func GetEtcdStorageDataForNamespace(name
|
|
gvr("autoscaling", "v2beta1", "horizontalpodautoscalers"): {
|
|
Stub: `{"metadata": {"name": "hpa1"}, "spec": {"maxReplicas": 3, "scaleTargetRef": {"kind": "something", "name": "cross"}}}`,
|
|
ExpectedEtcdPath: "/registry/horizontalpodautoscalers/" + namespace + "/hpa1",
|
|
- ExpectedGVK: gvkP("autoscaling", "v1", "HorizontalPodAutoscaler"),
|
|
+ ExpectedGVK: gvkP("autoscaling", "v2", "HorizontalPodAutoscaler"),
|
|
},
|
|
// --
|
|
|
|
@@ -151,7 +151,7 @@ func GetEtcdStorageDataForNamespace(name
|
|
gvr("autoscaling", "v2beta2", "horizontalpodautoscalers"): {
|
|
Stub: `{"metadata": {"name": "hpa3"}, "spec": {"maxReplicas": 3, "scaleTargetRef": {"kind": "something", "name": "cross"}}}`,
|
|
ExpectedEtcdPath: "/registry/horizontalpodautoscalers/" + namespace + "/hpa3",
|
|
- ExpectedGVK: gvkP("autoscaling", "v1", "HorizontalPodAutoscaler"),
|
|
+ ExpectedGVK: gvkP("autoscaling", "v2", "HorizontalPodAutoscaler"),
|
|
},
|
|
// --
|
|
|