Skip to content

Commit

Permalink
Update multus to 3.7.2 (and move to ghcr.io)
Browse files Browse the repository at this point in the history
  • Loading branch information
floryut authored and k8s-ci-robot committed Jul 20, 2021
1 parent ed87386 commit 18666b3
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions inventory/sample/group_vars/all/offline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"

Expand Down
7 changes: 5 additions & 2 deletions roles/download/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down Expand Up @@ -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 }}"
Expand Down

0 comments on commit 18666b3

Please sign in to comment.