diff --git a/CHANGES.md b/CHANGES.md index 40265834a..bbfd520db 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -31,6 +31,11 @@ Notable changes between versions. * Allow [alternative](https://docs.projectcalico.org/v3.1/reference/node/configuration#ip-autodetection-methods) methods for multi NIC nodes, like can-reach=IP or interface=REGEX * Deprecate `container_linux_oem` variable +#### DigitalOcean + +* Update Fedora Atomic module to use Fedora Atomic 28 ([#225](https://github.com/poseidon/typhoon/pull/225)) + * Fedora Atomic 27 images disappeared from DigitalOcean and forced this early update + #### Addons * Fix Prometheus data directory location ([#203](https://github.com/poseidon/typhoon/pull/203)) diff --git a/digital-ocean/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl b/digital-ocean/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl index 72ab5b25f..dbcd67d04 100644 --- a/digital-ocean/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl +++ b/digital-ocean/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl @@ -88,6 +88,8 @@ bootcmd: - [systemctl, disable, firewalld, --now] # https://github.com/kubernetes/kubernetes/issues/60869 - [modprobe, ip_vs] + # https://pagure.io/atomic-wg/issue/468 + - [systemctl, restart, systemd-journald] runcmd: - [systemctl, daemon-reload] - "atomic install --system --name=etcd quay.io/poseidon/etcd:v3.3.5" diff --git a/digital-ocean/fedora-atomic/kubernetes/cloudinit/worker.yaml.tmpl b/digital-ocean/fedora-atomic/kubernetes/cloudinit/worker.yaml.tmpl index 4c2e567be..f3b951f4f 100644 --- a/digital-ocean/fedora-atomic/kubernetes/cloudinit/worker.yaml.tmpl +++ b/digital-ocean/fedora-atomic/kubernetes/cloudinit/worker.yaml.tmpl @@ -64,6 +64,8 @@ bootcmd: - [systemctl, disable, firewalld, --now] # https://github.com/kubernetes/kubernetes/issues/60869 - [modprobe, ip_vs] + # https://pagure.io/atomic-wg/issue/468 + - [systemctl, restart, systemd-journald] runcmd: - [systemctl, daemon-reload] - [systemctl, enable, cloud-metadata.service] diff --git a/digital-ocean/fedora-atomic/kubernetes/variables.tf b/digital-ocean/fedora-atomic/kubernetes/variables.tf index a3cbcab4d..b78bddba0 100644 --- a/digital-ocean/fedora-atomic/kubernetes/variables.tf +++ b/digital-ocean/fedora-atomic/kubernetes/variables.tf @@ -43,8 +43,8 @@ variable "worker_type" { variable "image" { type = "string" - default = "fedora-27-x64-atomic" - description = "OS image from which to initialize the disk (e.g. fedora-27-x64-atomic)" + default = "fedora-28-x64-atomic" + description = "OS image from which to initialize the disk (e.g. fedora-28-x64-atomic)" } # configuration