Skip to content

MCO-2163: use machine-config-osimagestream to avoid hard-coding image tag names #10416

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
cheesesashimi wants to merge 2 commits into
base: main
Choose a base branch
from
Open

MCO-2163: use machine-config-osimagestream to avoid hard-coding image tag names #10416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39538df
use machine-config-osimagestream to avoid hard-coding image tag names
cheesesashimi Mar 20, 2026
2c71d2a
clean up MCO container and image
cheesesashimi Apr 9, 2026
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
57 changes: 53 additions & 4 deletions data/data/bootstrap/files/usr/local/bin/node-image-pull.sh.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,62 @@ set -euo pipefail
# shellcheck source=release-image.sh.template
. /usr/local/bin/release-image.sh

# yuck... this is a good argument for renaming the node image to just `node` in both OCP and OKD
coreos_img={{.StreamTag}}
until COREOS_IMAGE=$(image_for ${coreos_img}); do
echo 'Failed to query release image; retrying...'
# Get the Machine Config Operator image from the release payload
until MCO_IMAGE=$(image_for 'machine-config-operator'); do
Copy link
Copy Markdown
Member

@jlebon jlebon Apr 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, but note this adds another image we have to pull down here before we get to pivot. So I expect this to slightly affect bootstrapping time.

I guess this is pretty far along now, but wouldn't a cleaner design here be to put the machine-config-osimagestream helper stuff in the CVO? It already has an image command (which is what image_for uses) that's very similar to what we need here. E.g. a new command like osimage --stream {{ .OSImageStream }} which returns the pullspec of the right OS image.

Copy link
Copy Markdown
Member Author

@cheesesashimi cheesesashimi Apr 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I agree that the CVO would be a better long-term place for this to live. The bigger problem that we'll need to solve is that there is some common code for working with OSImageStreams that would need to live in both the CVO and the MCO. And ideally, we'd be able to find a home for that code.

Copy link
Copy Markdown
Member

@jlebon jlebon Apr 10, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nothing a little golang package import can't solve I would think? :)

echo 'Failed to query MCO image from release; retrying...'
sleep 10
done

# Create temporary directory for binary extraction
TEMP_DIR=$(mktemp -d)

MCO_CONTAINER_ID=

cleanup_mco() {
# Ensure that the MCO container is removed.
if [[ -n "${MCO_CONTAINER_ID}" ]]; then
podman container rm -f "${MCO_CONTAINER_ID}" >/dev/null 2>&1 || true
MCO_CONTAINER_ID=
fi

# Delete the MCO container image to conserve memory.
if [[ -n "${MCO_IMAGE}" ]]; then
podman image rm -f "${MCO_IMAGE}" >/dev/null 2>&1 || true
MCO_IMAGE=
fi

# Delete the tempdir.
if [[ -n "${TEMP_DIR}" ]]; then
rm -rf "${TEMP_DIR}"
TEMP_DIR=
fi
}
trap cleanup_mco EXIT

echo "Extracting machine-config-osimagestream binary to ${TEMP_DIR}"

MCO_CONTAINER_ID="$(podman create "${MCO_IMAGE}")"
# Extract the machine-config-osimagestream binary from the MCO image. This avoids having to munge podman args, paths, env vars, etc.
podman cp "${MCO_CONTAINER_ID}":/usr/bin/machine-config-osimagestream "${TEMP_DIR}/machine-config-osimagestream"

# Execute the binary to get the CoreOS image pullspec
# Note: Proxy environment variables (HTTP_PROXY, HTTPS_PROXY, NO_PROXY) are
# automatically inherited from the environment if set via /etc/profile.d/proxy.sh
until COREOS_IMAGE=$("${TEMP_DIR}/machine-config-osimagestream" \
get os-image-pullspec \
--release-image "${RELEASE_IMAGE_DIGEST}" \
--authfile /root/.docker/config.json \
--per-host-certs /etc/containers/certs.d \
--osimagestream-name '{{ .OSImageStream }}' \
--trust-bundle /etc/pki/ca-trust/source/anchors \
--registry-config /etc/containers/registries.conf); do
Comment on lines +51 to +55
Copy link
Copy Markdown
Contributor

@pablintino pablintino Mar 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can't we rely on the defaults? (Just asking not a blocking question or ask for change)

Copy link
Copy Markdown
Member Author

