Update linux-bridge component commit to plugin v1.5.1 by ashokpariya0 · Pull Request #1950 · kubevirt/cluster-network-addons-operator

ashokpariya0 · 2024-12-16T15:22:41Z

These changes will allow us to bump the linux-bridge component whenever a new tag is available.

What this PR does / why we need it:
Bump the commit to use the tag [v1.5.1](https://github.com/containernetworking/plugins/releases/tag/v1.5.1).

Special notes for your reviewer:
Please note that or the latest tags, v1.6.0 and v1.6.1, we need Go version 1.23.

I have created a PR for the changes mentioned above: [PR #1953](#1953). Once this PR is merged, we can update the strategy from static to tagged.

Here is some additional context:
As discussed in the PR #1767, it was necessary to change the update-policy of the linux-bridge component from static to tagged once a new tag is available in containernetworking/plugins. However, it appears that the update-policy is still set to static in this file.

I assume that with the tagged policy, the bump script will be triggered and will use the latest tag from https://github.com/containernetworking/plugins/tags. It will then push the new images to quay.io/kubevirt/cni-default-plugins.

Release note:

None

kubevirt-bot · 2024-12-16T15:22:51Z

Hi @ashokpariya0. Thanks for your PR.

PRs from untrusted users cannot be marked as trusted with /ok-to-test in this repo meaning untrusted PR authors can never trigger tests themselves. Collaborators can still trigger tests on the PR using /test all.

I understand the commands that are listed here.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

oshoval

you need to change to tagged only please as far as i remember
the rest is done by the auto bumper

all the other required PRs are merged right ?

oshoval · 2024-12-16T15:27:32Z

for sanity check, you can run with the PR you have now (or latest version better)
CNAO_VERSION=99.0.0 ./hack/components/bump-linux-bridge.sh

and let CI test it, without merging that
better before this PR is merged please (and then revert to the change suggested above, this is just temp test)

ashokpariya0 · 2024-12-16T15:47:43Z

for sanity check, you can run with the PR you have now (or latest version better) CNAO_VERSION=99.0.0 ./hack/components/bump-linux-bridge.sh

I see that for the latest tags like v1.6.x (v1.6.0 release), Go version 1.23 is required. However, by default, Go version 1.22.7 is installed. This will require code changes in the Dockerfile.

and let CI test it, without merging that better before this PR is merged please (and then revert to the change suggested above, this is just temp test)

Sure

oshoval · 2024-12-17T06:47:44Z

once you put tagged, and with the current state, the only bump that will occur is directly to latest tagged release
it wont obey the values in the file (iirc)
so we can either static (need to recall who push the images in this case, unless it is the auto bumper)
or to adapt docker and use latest (best if possible please)

EDIT - need to make sure before that, that we can move to go 1.23

ashokpariya0 · 2024-12-17T07:00:22Z

once you put tagged, and with the current state, the only bump that will occur is directly to latest tagged release it wont obey the values in the file (iirc) so we can either static (need to recall who push the images in this case, unless it is the auto bumper) or to adapt docker and use latest (best if possible please)

EDIT - need to make sure before that, that we can move to go 1.23

Sure, I will post pr soon, I see few complexities for this, will provide details over pr.

oshoval · 2024-12-17T07:05:08Z

I would say lets go please with the straight forward path first, which is static, with the hash that you used,
like Or Mergi did (i just dont remember who create and push the images in this case)
follow-up can be described in an issue

Thanks

ashokpariya0 · 2024-12-17T10:47:44Z

We need to merge the following PR to use the latest tag from the plugin: #1953

oshoval · 2024-12-17T10:51:35Z

Thanks, it can wait for the follow-up
for now lets do please the "static" method ?
(because we would need to check if using newer golang now is allowed before doing #1953)

ashokpariya0 · 2024-12-17T11:10:08Z

Thanks, it can wait for the follow-up for now lets do please the "static" method ? (because we would need to check if using newer golang now is allowed before doing #1953)

I'm not sure if I understand correctly, but with the current code, we can't compile the plugin using the latest code tags (e.g., https://github.com/containernetworking/plugins/releases/tag/v1.6.1 and https://github.com/containernetworking/plugins/releases/tag/v1.6.0) because they require Go >= 1.23.

Are you suggesting that we don't need to use the latest code and can instead use the tag https://github.com/containernetworking/plugins/releases/tag/v1.5.1, which works with Go 1.22, and then manually create the image at https://quay.io/repository/kubevirt/cni-default-plugins?tab=tags&tag=latest, posting the change with a static method?

oshoval · 2024-12-17T11:14:31Z

Are you suggesting that we don't need to use the latest code and can instead use the tag https://github.com/containernetworking/plugins/releases/tag/v1.5.1, which works with Go 1.22, and then manually create the image at https://quay.io/repository/kubevirt/cni-default-plugins?tab=tags&tag=latest, posting the change with a static method?

Yep exactly, we just need a recompilation, we don't need all at once atm
i am not sure who build and pushed the image, please ask Or Mergi
if he remember (since he also done like) or on kubevirt slack

alternative is to ask on slack if we can use newest go as you did
I will post this if needed next week on slack, unless you can lead it please meanwhile

Thanks

oshoval · 2024-12-17T11:29:49Z

Will be nice to unblock you, hence the first option might be easier and faster

oshoval · 2025-01-06T11:07:22Z

Hi, all the required PRs are merged ?
so once we ask to build using this one, it will be multi arch
Thanks

ashokpariya0 · 2025-01-06T11:18:01Z

Hi, all the required PRs are merged ? so once we ask to build using this one, it will be multi arch Thanks

Yes, all the PRs have been merged. We can proceed with building the image using this PR

phoracek · 2025-01-06T16:52:55Z

I built a new image using this branch: https://quay.io/repository/kubevirt/cni-default-plugins?tab=tags

PUSH_IMAGES=true make bump-linux-bridge

@ashokpariya0 would you please add these changes to your PR, to pick up the new image?

diff --git a/pkg/components/components.go b/pkg/components/components.go
index 0a97dbb0..29a2c328 100644
--- a/pkg/components/components.go
+++ b/pkg/components/components.go
@@ -32,7 +32,7 @@ var (
 const (
 	MultusImageDefault                 = "ghcr.io/k8snetworkplumbingwg/multus-cni@sha256:16030e8320088cf74dc5fbc7dccfea40169f09722dfad15765fa28bceb8de439"
 	MultusDynamicNetworksImageDefault  = "ghcr.io/k8snetworkplumbingwg/multus-dynamic-networks-controller@sha256:0bdf7dc9c15bdf7e5760955f05077c23868f3421141e8e623d75cf6b8cf36247"
-	LinuxBridgeCniImageDefault         = "quay.io/kubevirt/cni-default-plugins@sha256:0c354fa9d695b8cab97b459e8afea2f7662407a987e83f6f6f1a8af4b45726be"
+	LinuxBridgeCniImageDefault         = "quay.io/kubevirt/cni-default-plugins@sha256:976a24392c2a096c38c2663d234b2d3131f5c24558889196d30b9ac1b6716788"
 	LinuxBridgeMarkerImageDefault      = "quay.io/kubevirt/bridge-marker@sha256:e492ca4a6d1234781928aedefb096941d95babee4116baaba4d2a3834813826a"
 	KubeMacPoolImageDefault            = "quay.io/kubevirt/kubemacpool@sha256:eebb65b8a12cbfc20a429bbba399eb5a5c2279f8613c36965957ee7c36cfcbd6"
 	OvsCniImageDefault                 = "ghcr.io/k8snetworkplumbingwg/ovs-cni-plugin@sha256:d088e47f181007fe4823f0384ebae071950d105cd36c9187f9d06fd815288990"
diff --git a/test/releases/99.0.0.go b/test/releases/99.0.0.go
index 4d115711..c55f845f 100644
--- a/test/releases/99.0.0.go
+++ b/test/releases/99.0.0.go
@@ -36,7 +36,7 @@ func init() {
 				ParentName: "kube-cni-linux-bridge-plugin",
 				ParentKind: "DaemonSet",
 				Name:       "cni-plugins",
-				Image:      "quay.io/kubevirt/cni-default-plugins@sha256:0c354fa9d695b8cab97b459e8afea2f7662407a987e83f6f6f1a8af4b45726be",
+				Image:      "quay.io/kubevirt/cni-default-plugins@sha256:976a24392c2a096c38c2663d234b2d3131f5c24558889196d30b9ac1b6716788",
 			},
 			{
 				ParentName: "kubemacpool-mac-controller-manager",

These changes will enable us to use the containernetworking plugin tag v1.5.1. Signed-off-by: Ashok Pariya <ashok.pariya@ibm.com>

sonarqubecloud · 2025-01-07T04:17:55Z

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

ashokpariya0 · 2025-01-07T04:19:02Z

I built a new image using this branch: https://quay.io/repository/kubevirt/cni-default-plugins?tab=tags

PUSH_IMAGES=true make bump-linux-bridge

@ashokpariya0 would you please add these changes to your PR, to pick up the new image?

diff --git a/pkg/components/components.go b/pkg/components/components.go
index 0a97dbb0..29a2c328 100644
--- a/pkg/components/components.go
+++ b/pkg/components/components.go
@@ -32,7 +32,7 @@ var (
 const (
 	MultusImageDefault                 = "ghcr.io/k8snetworkplumbingwg/multus-cni@sha256:16030e8320088cf74dc5fbc7dccfea40169f09722dfad15765fa28bceb8de439"
 	MultusDynamicNetworksImageDefault  = "ghcr.io/k8snetworkplumbingwg/multus-dynamic-networks-controller@sha256:0bdf7dc9c15bdf7e5760955f05077c23868f3421141e8e623d75cf6b8cf36247"
-	LinuxBridgeCniImageDefault         = "quay.io/kubevirt/cni-default-plugins@sha256:0c354fa9d695b8cab97b459e8afea2f7662407a987e83f6f6f1a8af4b45726be"
+	LinuxBridgeCniImageDefault         = "quay.io/kubevirt/cni-default-plugins@sha256:976a24392c2a096c38c2663d234b2d3131f5c24558889196d30b9ac1b6716788"
 	LinuxBridgeMarkerImageDefault      = "quay.io/kubevirt/bridge-marker@sha256:e492ca4a6d1234781928aedefb096941d95babee4116baaba4d2a3834813826a"
 	KubeMacPoolImageDefault            = "quay.io/kubevirt/kubemacpool@sha256:eebb65b8a12cbfc20a429bbba399eb5a5c2279f8613c36965957ee7c36cfcbd6"
 	OvsCniImageDefault                 = "ghcr.io/k8snetworkplumbingwg/ovs-cni-plugin@sha256:d088e47f181007fe4823f0384ebae071950d105cd36c9187f9d06fd815288990"
diff --git a/test/releases/99.0.0.go b/test/releases/99.0.0.go
index 4d115711..c55f845f 100644
--- a/test/releases/99.0.0.go
+++ b/test/releases/99.0.0.go
@@ -36,7 +36,7 @@ func init() {
 				ParentName: "kube-cni-linux-bridge-plugin",
 				ParentKind: "DaemonSet",
 				Name:       "cni-plugins",
-				Image:      "quay.io/kubevirt/cni-default-plugins@sha256:0c354fa9d695b8cab97b459e8afea2f7662407a987e83f6f6f1a8af4b45726be",
+				Image:      "quay.io/kubevirt/cni-default-plugins@sha256:976a24392c2a096c38c2663d234b2d3131f5c24558889196d30b9ac1b6716788",
 			},
 			{
 				ParentName: "kubemacpool-mac-controller-manager",

Thanks, Done

oshoval · 2025-01-07T07:08:28Z

Thanks you both

/test all

oshoval · 2025-01-07T08:58:58Z

/lgtm
/approve

kubevirt-bot · 2025-01-07T08:59:13Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: oshoval

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [oshoval]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

kubevirt-bot added release-note-none Denotes a PR that doesn't merit a release note. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. labels Dec 16, 2024

kubevirt-bot added the size/XS label Dec 16, 2024

kubevirt-bot requested review from oshoval and qinqon December 16, 2024 15:23

ashokpariya0 mentioned this pull request Dec 16, 2024

Update the linux-bridge component's update-policy from static to tagged. #1937

Closed

oshoval reviewed Dec 16, 2024

View reviewed changes

ashokpariya0 force-pushed the update-linux-bridge-update-policy branch 2 times, most recently from 4aa40dd to 25696a9 Compare January 2, 2025 11:48

ashokpariya0 changed the title ~~Change update strategy of linux-bridge component from static to tagged.~~ Update linux-bridge component commit to plugin v1.5.1 Jan 2, 2025

ashokpariya0 mentioned this pull request Jan 6, 2025

Enable multi-architecture support, specifically for s390x, in CNAO and the associated CNIs. #1916

Closed

Update linux-bridge component commit.

3b23588

These changes will enable us to use the containernetworking plugin tag v1.5.1. Signed-off-by: Ashok Pariya <ashok.pariya@ibm.com>

ashokpariya0 force-pushed the update-linux-bridge-update-policy branch from 25696a9 to 3b23588 Compare January 7, 2025 04:17

kubevirt-bot assigned oshoval Jan 7, 2025

kubevirt-bot added the lgtm Indicates that a PR is ready to be merged. label Jan 7, 2025

kubevirt-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 7, 2025

kubevirt-bot merged commit 30d55f7 into kubevirt:main Jan 7, 2025

Conversation

ashokpariya0 commented Dec 16, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

kubevirt-bot commented Dec 16, 2024

Uh oh!

oshoval left a comment

Choose a reason for hiding this comment

Uh oh!

oshoval commented Dec 16, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ashokpariya0 commented Dec 16, 2024

Uh oh!

oshoval commented Dec 17, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ashokpariya0 commented Dec 17, 2024

Uh oh!

oshoval commented Dec 17, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ashokpariya0 commented Dec 17, 2024

Uh oh!

oshoval commented Dec 17, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ashokpariya0 commented Dec 17, 2024

Uh oh!

oshoval commented Dec 17, 2024

Uh oh!

oshoval commented Dec 17, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

oshoval commented Jan 6, 2025

Uh oh!

ashokpariya0 commented Jan 6, 2025

Uh oh!

phoracek commented Jan 6, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

sonarqubecloud Bot commented Jan 7, 2025

Quality Gate passed

Uh oh!

ashokpariya0 commented Jan 7, 2025

Uh oh!

oshoval commented Jan 7, 2025

Uh oh!

oshoval commented Jan 7, 2025

Uh oh!

kubevirt-bot commented Jan 7, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

ashokpariya0 commented Dec 16, 2024 •

edited

Loading

oshoval commented Dec 16, 2024 •

edited

Loading

oshoval commented Dec 17, 2024 •

edited

Loading

oshoval commented Dec 17, 2024 •

edited

Loading

oshoval commented Dec 17, 2024 •

edited

Loading

oshoval commented Dec 17, 2024 •

edited

Loading

phoracek commented Jan 6, 2025 •

edited

Loading