CadolesKube
/
typhoon
mirror of https://github.com/puppetmaster/typhoon.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Dalton Hubble 2021-08-04 21:47:32 -07:00
parent 9bac641511
commit 1a5949824c
11 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
aws/fedora-coreos/kubernetes/controllers.tf
View File

@ -62,7 +62,6 @@ data "template_file" "controller-configs" {
vars = { vars = {
# Cannot use cyclic dependencies on controllers or their DNS records # Cannot use cyclic dependencies on controllers or their DNS records
etcd_arch = var.arch == "arm64" ? "-arm64" : ""
etcd_name = "etcd${count.index}" etcd_name = "etcd${count.index}"
etcd_domain = "${var.cluster_name}-etcd${count.index}.${var.dns_zone}" etcd_domain = "${var.cluster_name}-etcd${count.index}.${var.dns_zone}"
# etcd0=https://cluster-etcd0.example.com,etcd1=https://cluster-etcd1.example.com,... # etcd0=https://cluster-etcd0.example.com,etcd1=https://cluster-etcd1.example.com,...

2
aws/fedora-coreos/kubernetes/fcc/controller.yaml
View File

@ -12,7 +12,7 @@ systemd:
Wants=network-online.target network.target Wants=network-online.target network.target
After=network-online.target After=network-online.target
[Service] [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 Type=exec
ExecStartPre=/bin/mkdir -p /var/lib/etcd ExecStartPre=/bin/mkdir -p /var/lib/etcd
ExecStartPre=-/usr/bin/podman rm etcd ExecStartPre=-/usr/bin/podman rm etcd

2
aws/flatcar-linux/kubernetes/cl/controller.yaml
View File

@ -10,7 +10,7 @@ systemd:
Requires=docker.service Requires=docker.service
After=docker.service After=docker.service
[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 \ ExecStartPre=/usr/bin/docker run -d \
--name etcd \ --name etcd \
--network host \ --network host \

2
azure/fedora-coreos/kubernetes/fcc/controller.yaml
View File

@ -12,7 +12,7 @@ systemd:
Wants=network-online.target network.target Wants=network-online.target network.target
After=network-online.target After=network-online.target
[Service] [Service]
Environment=ETCD_IMAGE=quay.io/coreos/etcd:v3.4.16 Environment=ETCD_IMAGE=quay.io/coreos/etcd:v3.5.0
Type=exec Type=exec
ExecStartPre=/bin/mkdir -p /var/lib/etcd ExecStartPre=/bin/mkdir -p /var/lib/etcd
ExecStartPre=-/usr/bin/podman rm etcd ExecStartPre=-/usr/bin/podman rm etcd

2
azure/flatcar-linux/kubernetes/cl/controller.yaml
View File

@ -10,7 +10,7 @@ systemd:
Requires=docker.service Requires=docker.service
After=docker.service After=docker.service
[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 \ ExecStartPre=/usr/bin/docker run -d \
--name etcd \ --name etcd \
--network host \ --network host \

2
bare-metal/fedora-coreos/kubernetes/fcc/controller.yaml
View File

@ -12,7 +12,7 @@ systemd:
Wants=network-online.target network.target Wants=network-online.target network.target
After=network-online.target After=network-online.target
[Service] [Service]
Environment=ETCD_IMAGE=quay.io/coreos/etcd:v3.4.16 Environment=ETCD_IMAGE=quay.io/coreos/etcd:v3.5.0
Type=exec Type=exec
ExecStartPre=/bin/mkdir -p /var/lib/etcd ExecStartPre=/bin/mkdir -p /var/lib/etcd
ExecStartPre=-/usr/bin/podman rm etcd ExecStartPre=-/usr/bin/podman rm etcd

2
bare-metal/flatcar-linux/kubernetes/cl/controller.yaml
View File

@ -10,7 +10,7 @@ systemd:
Requires=docker.service Requires=docker.service
After=docker.service After=docker.service
[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 \ ExecStartPre=/usr/bin/docker run -d \
--name etcd \ --name etcd \
--network host \ --network host \

2
digital-ocean/fedora-coreos/kubernetes/fcc/controller.yaml
View File

@ -12,7 +12,7 @@ systemd:
Wants=network-online.target network.target Wants=network-online.target network.target
After=network-online.target After=network-online.target
[Service] [Service]
Environment=ETCD_IMAGE=quay.io/coreos/etcd:v3.4.16 Environment=ETCD_IMAGE=quay.io/coreos/etcd:v3.5.0
Type=exec Type=exec
ExecStartPre=/bin/mkdir -p /var/lib/etcd ExecStartPre=/bin/mkdir -p /var/lib/etcd
ExecStartPre=-/usr/bin/podman rm etcd ExecStartPre=-/usr/bin/podman rm etcd

2
digital-ocean/flatcar-linux/kubernetes/cl/controller.yaml
View File

@ -10,7 +10,7 @@ systemd:
Requires=docker.service Requires=docker.service
After=docker.service After=docker.service
[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 \ ExecStartPre=/usr/bin/docker run -d \
--name etcd \ --name etcd \
--network host \ --network host \

2
google-cloud/fedora-coreos/kubernetes/fcc/controller.yaml
View File

@ -12,7 +12,7 @@ systemd:
Wants=network-online.target network.target Wants=network-online.target network.target
After=network-online.target After=network-online.target
[Service] [Service]
Environment=ETCD_IMAGE=quay.io/coreos/etcd:v3.4.16 Environment=ETCD_IMAGE=quay.io/coreos/etcd:v3.5.0
Type=exec Type=exec
ExecStartPre=/bin/mkdir -p /var/lib/etcd ExecStartPre=/bin/mkdir -p /var/lib/etcd
ExecStartPre=-/usr/bin/podman rm etcd ExecStartPre=-/usr/bin/podman rm etcd

2
google-cloud/flatcar-linux/kubernetes/cl/controller.yaml
View File

@ -10,7 +10,7 @@ systemd:
Requires=docker.service Requires=docker.service
After=docker.service After=docker.service
[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 \ ExecStartPre=/usr/bin/docker run -d \
--name etcd \ --name etcd \
--network host \ --network host \