@cheesesashimi cheesesashimi Mar 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In #10406, I don't think we can rely on the defaults since machine-config-osimagestream will be running containerized. However, I think we can rely on the defaults here. I need to look at https://github.com/containers/image to see if there is a SetDefaultValues() function someplace for types.SystemContext. If not, then I'll put these values into the machine-config-osimagestream entrypoint as the default values.

echo 'Failed to query for OS image pullspec; retrying...'
sleep 10
done

# Clean up the MCO container, image, and temp dir now that we have the pullspec.
cleanup_mco

# need to use rpm-ostree here since `bootc status` doesn't work in the live ISO currently
# https://github.com/containers/bootc/issues/1043
booted_version=$(rpm-ostree status --json | jq -r .deployments[0].version)
Expand Down
17 changes: 11 additions & 6 deletions pkg/asset/ignition/bootstrap/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ import (
"github.com/openshift/installer/pkg/asset/machines"
"github.com/openshift/installer/pkg/asset/manifests"
"github.com/openshift/installer/pkg/asset/releaseimage"
"github.com/openshift/installer/pkg/asset/rhcos"
rhcosAsset "github.com/openshift/installer/pkg/asset/rhcos"
"github.com/openshift/installer/pkg/asset/tls"
rhcosutils "github.com/openshift/installer/pkg/rhcos"
"github.com/openshift/installer/pkg/rhcos"
"github.com/openshift/installer/pkg/types"
awstypes "github.com/openshift/installer/pkg/types/aws"
aztypes "github.com/openshift/installer/pkg/types/azure"
Expand Down Expand Up @@ -99,7 +99,7 @@ type bootstrapTemplateData struct {
FeatureSet configv1.FeatureSet
Invoker string
ClusterDomain string
StreamTag string
OSImageStream types.OSImageStream
}

// platformTemplateData is the data to use to replace values in bootstrap
Expand Down Expand Up @@ -177,7 +177,7 @@ func (a *Common) Dependencies() []asset.Asset {
&tls.ServiceAccountKeyPair{},
&tls.IronicTLSCert{},
&releaseimage.Image{},
new(rhcos.Image),
new(rhcosAsset.Image),
}
}

Expand Down Expand Up @@ -287,7 +287,7 @@ func (a *Common) getTemplateData(dependencies asset.Parents, bootstrapInPlace bo
installConfig := &installconfig.InstallConfig{}
proxy := &manifests.Proxy{}
releaseImage := &releaseimage.Image{}
rhcosImage := new(rhcos.Image)
rhcosImage := new(rhcosAsset.Image)
bootstrapSSHKeyPair := &tls.BootstrapSSHKeyPair{}
ironicCreds := &baremetal.IronicCreds{}
dependencies.Get(installConfig, proxy, releaseImage, rhcosImage, bootstrapSSHKeyPair, ironicCreds)
Expand Down Expand Up @@ -399,6 +399,11 @@ func (a *Common) getTemplateData(dependencies asset.Parents, bootstrapInPlace bo
pullSecret = merged
}

osImageStream := installConfig.Config.OSImageStream
if osImageStream == "" {
osImageStream = rhcos.DefaultOSImageStream
}

return &bootstrapTemplateData{
AdditionalTrustBundle: installConfig.Config.AdditionalTrustBundle,
FIPS: installConfig.Config.FIPS,
Expand All @@ -422,7 +427,7 @@ func (a *Common) getTemplateData(dependencies asset.Parents, bootstrapInPlace bo
FeatureSet: installConfig.Config.FeatureSet,
Invoker: openshiftInstallInvoker,
ClusterDomain: installConfig.Config.ClusterDomain(),
StreamTag: rhcosutils.GetPayloadImageStreamTag(installConfig.Config.OSImageStream),
OSImageStream: osImageStream,
}
}

Expand Down
4 changes: 2 additions & 2 deletions pkg/rhcos/stream_scos.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ package rhcos

import "github.com/openshift/installer/pkg/types"

// DefaultOSImageStream Not used in SCOS
const DefaultOSImageStream types.OSImageStream = ""
// DefaultOSImageStream Not (yet) used in SCOS
const DefaultOSImageStream types.OSImageStream = "centos-10"

func getStreamFileName(_ types.OSImageStream) string {
return "coreos/scos.json"
Expand Down