From 3e34fb075b3350b310971260e042c5ff23436ca3 Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Sat, 28 Sep 2019 15:09:57 -0700 Subject: [PATCH] Update etcd from v3.4.0 to v3.4.1 * https://github.com/etcd-io/etcd/releases/tag/v3.4.1 --- CHANGES.md | 11 +++++++---- .../kubernetes/cl/controller.yaml.tmpl | 2 +- aws/fedora-coreos/kubernetes/fcc/controller.yaml | 2 +- .../kubernetes/cl/controller.yaml.tmpl | 2 +- .../kubernetes/cl/controller.yaml.tmpl | 2 +- .../fedora-coreos/kubernetes/fcc/controller.yaml | 2 +- .../kubernetes/cl/controller.yaml.tmpl | 2 +- .../kubernetes/cl/controller.yaml.tmpl | 2 +- 8 files changed, 14 insertions(+), 11 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 16e197e5..1918c173 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -4,6 +4,8 @@ Notable changes between versions. ## Latest +* Update etcd from v3.3.15 to [v3.4.1](https://github.com/etcd-io/etcd/releases/tag/v3.4.1) + #### AWS * Add `node_labels` variable to internal `workers` module ([#550](https://github.com/poseidon/typhoon/pull/550)) @@ -12,10 +14,6 @@ Notable changes between versions. * Add `node_labels` variable to internal `workers` module ([#550](https://github.com/poseidon/typhoon/pull/550)) -#### Google Cloud - -* Add `node_labels` variable to internal `workers` module ([#550](https://github.com/poseidon/typhoon/pull/550)) - #### Bare-Metal * Fix Terraform missing comma error ([#549](https://github.com/poseidon/typhoon/pull/549)) @@ -24,6 +22,11 @@ Notable changes between versions. * Fix Terraform missing comma error ([#549](https://github.com/poseidon/typhoon/pull/549)) +#### Google Cloud + +* Add `node_labels` variable to internal `workers` module ([#550](https://github.com/poseidon/typhoon/pull/550)) + + ## v1.16.0 * Kubernetes [v1.16.0](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.16.md#v1160) ([#543](https://github.com/poseidon/typhoon/pull/543)) diff --git a/aws/container-linux/kubernetes/cl/controller.yaml.tmpl b/aws/container-linux/kubernetes/cl/controller.yaml.tmpl index 60e8ab31..086ced6b 100644 --- a/aws/container-linux/kubernetes/cl/controller.yaml.tmpl +++ b/aws/container-linux/kubernetes/cl/controller.yaml.tmpl @@ -7,7 +7,7 @@ systemd: - name: 40-etcd-cluster.conf contents: | [Service] - Environment="ETCD_IMAGE_TAG=v3.4.0" + Environment="ETCD_IMAGE_TAG=v3.4.1" Environment="ETCD_NAME=${etcd_name}" Environment="ETCD_ADVERTISE_CLIENT_URLS=https://${etcd_domain}:2379" Environment="ETCD_INITIAL_ADVERTISE_PEER_URLS=https://${etcd_domain}:2380" diff --git a/aws/fedora-coreos/kubernetes/fcc/controller.yaml b/aws/fedora-coreos/kubernetes/fcc/controller.yaml index 3d55f045..5d388726 100644 --- a/aws/fedora-coreos/kubernetes/fcc/controller.yaml +++ b/aws/fedora-coreos/kubernetes/fcc/controller.yaml @@ -28,7 +28,7 @@ systemd: --network host \ --volume /var/lib/etcd:/var/lib/etcd:rw,Z \ --volume /etc/ssl/etcd:/etc/ssl/certs:ro,Z \ - quay.io/coreos/etcd:v3.4.0 + quay.io/coreos/etcd:v3.4.1 ExecStop=/usr/bin/podman stop etcd [Install] WantedBy=multi-user.target diff --git a/azure/container-linux/kubernetes/cl/controller.yaml.tmpl b/azure/container-linux/kubernetes/cl/controller.yaml.tmpl index 0b1bc8e9..2007857e 100644 --- a/azure/container-linux/kubernetes/cl/controller.yaml.tmpl +++ b/azure/container-linux/kubernetes/cl/controller.yaml.tmpl @@ -7,7 +7,7 @@ systemd: - name: 40-etcd-cluster.conf contents: | [Service] - Environment="ETCD_IMAGE_TAG=v3.4.0" + Environment="ETCD_IMAGE_TAG=v3.4.1" Environment="ETCD_NAME=${etcd_name}" Environment="ETCD_ADVERTISE_CLIENT_URLS=https://${etcd_domain}:2379" Environment="ETCD_INITIAL_ADVERTISE_PEER_URLS=https://${etcd_domain}:2380" diff --git a/bare-metal/container-linux/kubernetes/cl/controller.yaml.tmpl b/bare-metal/container-linux/kubernetes/cl/controller.yaml.tmpl index 356c7bff..e63ba378 100644 --- a/bare-metal/container-linux/kubernetes/cl/controller.yaml.tmpl +++ b/bare-metal/container-linux/kubernetes/cl/controller.yaml.tmpl @@ -7,7 +7,7 @@ systemd: - name: 40-etcd-cluster.conf contents: | [Service] - Environment="ETCD_IMAGE_TAG=v3.4.0" + Environment="ETCD_IMAGE_TAG=v3.4.1" Environment="ETCD_NAME=${etcd_name}" Environment="ETCD_ADVERTISE_CLIENT_URLS=https://${domain_name}:2379" Environment="ETCD_INITIAL_ADVERTISE_PEER_URLS=https://${domain_name}:2380" diff --git a/bare-metal/fedora-coreos/kubernetes/fcc/controller.yaml b/bare-metal/fedora-coreos/kubernetes/fcc/controller.yaml index 7ecf846a..f9f4fa54 100644 --- a/bare-metal/fedora-coreos/kubernetes/fcc/controller.yaml +++ b/bare-metal/fedora-coreos/kubernetes/fcc/controller.yaml @@ -28,7 +28,7 @@ systemd: --network host \ --volume /var/lib/etcd:/var/lib/etcd:rw,Z \ --volume /etc/ssl/etcd:/etc/ssl/certs:ro,Z \ - quay.io/coreos/etcd:v3.4.0 + quay.io/coreos/etcd:v3.4.1 ExecStop=/usr/bin/podman stop etcd [Install] WantedBy=multi-user.target diff --git a/digital-ocean/container-linux/kubernetes/cl/controller.yaml.tmpl b/digital-ocean/container-linux/kubernetes/cl/controller.yaml.tmpl index 801268c8..28e4c7a8 100644 --- a/digital-ocean/container-linux/kubernetes/cl/controller.yaml.tmpl +++ b/digital-ocean/container-linux/kubernetes/cl/controller.yaml.tmpl @@ -7,7 +7,7 @@ systemd: - name: 40-etcd-cluster.conf contents: | [Service] - Environment="ETCD_IMAGE_TAG=v3.4.0" + Environment="ETCD_IMAGE_TAG=v3.4.1" Environment="ETCD_NAME=${etcd_name}" Environment="ETCD_ADVERTISE_CLIENT_URLS=https://${etcd_domain}:2379" Environment="ETCD_INITIAL_ADVERTISE_PEER_URLS=https://${etcd_domain}:2380" diff --git a/google-cloud/container-linux/kubernetes/cl/controller.yaml.tmpl b/google-cloud/container-linux/kubernetes/cl/controller.yaml.tmpl index 3d0bdbdb..f864c22a 100644 --- a/google-cloud/container-linux/kubernetes/cl/controller.yaml.tmpl +++ b/google-cloud/container-linux/kubernetes/cl/controller.yaml.tmpl @@ -7,7 +7,7 @@ systemd: - name: 40-etcd-cluster.conf contents: | [Service] - Environment="ETCD_IMAGE_TAG=v3.4.0" + Environment="ETCD_IMAGE_TAG=v3.4.1" Environment="ETCD_NAME=${etcd_name}" Environment="ETCD_ADVERTISE_CLIENT_URLS=https://${etcd_domain}:2379" Environment="ETCD_INITIAL_ADVERTISE_PEER_URLS=https://${etcd_domain}:2380"