Skip to content

multi-arch-builders: show changes for if we could use butane directly #1196

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

multi-arch-builders: show changes for if we could use butane directly #1196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 3 additions & 6 deletions multi-arch-builders/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,13 +127,10 @@ ibmcloud plugin install infrastructure-service
ibmcloud login --sso
```

Create the Ignition config in a separate terminal and copy it into the
container where ibmcloud is running:
Grab the Butane config:

```bash
cat builder-common.bu | butane --pretty --strict > builder-common.ign
cat coreos-s390x-builder.bu | butane --pretty --strict --files-dir=. > coreos-s390x-builder.ign
podman cp coreos-s390x-builder.ign ibmcloud:/root/coreos-s390x-builder.ign
curl -O https://github.com/coreos/fedora-coreos-pipeline/raw/refs/heads/main/multi-arch-builders/coreos-s390x-builder.bu
```

We've occasionally seen some failures and/or capacity issues so we'll
Expand Down Expand Up @@ -165,7 +162,7 @@ NAME="coreos-s390x-builder-$(date +%Y%m%d)"
PROFILE='bz2-8x32'
ibmcloud is instance-create $NAME $VPC $ZONE $PROFILE $SUBNET --output json --image-id $IMAGE \
--boot-volume '{"name": "my-boot-vol-1", "volume": {"capacity": 200, "profile": {"name": "general-purpose"}}}' \
--sgs $SG --user-data @coreos-s390x-builder.ign > out.json
--sgs $SG --user-data @coreos-s390x-builder.bu > out.json
```


Expand Down
5 changes: 2 additions & 3 deletions multi-arch-builders/coreos-s390x-builder.bu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
# This butane config will do the following:
#
# - Merge in the builder-common.ign Ignition file
# - Merge in the builder-common.bu Butane file
# - Allow the builder user to log in with the associated ssh key
# - Set a hostname
#
variant: fcos
version: 1.4.0
ignition:
config:
merge:
- local: builder-common.ign
- source: https://github.com/coreos/fedora-coreos-pipeline/raw/refs/heads/main/multi-arch-builders/builder-common.bu
passwd:
users:
- name: builder
Expand Down
11 changes: 5 additions & 6 deletions multi-arch-builders/coreos-s390x-rhcos-builder.bu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This butane config will do the following:
#
# - Merge in the coreos-s390x-builder.ign Ignition file
# - Merge in the builder-splunk.ign Ignition file
# - Merge in the coreos-s390x-builder.bu Butane file
# - Merge in the builder-splunk.bu Butane file
# - Enable the Secure Execution Host
# - Create and initialize the secex-data volume
# - Enable the Cex hardware based luks encryption
Expand All @@ -10,9 +10,8 @@ variant: fcos
version: 1.4.0
ignition:
config:
merge:
- local: coreos-s390x-builder.ign
- local: builder-splunk.ign
- source: https://github.com/coreos/fedora-coreos-pipeline/raw/refs/heads/main/multi-arch-builders/coreos-s390x-builder.bu
- source: https://github.com/coreos/fedora-coreos-pipeline/raw/refs/heads/main/multi-arch-builders/builder-splunk.bu
kernel_arguments:
should_exist:
# enables Secure Execution Host
Expand Down Expand Up @@ -111,4 +110,4 @@ storage:
group:
name: root
contents:
local: create-cex-device.sh
source: https://github.com/coreos/fedora-coreos-pipeline/raw/refs/heads/main/multi-arch-builders/create-cex-device.sh