Accepting request 1177385 from Virtualization
OBS-URL: https://build.opensuse.org/request/show/1177385 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kubevirt?expand=0&rev=74
This commit is contained in:
Ana Guerrero
Git OBS Bridge
commit
b811121956
@ -1,87 +0,0 @@
|
||||
From 0e9960022d6c0ecf525d4bc934becab6c536b921 Mon Sep 17 00:00:00 2001
|
||||
From: Vicente Cheng <vicente.cheng@suse.com>
|
||||
Date: Wed, 10 Apr 2024 00:47:44 +0800
|
||||
Subject: [PATCH 1/2] network: add more network name scheme test cases
|
||||
|
||||
- Add different order to verify the correct interface name
|
||||
- Add only one secondary network to verify the correct interface name
|
||||
|
||||
Signed-off-by: Vicente Cheng <vicente.cheng@suse.com>
|
||||
---
|
||||
pkg/network/namescheme/networknamescheme_test.go | 16 ++++++++++++++++
|
||||
1 file changed, 16 insertions(+)
|
||||
|
||||
diff --git a/pkg/network/namescheme/networknamescheme_test.go b/pkg/network/namescheme/networknamescheme_test.go
|
||||
index 8fe85485006a..7b6fe8f562f4 100644
|
||||
--- a/pkg/network/namescheme/networknamescheme_test.go
|
||||
+++ b/pkg/network/namescheme/networknamescheme_test.go
|
||||
@@ -259,6 +259,22 @@ var _ = Describe("Network Name Scheme", func() {
|
||||
},
|
||||
"net2",
|
||||
),
|
||||
+ Entry("given secondary network name with different order",
|
||||
+ "multus01",
|
||||
+ []virtv1.Network{
|
||||
+ createMultusSecondaryNetwork("blue", "test-br"),
|
||||
+ createMultusSecondaryNetwork("multus01", "test-br"),
|
||||
+ newPodNetwork(),
|
||||
+ },
|
||||
+ "net2",
|
||||
+ ),
|
||||
+ Entry("given secondary network name, only one secondary network",
|
||||
+ "multus01",
|
||||
+ []virtv1.Network{
|
||||
+ createMultusSecondaryNetwork("multus01", "test-br"),
|
||||
+ },
|
||||
+ "net1",
|
||||
+ ),
|
||||
)
|
||||
})
|
||||
})
|
||||
|
||||
From 3d22893dda229cfd0793beb54cf64271f9b69a17 Mon Sep 17 00:00:00 2001
|
||||
From: Vicente Cheng <vicente.cheng@suse.com>
|
||||
Date: Wed, 10 Apr 2024 01:10:36 +0800
|
||||
Subject: [PATCH 2/2] network: improve the OrdinalPodInterfaceName mechanism
|
||||
|
||||
- the networks are not ordered, means the pod network is not always
|
||||
on the first. We should consider more to get the secondary network
|
||||
because the secondary started from 1 to n.
|
||||
- Also, we should consider only have one multus and secondary
|
||||
network situation.
|
||||
|
||||
This change mainly finetune the mechanism for get the secondary
|
||||
multus network.
|
||||
|
||||
Signed-off-by: Vicente Cheng <vicente.cheng@suse.com>
|
||||
---
|
||||
pkg/network/namescheme/networknamescheme.go | 14 +++++---------
|
||||
1 file changed, 5 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/pkg/network/namescheme/networknamescheme.go b/pkg/network/namescheme/networknamescheme.go
|
||||
index b2be1d62e54d..470151c91806 100644
|
||||
--- a/pkg/network/namescheme/networknamescheme.go
|
||||
+++ b/pkg/network/namescheme/networknamescheme.go
|
||||
@@ -92,17 +92,13 @@ func CreateOrdinalNetworkNameScheme(vmiNetworks []v1.Network) map[string]string
|
||||
return networkNameSchemeMap
|
||||
}
|
||||
|
||||
+// OrdinalPodInterfaceName returns the ordinal interface name for the given network name.
|
||||
+// Rereuse the `CreateOrdinalNetworkNameScheme` for various networks helps find the target interface name.
|
||||
func OrdinalPodInterfaceName(name string, networks []v1.Network) string {
|
||||
- for i, network := range networks {
|
||||
- if network.Name == name {
|
||||
- if vmispec.IsSecondaryMultusNetwork(network) {
|
||||
- return generateOrdinalInterfaceName(i)
|
||||
- }
|
||||
-
|
||||
- return PrimaryPodInterfaceName
|
||||
- }
|
||||
+ networkNameSchemeMap := CreateOrdinalNetworkNameScheme(networks)
|
||||
+ if ordinalName, exist := networkNameSchemeMap[name]; exist {
|
||||
+ return ordinalName
|
||||
}
|
||||
-
|
||||
return ""
|
||||
}
|
||||
|
||||
2
_service
2
_service
@ -1,7 +1,7 @@
|
||||
<services>
|
||||
<service name="tar_scm" mode="manual">
|
||||
<param name="filename">kubevirt</param>
|
||||
<param name="revision">v1.2.0</param>
|
||||
<param name="revision">v1.2.1</param>
|
||||
<param name="scm">git</param>
|
||||
<param name="submodules">disable</param>
|
||||
<param name="url">https://github.com/kubevirt/kubevirt</param>
|
||||
|
||||
@ -22,7 +22,7 @@ spec:
|
||||
serviceAccountName: kubevirt-testing
|
||||
containers:
|
||||
- name: target
|
||||
image: quay.io/kubevirt/disks-images-provider:v1.2.0
|
||||
image: quay.io/kubevirt/disks-images-provider:v1.2.1
|
||||
imagePullPolicy: Always
|
||||
lifecycle:
|
||||
preStop:
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e5a0d708d26c650ce64e60dec4a3525412d5c9f5ec04f6c2e25ba29fc9bef321
|
||||
size 16911337
|
||||
3
kubevirt-1.2.1.tar.gz
Normal file
3
kubevirt-1.2.1.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:16b10d45221b70649557a6ff5fbf41c33e24ea512cb39f49324bdff48f6ead2a
|
||||
size 17107955
|
||||
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue May 28 12:46:14 UTC 2024 - Vasily Ulyanov <vasily.ulyanov@suse.com>
|
||||
|
||||
- Update to version 1.2.1
|
||||
Release notes https://github.com/kubevirt/kubevirt/releases/tag/v1.2.1
|
||||
- Drop upstreamed patch
|
||||
0001-Improve-the-handling-of-ordinal-pod-interface-name-for-upgrade.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Apr 12 05:51:30 UTC 2024 - Vasily Ulyanov <vasily.ulyanov@suse.com>
|
||||
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
%endif
|
||||
|
||||
Name: kubevirt
|
||||
Version: 1.2.0
|
||||
Version: 1.2.1
|
||||
Release: 0
|
||||
Summary: Container native virtualization
|
||||
License: Apache-2.0
|
||||
@ -41,7 +41,6 @@ Source1: kubevirt_containers_meta
|
||||
Source2: kubevirt_containers_meta.service
|
||||
Source3: %{url}/releases/download/v%{version}/disks-images-provider.yaml
|
||||
Source100: %{name}-rpmlintrc
|
||||
Patch1: 0001-Improve-the-handling-of-ordinal-pod-interface-name-for-upgrade.patch
|
||||
BuildRequires: glibc-devel-static
|
||||
BuildRequires: golang-packaging
|
||||
BuildRequires: pkgconfig
|
||||
|
||||
Loading…
Reference in New Issue
Block a user