Skip to content

[WIP] 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

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

[WIP] 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
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
34 changes: 30 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,39 @@ 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
echo 'Failed to query MCO image from release; retrying...'
sleep 10
done

# Create temporary directory for binary extraction
TEMP_DIR=$(mktemp -d)
echo "Extracting machine-config-osimagestream binary to ${TEMP_DIR}"

# Extract the machine-config-osimagestream binary from the MCO image. This avoids having to munge podman args, paths, env vars, etc.
podman create --name mco-osimagestream "${MCO_IMAGE}"
podman cp mco-osimagestream:/usr/bin/machine-config-osimagestream "${TEMP_DIR}/machine-config-osimagestream"
podman rm mco-osimagestream
Comment on lines +17 to +20
Copy link
Contributor

@patrickdillon patrickdillon Mar 23, 2026

Choose a reason for hiding this comment

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

Can we use podman run via

installer/data/data/bootstrap/files/usr/local/bin/bootkube.sh.template

Lines 24 to 28 in ac9a370

bootkube_podman_run() {
# we run all commands in the host-network to prevent IP conflicts with
# end-user infrastructure.
podman run --quiet --net=host --rm --log-driver=k8s-file "${@}"
}

If so, would be a little cleaner, but I'm not sure we can. Just an idea/suggestion.

Copy link
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.

So, I tried to do this in a different PR. While I eventually got it to work, it seemed really brittle.


# 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 +28 to +32
Copy link
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
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 temporary directory
rm -rf "${TEMP_DIR}"

# 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 @@ -39,9 +39,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 @@ -176,7 +176,7 @@ func (a *Common) Dependencies() []asset.Asset {
&tls.ServiceAccountKeyPair{},
&tls.IronicTLSCert{},
&releaseimage.Image{},
new(rhcos.Image),
new(rhcosAsset.Image),
}
}

Expand Down Expand Up @@ -286,7 +286,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 @@ -380,6 +380,11 @@ func (a *Common) getTemplateData(dependencies asset.Parents, bootstrapInPlace bo

openshiftInstallInvoker := os.Getenv("OPENSHIFT_INSTALL_INVOKER")

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

return &bootstrapTemplateData{
AdditionalTrustBundle: installConfig.Config.AdditionalTrustBundle,
FIPS: installConfig.Config.FIPS,
Expand All @@ -403,7 +408,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
2 changes: 1 addition & 1 deletion pkg/rhcos/stream_scos.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package rhcos
import "github.com/openshift/installer/pkg/types"

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

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