fcos: Upgrade etcd to v3.4.6, use quay.io/coreos/etcd

The tags on quay.io/coreos/etcd follow the same format as
https://github.com/etcd-io/etcd/releases compared to k8s.gcr.io which
modifies the canonical version tag by dropping the "v" prefix.

Story: 2007475
Task: 39184

Change-Id: If44eb55a68c13f8e1706242c099578ed1f264d62
This commit is contained in:
Bharat Kunwar 2020-03-30 08:36:47 +00:00
parent 4439295aba
commit d3984dd4c2
4 changed files with 16 additions and 5 deletions

View File

@ -1188,7 +1188,7 @@ _`container_infra_prefix`
Images that must be mirrored:
* docker.io/coredns/coredns
* docker.io/openstackmagnum/etcd
* quay.io/coreos/etcd
* docker.io/openstackmagnum/flannel
* docker.io/openstackmagnum/kubernetes-apiserver
* docker.io/openstackmagnum/kubernetes-controller-manager
@ -1270,9 +1270,11 @@ _`cloud_provider_tag`
_`etcd_tag`
This label allows users to select `a specific etcd version,
based on its container tag
<https://hub.docker.com/r/openstackmagnum/etcd/tags/>`_.
<https://quay.io/repository/coreos/etcd?tab=tags>`_.
If unset, the current Magnum version's a default etcd version.
For queens, v3.2.7
Stein default: v3.2.7
Train default: 3.2.26
Ussuri default: v3.4.6
_`coredns_tag`
This label allows users to select `a specific coredns version,

View File

@ -66,7 +66,7 @@ ExecStart=/bin/podman run \\
--volume /etc/etcd:/etc/etcd:ro,z \\
--volume /var/lib/etcd:/var/lib/etcd:rshared,z \\
--net=host \\
${CONTAINER_INFRA_PREFIX:-"k8s.gcr.io/"}etcd:${ETCD_TAG} \\
${CONTAINER_INFRA_PREFIX:-"quay.io/coreos/"}etcd:${ETCD_TAG} \\
/usr/local/bin/etcd \\
--config-file /etc/etcd/etcd.conf.yaml
ExecStop=/bin/podman stop etcd

View File

@ -469,7 +469,7 @@ parameters:
etcd_tag:
type: string
description: tag of the etcd system container
default: 3.2.26
default: v3.4.6
coredns_tag:
type: string

View File

@ -0,0 +1,9 @@
---
upgrade:
- |
Upgrade etcd to v3.4.6 and use quay.io/coreos/etcd since the tags on follow
the same format as https://github.com/etcd-io/etcd/releases compared to
k8s.gcr.io which modifies the canonical version tag. Users will need to pay
attention to the format of etcd_tag, e.g. v3.4.5 is valid whereas 3.4.5 is
not. Existing cluster templates and clusters which which use the latter will
fail to complete.