Skip to content

Commit

Permalink
Fix disabled SMT on Fedora CoreOS
Browse files Browse the repository at this point in the history
Fedora CoreOS has disabled SMT by default [1] - let's enable it back.

[1]: coreos/fedora-coreos-tracker#181

Change-Id: I2b3ceb96d1ca73e3e6f4d5bc15bc2a86b08186a2
(cherry picked from commit a724f55)
  • Loading branch information
mnasiadka authored and markgoddard committed Jun 22, 2022
1 parent 781b69b commit dfe8d9c
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 6 deletions.
8 changes: 4 additions & 4 deletions doc/source/user/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -110,6 +116,7 @@ storage:
group:
name: root
contents:
compression: null
inline: |
#!/bin/bash
Expand Down
10 changes: 9 additions & 1 deletion magnum/drivers/k8s_fedora_coreos_v1/templates/user_data.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
{
"ignition": {
"version": "3.0.0"
"version": "3.3.0"
},
"kernelArguments": {
"shouldExist": [
"mitigations=off"
],
"shouldNotExist": [
"mitigations=auto,nosmt"
]
},
"passwd": {
"users": [
Expand Down
4 changes: 4 additions & 0 deletions releasenotes/notes/fedora-coreos-34-cb0d281d819e2523.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
upgrade:
- |
Minimum version of Fedora CoreOS required now is 34.

0 comments on commit dfe8d9c

Please sign in to comment.