From dfe8d9c628c2eb5a7f5bb62326a4ba9f9679f52a Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Wed, 16 Feb 2022 11:51:47 +0100
Subject: [PATCH] Fix disabled SMT on Fedora CoreOS

Fedora CoreOS has disabled SMT by default [1] - let's enable it back.

[1]: https://github.com/coreos/fedora-coreos-tracker/issues/181

Change-Id: I2b3ceb96d1ca73e3e6f4d5bc15bc2a86b08186a2
(cherry picked from commit a724f554cfa144d6eb4d43c88396359e293ba135)
---
 doc/source/user/index.rst                              |  8 ++++----
 .../k8s_fedora_coreos_v1/templates/fcct-config.yaml    |  9 ++++++++-
 .../k8s_fedora_coreos_v1/templates/user_data.json      | 10 +++++++++-
 .../notes/fedora-coreos-34-cb0d281d819e2523.yaml       |  4 ++++
 4 files changed, 25 insertions(+), 6 deletions(-)
 create mode 100644 releasenotes/notes/fedora-coreos-34-cb0d281d819e2523.yaml

diff --git a/doc/source/user/index.rst b/doc/source/user/index.rst
index 5519c3b686..04d86ca31b 100644
--- a/doc/source/user/index.rst
+++ b/doc/source/user/index.rst
@@ -105,13 +105,13 @@ They are loosely grouped as: mandatory, infrastructure, COE specific.
   as appropriate for the cluster driver.  For the currently supported
   images, the os_distro names are:
 
-  ========== =====================
+  ========== ==========================
   COE        os_distro
-  ========== =====================
-  Kubernetes fedora-coreos
+  ========== ==========================
+  Kubernetes fedora-coreos (minimum 34)
   Swarm      fedora-atomic
   Mesos      ubuntu
-  ========== =====================
+  ========== ==========================
 
   This is a mandatory parameter and there is no default value. Note that the
   os_distro attribute is case sensitive.
diff --git a/magnum/drivers/k8s_fedora_coreos_v1/templates/fcct-config.yaml b/magnum/drivers/k8s_fedora_coreos_v1/templates/fcct-config.yaml
index 47896f675a..193c839858 100644
--- a/magnum/drivers/k8s_fedora_coreos_v1/templates/fcct-config.yaml
+++ b/magnum/drivers/k8s_fedora_coreos_v1/templates/fcct-config.yaml
@@ -12,7 +12,12 @@
 # [0] https://github.com/coreos/fcct
 # [1] https://github.com/coreos/fedora-coreos-docs/blob/master/modules/ROOT/pages/producing-ign.adoc
 variant: fcos
-version: 1.0.0
+version: 1.4.0
+kernel_arguments:
+  should_exist:
+    - mitigations=off
+  should_not_exist:
+    - mitigations=auto,nosmt
 passwd:
   users:
     - name: core
@@ -43,6 +48,7 @@ storage:
       user:
         name: root
       contents:
+        compression: null
         inline: |
           # This file controls the state of SELinux on the system.
           # SELINUX= can take one of these three values:
@@ -110,6 +116,7 @@ storage:
       group:
         name: root
       contents:
+        compression: null
         inline: |
           #!/bin/bash
           
diff --git a/magnum/drivers/k8s_fedora_coreos_v1/templates/user_data.json b/magnum/drivers/k8s_fedora_coreos_v1/templates/user_data.json
index acd54ff6c5..65a396e8ce 100644
--- a/magnum/drivers/k8s_fedora_coreos_v1/templates/user_data.json
+++ b/magnum/drivers/k8s_fedora_coreos_v1/templates/user_data.json
@@ -1,6 +1,14 @@
 {
   "ignition": {
-    "version": "3.0.0"
+    "version": "3.3.0"
+  },
+  "kernelArguments": {
+    "shouldExist": [
+      "mitigations=off"
+    ],
+    "shouldNotExist": [
+      "mitigations=auto,nosmt"
+    ]
   },
   "passwd": {
     "users": [
diff --git a/releasenotes/notes/fedora-coreos-34-cb0d281d819e2523.yaml b/releasenotes/notes/fedora-coreos-34-cb0d281d819e2523.yaml
new file mode 100644
index 0000000000..647bf050ea
--- /dev/null
+++ b/releasenotes/notes/fedora-coreos-34-cb0d281d819e2523.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    Minimum version of Fedora CoreOS required now is 34.