Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package kubernetes1.25 for openSUSE:Factory
checked in at 2024-02-26 19:45:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kubernetes1.25 (Old)
and /work/SRC/openSUSE:Factory/.kubernetes1.25.new.1770 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kubernetes1.25"
Mon Feb 26 19:45:54 2024 rev:12 rq:1151201 version:1.25.16
Changes:
--------
--- /work/SRC/openSUSE:Factory/kubernetes1.25/kubernetes1.25.changes
2024-01-08 23:45:27.306732609 +0100
+++ /work/SRC/openSUSE:Factory/.kubernetes1.25.new.1770/kubernetes1.25.changes
2024-02-26 19:46:48.484982817 +0100
@@ -1,0 +2,11 @@
+Mon Feb 26 09:33:30 UTC 2024 - Priyanka Saggu <priyanka.sa...@suse.com>
+
+- 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
+
+-------------------------------------------------------------------
+Thu Feb 22 12:44:30 UTC 2024 - Dominique Leuenberger <dims...@opensuse.org>
+
+- Use %patch -P N instead of deprecated %patchN.
+
+-------------------------------------------------------------------
New:
----
autoscaling-advance-v2-as-the-preferred-API-version.patch
BETA DEBUG BEGIN:
New:- 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
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kubernetes1.25.spec ++++++
--- /var/tmp/diff_new_pack.GKrNlW/_old 2024-02-26 19:46:49.533020705 +0100
+++ /var/tmp/diff_new_pack.GKrNlW/_new 2024-02-26 19:46:49.537020850 +0100
@@ -1,7 +1,7 @@
#
# spec file
#
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -50,6 +50,8 @@
# Patch to revert renaming of coredns image location to match how it's done on
download.opensuse.org
Patch5: revert-coredns-image-renaming.patch
Patch6: kubernetes-trimpath.patch
+# Patch to advance autoscaling v2 as the preferred API version, to fix
bsc#1219964, CVE-2024-0793
+Patch7: autoscaling-advance-v2-as-the-preferred-API-version.patch
BuildRequires: fdupes
BuildRequires: git
BuildRequires: go >= 1.20.10
@@ -81,6 +83,7 @@
# packages to build containerized control plane
+
%package apiserver
Summary: Kubernetes apiserver for container image
Group: System/Management
@@ -221,11 +224,12 @@
%prep
%setup -q -n kubernetes-%{version}
-%patch2 -p1
-%patch3 -p1
-%patch4 -p0
-%patch5 -p1
-%patch6 -p1
+%patch -P 2 -p1
+%patch -P 3 -p1
+%patch -P 4 -p0
+%patch -P 5 -p1
+%patch -P 6 -p1
+%patch -P 7 -p1
%build
# This is fixing bug bsc#1065972
++++++ autoscaling-advance-v2-as-the-preferred-API-version.patch ++++++
>From 40a6d6306a2c6c202ab33c3d90178ce19fabf7cf Mon Sep 17 00:00:00 2001
From: SataQiu <shidaqiu2...@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"),
},
// --
