openstack
/
magnum
Code Issues Proposed changes

Merge "fcos: Upgrade default flannel_tag to v0.12.0-amd64"

This commit is contained in:
Zuul 2020-04-01 10:45:09 +00:00 committed by Gerrit Code Review
parent 3f7aaccc15 4a1c6eb17c
commit 0fffdd1956
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
doc/source/user/index.rst
View File

@ -1189,7 +1189,6 @@ _`container_infra_prefix`
* docker.io/coredns/coredns * docker.io/coredns/coredns
* quay.io/coreos/etcd * quay.io/coreos/etcd
* docker.io/openstackmagnum/flannel
* docker.io/openstackmagnum/kubernetes-apiserver * docker.io/openstackmagnum/kubernetes-apiserver
* docker.io/openstackmagnum/kubernetes-controller-manager * docker.io/openstackmagnum/kubernetes-controller-manager
* docker.io/openstackmagnum/kubernetes-kubelet * docker.io/openstackmagnum/kubernetes-kubelet
@ -1219,6 +1218,8 @@ _`container_infra_prefix`
* quay.io/calico/pod2daemon-flexvol:v3.13.1 * quay.io/calico/pod2daemon-flexvol:v3.13.1
* quay.io/calico/kube-controllers:v3.13.1 * quay.io/calico/kube-controllers:v3.13.1
* quay.io/calico/node:v3.13.1 * quay.io/calico/node:v3.13.1
* quay.io/coreos/flannel-cni:v0.3.0
* quay.io/coreos/flannel:v0.12.0-amd64
Images that might be needed if 'cinder_csi_enabled' is 'true': Images that might be needed if 'cinder_csi_enabled' is 'true':
* docker.io/k8scloudprovider/cinder-csi-plugin:v1.16.0 * docker.io/k8scloudprovider/cinder-csi-plugin:v1.16.0
@ -1291,8 +1292,9 @@ _`flannel_tag`
Queens <https://hub.docker.com/r/openstackmagnum/flannel/tags/>`_ Queens <https://hub.docker.com/r/openstackmagnum/flannel/tags/>`_
Rocky <https://quay.io/repository/coreos/flannel?tab=tags>`_ Rocky <https://quay.io/repository/coreos/flannel?tab=tags>`_
If unset, the default version will be used. If unset, the default version will be used.
For queens, v0.9.0 Stein default: v0.10.0-amd64
For stein, v0.10.0-amd64 Train default: v0.11.0-amd64
Ussuri default: v0.12.0-amd64
_`flannel_cni_tag` _`flannel_cni_tag`
This label allows users to select `a specific flannel_cni version, This label allows users to select `a specific flannel_cni version,
@ -1300,7 +1302,9 @@ _`flannel_cni_tag`
the host under /opt/cni/bin the host under /opt/cni/bin
<https://quay.io/repository/coreos/flannel-cni?tab=tags>`_. <https://quay.io/repository/coreos/flannel-cni?tab=tags>`_.
If unset, the current Magnum version's a default flannel version. If unset, the current Magnum version's a default flannel version.
For stein, v0.3.0 Stein default: v0.3.0
Train default: v0.3.0
Ussuri default: v0.3.0
_`heat_container_agent_tag` _`heat_container_agent_tag`
This label allows users to select `a specific heat_container_agent This label allows users to select `a specific heat_container_agent

2
magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml
View File

@ -479,7 +479,7 @@ parameters:
flannel_tag: flannel_tag:
type: string type: string
description: tag of the flannel container description: tag of the flannel container
default: v0.11.0-amd64 default: v0.12.0-amd64
flannel_cni_tag: flannel_cni_tag:
type: string type: string

4
releasenotes/notes/upgrade-flannel-db5ef049e23fc4a8.yaml Normal file
View File

@ -0,0 +1,4 @@
---
upgrade:
- |
Upgrade flannel version to v0.12.0-amd64 for Fedora CoreOS driver.