ovs: Fix ovs cni bumper and bump ovs-cni (#1822)

Since the image repository was changed, the scripts had to be updated. Signed-off-by: Or Shoval <[email protected]>
kubevirt · Jul 3, 2024 · bd3cc37 · bd3cc37
1 parent f978f94
commit bd3cc37
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/components.yaml b/components.yaml
@@ -49,7 +49,7 @@ components:
     metadata: v0.3.3
   ovs-cni:
     url: https://github.com/k8snetworkplumbingwg/ovs-cni
-    commit: 70e52f712649faa640361fe38bf76328356136d8
+    commit: 86f45a9f291cd99660ab96f8692674692c53fbd2
     branch: main
     update-policy: tagged
-    metadata: v0.32.0
+    metadata: v0.34.0
diff --git a/hack/components/bump-ovs-cni.sh b/hack/components/bump-ovs-cni.sh
@@ -108,7 +108,7 @@ cp ${OVS_PATH}/config/cnao/001-ovs-cni.yaml data/ovs/
 OVS_TAG=$(git-utils::get_component_tag ${OVS_PATH})
 
 echo 'Get ovs-cni-plugin image name and update it under CNAO'
-OVS_PLUGIN_IMAGE=quay.io/kubevirt/ovs-cni-plugin
+OVS_PLUGIN_IMAGE=ghcr.io/k8snetworkplumbingwg/ovs-cni-plugin
 OVS_PLUGIN_IMAGE_TAGGED=${OVS_PLUGIN_IMAGE}:${OVS_TAG}
 OVS_PLUGIN_IMAGE_DIGEST="$(docker-utils::get_image_digest "${OVS_PLUGIN_IMAGE_TAGGED}" "${OVS_PLUGIN_IMAGE}")"
 

diff --git a/pkg/components/components.go b/pkg/components/components.go
@@ -35,7 +35,7 @@ const (
 	LinuxBridgeCniImageDefault         = "quay.io/kubevirt/cni-default-plugins@sha256:0c354fa9d695b8cab97b459e8afea2f7662407a987e83f6f6f1a8af4b45726be"
 	LinuxBridgeMarkerImageDefault      = "quay.io/kubevirt/bridge-marker@sha256:bba066e3b5ff3fb8c5e20861fe8abe51e3c9b50ad6ce3b2616af9cb5479a06d0"
 	KubeMacPoolImageDefault            = "quay.io/kubevirt/kubemacpool@sha256:20e156be33e6d3692c456081acbb91a4349f94de448f7d1f1cddd0228931b31f"
-	OvsCniImageDefault                 = "quay.io/kubevirt/ovs-cni-plugin@sha256:e16ac74343da21abb8fb668ce71e728053d00503a992dae2164b9e94a280113e"
+	OvsCniImageDefault                 = "ghcr.io/k8snetworkplumbingwg/ovs-cni-plugin@sha256:d58c57ded428d672d455b338c202c67f17e37631d46d7e0831d7304edfd62ad2"
 	MacvtapCniImageDefault             = "quay.io/kubevirt/macvtap-cni@sha256:850b89343ace7c7ea6b18dd8e11964613974e9d1f7377af03854d407fb15230a"
 	KubeRbacProxyImageDefault          = "quay.io/openshift/origin-kube-rbac-proxy@sha256:e2def4213ec0657e72eb790ae8a115511d5b8f164a62d3568d2f1bff189917e8"
 	KubeSecondaryDNSImageDefault       = "ghcr.io/kubevirt/kubesecondarydns@sha256:6268d84154e2483fbce8c1adacbdaf6f0839117b2d48d9fa4687cc8f76bd5130"

diff --git a/test/releases/99.0.0.go b/test/releases/99.0.0.go
@@ -60,13 +60,13 @@ func init() {
 				ParentName: "ovs-cni-amd64",
 				ParentKind: "DaemonSet",
 				Name:       "ovs-cni-plugin",
-				Image:      "quay.io/kubevirt/ovs-cni-plugin@sha256:e16ac74343da21abb8fb668ce71e728053d00503a992dae2164b9e94a280113e",
+				Image:      "ghcr.io/k8snetworkplumbingwg/ovs-cni-plugin@sha256:d58c57ded428d672d455b338c202c67f17e37631d46d7e0831d7304edfd62ad2",
 			},
 			{
 				ParentName: "ovs-cni-amd64",
 				ParentKind: "DaemonSet",
 				Name:       "ovs-cni-marker",
-				Image:      "quay.io/kubevirt/ovs-cni-plugin@sha256:e16ac74343da21abb8fb668ce71e728053d00503a992dae2164b9e94a280113e",
+				Image:      "ghcr.io/k8snetworkplumbingwg/ovs-cni-plugin@sha256:d58c57ded428d672d455b338c202c67f17e37631d46d7e0831d7304edfd62ad2",
 			},
 			{
 				ParentName: "secondary-dns",