Skip to content

AGENT-710: Use invoker for bootstrap template generation #7508

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-robot merged 1 commit into from
Sep 22, 2023
Merged

AGENT-710: Use invoker for bootstrap template generation #7508

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/bootstrap/files/usr/local/bin/bootstrap-pivot.sh.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ if [ ! -f /opt/openshift/.pivot-done ]; then
record_service_stage_start "rebase-to-okd-os-image"
{{if .IsFCOS -}}
mnt="$(podman image mount "${MACHINE_OS_IMAGE}")"
{{- if .BootstrapInPlace }}
{{- if or (.BootstrapInPlace) (eq .Invoker "agent-installer") }}
# SNO setup boots into Live ISO which cannot be rebased
# https://github.com/coreos/rpm-ostree/issues/4547
mkdir /var/mnt/{upper,worker}
Expand Down
2 changes: 1 addition & 1 deletion data/data/bootstrap/systemd/units/release-image-pivot.service.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Description=Pivot bootstrap to the OpenShift Release Image
Wants=release-image.service
After=release-image.service
{{- if .BootstrapInPlace }}
{{- if or (.BootstrapInPlace) (eq .Invoker "agent-installer") }}
Before=bootkube.service kubelet.service
{{ else }}
Before=bootkube.service
Expand Down
5 changes: 5 additions & 0 deletions pkg/asset/ignition/bootstrap/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ type bootstrapTemplateData struct {
APIServerURL string
APIIntServerURL string
FeatureSet configv1.FeatureSet
Invoker string
}

// platformTemplateData is the data to use to replace values in bootstrap
Expand Down Expand Up @@ -309,6 +310,9 @@ func (a *Common) getTemplateData(dependencies asset.Parents, bootstrapInPlace bo

apiURL := fmt.Sprintf("api.%s", installConfig.Config.ClusterDomain())
apiIntURL := fmt.Sprintf("api-int.%s", installConfig.Config.ClusterDomain())

openshiftInstallInvoker := os.Getenv("OPENSHIFT_INSTALL_INVOKER")

return &bootstrapTemplateData{
AdditionalTrustBundle: installConfig.Config.AdditionalTrustBundle,
FIPS: installConfig.Config.FIPS,
Expand All @@ -331,6 +335,7 @@ func (a *Common) getTemplateData(dependencies asset.Parents, bootstrapInPlace bo
APIServerURL: apiURL,
APIIntServerURL: apiIntURL,
FeatureSet: installConfig.Config.FeatureSet,
Invoker: openshiftInstallInvoker,
}
}

Expand Down