From 18666b3e2d1f418ee523a7165df8b6bb098aec5d Mon Sep 17 00:00:00 2001
From: Florian Ruynat <16313165+floryut@users.noreply.github.com>
Date: Thu, 15 Jul 2021 12:07:46 +0200
Subject: [PATCH] Update multus to 3.7.2 (and move to ghcr.io)
---
README.md | 2 +-
inventory/sample/group_vars/all/offline.yml | 1 +
roles/download/defaults/main.yml | 7 +++++--
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/README.md b/README.md
index 07b443d0a..be7f5b263 100644
--- a/README.md
+++ b/README.md
@@ -143,7 +143,7 @@ Note: Upstart/SysV init based OS types are not supported.
- [flanneld](https://github.com/flannel-io/flannel) v0.14.0
- [kube-ovn](https://github.com/alauda/kube-ovn) v1.7.1
- [kube-router](https://github.com/cloudnativelabs/kube-router) v1.3.0
- - [multus](https://github.com/intel/multus-cni) v3.7.0
+ - [multus](https://github.com/intel/multus-cni) v3.7.2
- [ovn4nfv](https://github.com/opnfv/ovn4nfv-k8s-plugin) v1.1.0
- [weave](https://github.com/weaveworks/weave) v2.8.1
- Application
diff --git a/inventory/sample/group_vars/all/offline.yml b/inventory/sample/group_vars/all/offline.yml
index 1a559d543..3320ad49e 100644
--- a/inventory/sample/group_vars/all/offline.yml
+++ b/inventory/sample/group_vars/all/offline.yml
@@ -13,6 +13,7 @@
## Container Registry overrides
# kube_image_repo: "{{ registry_host }}"
# gcr_image_repo: "{{ registry_host }}"
+# github_image_repo: "{{ registry_host }}"
# docker_image_repo: "{{ registry_host }}"
# quay_image_repo: "{{ registry_host }}"
diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
index 74d036d7b..5693aaa30 100644
--- a/roles/download/defaults/main.yml
+++ b/roles/download/defaults/main.yml
@@ -65,6 +65,9 @@ docker_image_repo: "docker.io"
# quay image repo define
quay_image_repo: "quay.io"
+# github image repo define (ex multus only use that)
+github_image_repo: "ghcr.io"
+
# TODO(mattymo): Move calico versions to roles/network_plugins/calico/defaults
# after migration to container download
calico_version: "v3.18.4"
@@ -82,7 +85,7 @@ pod_infra_version: "3.3"
cilium_version: "v1.8.9"
kube_ovn_version: "v1.7.0"
kube_router_version: "v1.3.0"
-multus_version: "v3.7"
+multus_version: "v3.7.2"
ovn4nfv_ovn_image_version: "v1.0.0"
ovn4nfv_k8s_plugin_image_version: "v1.1.0"
helm_version: "v3.6.3"
@@ -554,7 +557,7 @@ kube_ovn_container_image_repo: "{{ docker_image_repo }}/kubeovn/kube-ovn"
kube_ovn_container_image_tag: "{{ kube_ovn_version }}"
kube_router_image_repo: "{{ docker_image_repo }}/cloudnativelabs/kube-router"
kube_router_image_tag: "{{ kube_router_version }}"
-multus_image_repo: "{{ docker_image_repo }}/nfvpe/multus"
+multus_image_repo: "{{ github_image_repo }}/k8snetworkplumbingwg/multus-cni"
multus_image_tag: "{{ multus_version }}"
ovn4nfv_ovn_image_repo: "{{ docker_image_repo }}/integratedcloudnative/ovn-images"
ovn4nfv_ovn_image_tag: "{{ ovn4nfv_ovn_image_version }}"
--
GitLab