Skip to content

OCPBUGS-115550: use different INSTALL_INVOKER for unconfigured ignition #10848

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

Merged
openshift-merge-bot merged 1 commit into from
Sep 22, 2026
+4 −1
Merged

OCPBUGS-115550: use different INSTALL_INVOKER for unconfigured ignition #10848

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
2 changes: 1 addition & 1 deletion data/data/agent/files/usr/local/share/assisted-service/assisted-service.env.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ DUMMY_IGNITION=false
ENABLE_SINGLE_NODE_DNSMASQ=true
EPHEMERAL_INSTALLER_CLUSTER_TLS_CERTS_OVERRIDE_DIR=/opt/agent/tls
HW_VALIDATOR_REQUIREMENTS=TO_BE_REPLACED_BY_SYSTEMD
INSTALL_INVOKER=agent-installer
INSTALL_INVOKER=agent-installer{{.InstallInvokerSuffix}}

@andfasano andfasano Sep 9, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Currently in Assisted Service there's an exact string match for the specific ABI branches (see repo:openshift/assisted-service "agent-installer"), and also in Assisted Installer (see https://github.com/openshift/assisted-installer/blob/d4580efc20c260403b055a58368b1c12642dd80e/src/common/common.go#L40).
If we want to distinguish the different workflows then I think we'll need to have a less strict check in those repos first (ie, checking the invoker string begins with "agent-installer" should be good enough to cover all the cases)

@zaneb zaneb Sep 9, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

ugh, good point I completely forgot about those :(

IPV6_SUPPORT=true
TNA_CLUSTERS_SUPPORT=true
TNF_CLUSTERS_SUPPORT=true
Expand Down
2 changes: 2 additions & 0 deletions pkg/asset/agent/image/ignition.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,8 @@ type agentTemplateData struct {
// DisabledHostValidations is a comma-separated list of assisted-service host
// validation IDs to disable. Set only for the add-nodes workflow.
DisabledHostValidations string
// InstallInvokerSuffix is appended to "agent-installer" for INSTALL_INVOKER.
InstallInvokerSuffix string
}

// Name returns the human-friendly name of the asset.
Expand Down
1 change: 1 addition & 0 deletions pkg/asset/agent/image/unconfigured_ignition.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@ func (a *UnconfiguredIgnition) Generate(ctx context.Context, dependencies asset.
WatcherAuthToken: authConfig.WatcherAuthToken,
AuthType: authConfig.AuthType,
DisableImagePolicy: shouldDisableImagePolicy(),
InstallInvokerSuffix: "-postconfig",
}

enabledServices := getDefaultEnabledServices()
Expand Down