From 1a5949824ca3d9648a1058f94c07366097cd4f68 Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Wed, 4 Aug 2021 21:47:32 -0700 Subject: [PATCH] Update etcd from v3.4.16 to v3.5.0 * Use multi-arch container image instead of a special "-arm64" suffix on arm64 * https://github.com/etcd-io/etcd/releases/tag/v3.5.0 --- aws/fedora-coreos/kubernetes/controllers.tf | 1 - aws/fedora-coreos/kubernetes/fcc/controller.yaml | 2 +- aws/flatcar-linux/kubernetes/cl/controller.yaml | 2 +- azure/fedora-coreos/kubernetes/fcc/controller.yaml | 2 +- azure/flatcar-linux/kubernetes/cl/controller.yaml | 2 +- bare-metal/fedora-coreos/kubernetes/fcc/controller.yaml | 2 +- bare-metal/flatcar-linux/kubernetes/cl/controller.yaml | 2 +- digital-ocean/fedora-coreos/kubernetes/fcc/controller.yaml | 2 +- digital-ocean/flatcar-linux/kubernetes/cl/controller.yaml | 2 +- google-cloud/fedora-coreos/kubernetes/fcc/controller.yaml | 2 +- google-cloud/flatcar-linux/kubernetes/cl/controller.yaml | 2 +- 11 files changed, 10 insertions(+), 11 deletions(-) diff --git a/aws/fedora-coreos/kubernetes/controllers.tf b/aws/fedora-coreos/kubernetes/controllers.tf index 6744b361..f7e6e626 100644 --- a/aws/fedora-coreos/kubernetes/controllers.tf +++ b/aws/fedora-coreos/kubernetes/controllers.tf @@ -62,7 +62,6 @@ data "template_file" "controller-configs" { vars = { # Cannot use cyclic dependencies on controllers or their DNS records - etcd_arch = var.arch == "arm64" ? "-arm64" : "" etcd_name = "etcd${count.index}" etcd_domain = "${var.cluster_name}-etcd${count.index}.${var.dns_zone}" # etcd0=https://cluster-etcd0.example.com,etcd1=https://cluster-etcd1.example.com,... diff --git a/aws/fedora-coreos/kubernetes/fcc/controller.yaml b/aws/fedora-coreos/kubernetes/fcc/controller.yaml index 9eb82ad0..f6975f84 100644 --- a/aws/fedora-coreos/kubernetes/fcc/controller.yaml +++ b/aws/fedora-coreos/kubernetes/fcc/controller.yaml @@ -12,7 +12,7 @@ systemd: Wants=network-online.target network.target After=network-online.target [Service] - Environment=ETCD_IMAGE=quay.io/coreos/etcd:v3.4.16${etcd_arch} + Environment=ETCD_IMAGE=quay.io/coreos/etcd:v3.5.0 Type=exec ExecStartPre=/bin/mkdir -p /var/lib/etcd ExecStartPre=-/usr/bin/podman rm etcd diff --git a/aws/flatcar-linux/kubernetes/cl/controller.yaml b/aws/flatcar-linux/kubernetes/cl/controller.yaml index 35cc1d5b..d96c1d0a 100644 --- a/aws/flatcar-linux/kubernetes/cl/controller.yaml +++ b/aws/flatcar-linux/kubernetes/cl/controller.yaml @@ -10,7 +10,7 @@ systemd: Requires=docker.service After=docker.service [Service] - Environment=ETCD_IMAGE=quay.io/coreos/etcd:v3.4.16 + Environment=ETCD_IMAGE=quay.io/coreos/etcd:v3.5.0 ExecStartPre=/usr/bin/docker run -d \ --name etcd \ --network host \ diff --git a/azure/fedora-coreos/kubernetes/fcc/controller.yaml b/azure/fedora-coreos/kubernetes/fcc/controller.yaml index 29229b5b..b3867b2d 100644 --- a/azure/fedora-coreos/kubernetes/fcc/controller.yaml +++ b/azure/fedora-coreos/kubernetes/fcc/controller.yaml @@ -12,7 +12,7 @@ systemd: Wants=network-online.target network.target After=network-online.target [Service] - Environment=ETCD_IMAGE=quay.io/coreos/etcd:v3.4.16 + Environment=ETCD_IMAGE=quay.io/coreos/etcd:v3.5.0 Type=exec ExecStartPre=/bin/mkdir -p /var/lib/etcd ExecStartPre=-/usr/bin/podman rm etcd diff --git a/azure/flatcar-linux/kubernetes/cl/controller.yaml b/azure/flatcar-linux/kubernetes/cl/controller.yaml index 300a3603..8bfd5479 100644 --- a/azure/flatcar-linux/kubernetes/cl/controller.yaml +++ b/azure/flatcar-linux/kubernetes/cl/controller.yaml @@ -10,7 +10,7 @@ systemd: Requires=docker.service After=docker.service [Service] - Environment=ETCD_IMAGE=quay.io/coreos/etcd:v3.4.16 + Environment=ETCD_IMAGE=quay.io/coreos/etcd:v3.5.0 ExecStartPre=/usr/bin/docker run -d \ --name etcd \ --network host \ diff --git a/bare-metal/fedora-coreos/kubernetes/fcc/controller.yaml b/bare-metal/fedora-coreos/kubernetes/fcc/controller.yaml index e0214da8..37ae47df 100644 --- a/bare-metal/fedora-coreos/kubernetes/fcc/controller.yaml +++ b/bare-metal/fedora-coreos/kubernetes/fcc/controller.yaml @@ -12,7 +12,7 @@ systemd: Wants=network-online.target network.target After=network-online.target [Service] - Environment=ETCD_IMAGE=quay.io/coreos/etcd:v3.4.16 + Environment=ETCD_IMAGE=quay.io/coreos/etcd:v3.5.0 Type=exec ExecStartPre=/bin/mkdir -p /var/lib/etcd ExecStartPre=-/usr/bin/podman rm etcd diff --git a/bare-metal/flatcar-linux/kubernetes/cl/controller.yaml b/bare-metal/flatcar-linux/kubernetes/cl/controller.yaml index ef941127..4e7175ad 100644 --- a/bare-metal/flatcar-linux/kubernetes/cl/controller.yaml +++ b/bare-metal/flatcar-linux/kubernetes/cl/controller.yaml @@ -10,7 +10,7 @@ systemd: Requires=docker.service After=docker.service [Service] - Environment=ETCD_IMAGE=quay.io/coreos/etcd:v3.4.16 + Environment=ETCD_IMAGE=quay.io/coreos/etcd:v3.5.0 ExecStartPre=/usr/bin/docker run -d \ --name etcd \ --network host \ diff --git a/digital-ocean/fedora-coreos/kubernetes/fcc/controller.yaml b/digital-ocean/fedora-coreos/kubernetes/fcc/controller.yaml index 408f9e12..a8368f2b 100644 --- a/digital-ocean/fedora-coreos/kubernetes/fcc/controller.yaml +++ b/digital-ocean/fedora-coreos/kubernetes/fcc/controller.yaml @@ -12,7 +12,7 @@ systemd: Wants=network-online.target network.target After=network-online.target [Service] - Environment=ETCD_IMAGE=quay.io/coreos/etcd:v3.4.16 + Environment=ETCD_IMAGE=quay.io/coreos/etcd:v3.5.0 Type=exec ExecStartPre=/bin/mkdir -p /var/lib/etcd ExecStartPre=-/usr/bin/podman rm etcd diff --git a/digital-ocean/flatcar-linux/kubernetes/cl/controller.yaml b/digital-ocean/flatcar-linux/kubernetes/cl/controller.yaml index e67f73cf..aa08ad92 100644 --- a/digital-ocean/flatcar-linux/kubernetes/cl/controller.yaml +++ b/digital-ocean/flatcar-linux/kubernetes/cl/controller.yaml @@ -10,7 +10,7 @@ systemd: Requires=docker.service After=docker.service [Service] - Environment=ETCD_IMAGE=quay.io/coreos/etcd:v3.4.16 + Environment=ETCD_IMAGE=quay.io/coreos/etcd:v3.5.0 ExecStartPre=/usr/bin/docker run -d \ --name etcd \ --network host \ diff --git a/google-cloud/fedora-coreos/kubernetes/fcc/controller.yaml b/google-cloud/fedora-coreos/kubernetes/fcc/controller.yaml index bd491634..380b4942 100644 --- a/google-cloud/fedora-coreos/kubernetes/fcc/controller.yaml +++ b/google-cloud/fedora-coreos/kubernetes/fcc/controller.yaml @@ -12,7 +12,7 @@ systemd: Wants=network-online.target network.target After=network-online.target [Service] - Environment=ETCD_IMAGE=quay.io/coreos/etcd:v3.4.16 + Environment=ETCD_IMAGE=quay.io/coreos/etcd:v3.5.0 Type=exec ExecStartPre=/bin/mkdir -p /var/lib/etcd ExecStartPre=-/usr/bin/podman rm etcd diff --git a/google-cloud/flatcar-linux/kubernetes/cl/controller.yaml b/google-cloud/flatcar-linux/kubernetes/cl/controller.yaml index e3024823..5e795423 100644 --- a/google-cloud/flatcar-linux/kubernetes/cl/controller.yaml +++ b/google-cloud/flatcar-linux/kubernetes/cl/controller.yaml @@ -10,7 +10,7 @@ systemd: Requires=docker.service After=docker.service [Service] - Environment=ETCD_IMAGE=quay.io/coreos/etcd:v3.4.16 + Environment=ETCD_IMAGE=quay.io/coreos/etcd:v3.5.0 ExecStartPre=/usr/bin/docker run -d \ --name etcd \ --network host \