Skip to content

fix(flatcar): use newer butane instead of ct #1889

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+19 −30
Open

fix(flatcar): use newer butane instead of ct #1889

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e3efca
fix(flatcar): use newer butane instead of ct
mgrzybek Nov 19, 2025
d3ad3bf
fix(flatcar): set butane version to v0.25.1
mgrzybek Nov 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions images/capi/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ deps-powervs: deps-common
deps-ignition: ## Installs/checks dependencies for generating Ignition files
deps-ignition:
hack/ensure-jq.sh
hack/ensure-ct.sh
hack/ensure-butane.sh

.PHONY: deps-nutanix
deps-nutanix: ## Installs/checks dependencies for Nutanix builds
Expand Down Expand Up @@ -1155,7 +1155,7 @@ json-sort: ## Sort all JSON files alphabetically
.PHONY: gen-ignition
ignition_files = bootstrap-pass-auth bootstrap-cloud
gen-ignition: deps-ignition ## Generates Ignition files from CLC
for f in $(ignition_files); do (ct < packer/files/flatcar/clc/$$f.yaml | jq '.' > packer/files/flatcar/ignition/$$f.json) || exit 1; done
for f in $(ignition_files); do (butane --pretty --strict < packer/files/flatcar/clc/$$f.yaml | jq '.' > packer/files/flatcar/ignition/$$f.json) || exit 1; done

## --------------------------------------
## ISO checksum updates
Expand Down
14 changes: 7 additions & 7 deletions images/capi/hack/ensure-ct.sh → images/capi/hack/ensure-butane.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ set -o pipefail

[[ -n ${DEBUG:-} ]] && set -o xtrace

_version="v0.9.3"
_version="v0.25.0"

# Change directories to the parent directory of the one in which this
# script is located.
Expand All @@ -33,11 +33,11 @@ if command -v ct >/dev/null 2>&1; then exit 0; fi
mkdir -p .local/bin && cd .local/bin

if [[ ${HOSTOS} == "linux" ]]; then
_binfile="ct-${_version}-x86_64-unknown-linux-gnu"
_binfile="butane-x86_64-unknown-linux-gnu"
elif [[ ${HOSTOS} == "darwin" ]]; then
_binfile="ct-${_version}-x86_64-apple-darwin"
_binfile="butane-x86_64-apple-darwin"
fi
_bin_url="https://github.com/flatcar/container-linux-config-transpiler/releases/download/${_version}/${_binfile}"
curl -SsL "${_bin_url}" -o ct
chmod 0755 ct
echo "'ct' has been installed to $(pwd), make sure this directory is in your \$PATH"
_bin_url="https://github.com/coreos/butane/releases/download/${_version}/${_binfile}"
curl -SsL "${_bin_url}" -o butane
chmod 0755 butane
echo "'butane' has been installed to $(pwd), make sure this directory is in your \$PATH"
4 changes: 3 additions & 1 deletion images/capi/packer/files/flatcar/clc/bootstrap-cloud.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@
# authorize SSH keys (typically cloud providers such as AWS or Azure). On such platforms, no SSH
# configuration needs to be done via Ignition. The actions in this file are performed before Packer
# provisioners (e.g. Ansible) are executed.
variant: flatcar
version: 1.1.0
systemd:
units:
- name: docker.service
enable: true
enabled: true
# Mask update-engine and locksmithd to disable automatic updates during image creation.
- name: update-engine.service
mask: true
Expand Down
4 changes: 3 additions & 1 deletion images/capi/packer/files/flatcar/clc/bootstrap-pass-auth.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# This file is used for initial provisioning of a Flatcar machine on platforms which use SSH
# password authentication during the build process. The actions in this file are performed before
# Packer provisioners (e.g. Ansible) are executed.
variant: flatcar
version: 1.1.0
passwd:
users:
- name: builder
Expand All @@ -13,7 +15,7 @@ passwd:
systemd:
units:
- name: docker.service
enable: true
enabled: true
# Mask update-engine and locksmithd to disable automatic updates during image creation.
- name: update-engine.service
mask: true
Expand Down
12 changes: 2 additions & 10 deletions images/capi/packer/files/flatcar/ignition/bootstrap-cloud.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,11 @@
{
"ignition": {
"config": {},
"security": {
"tls": {}
},
"timeouts": {},
"version": "2.3.0"
"version": "3.4.0"
},
"networkd": {},
"passwd": {},
"storage": {},
"systemd": {
"units": [
{
"enable": true,
"enabled": true,
"name": "docker.service"
},
{
Expand Down
11 changes: 2 additions & 9 deletions images/capi/packer/files/flatcar/ignition/bootstrap-pass-auth.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
{
"ignition": {
"config": {},
"security": {
"tls": {}
},
"timeouts": {},
"version": "2.3.0"
"version": "3.4.0"
},
"networkd": {},
"passwd": {
"users": [
{
Expand All @@ -21,11 +15,10 @@
}
]
},
"storage": {},
"systemd": {
"units": [
{
"enable": true,
"enabled": true,
"name": "docker.service"
},
{
Expand Down