Skip to content

bootkube: Supply machine-os-content to MCO #1149

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
Feb 5, 2019
Merged

bootkube: Supply machine-os-content to MCO #1149

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: 2 additions & 0 deletions data/data/bootstrap/files/usr/local/bin/bootkube.sh.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ MACHINE_CONFIG_OPERATOR_IMAGE=$(podman run --rm ${release} image machine-config-
MACHINE_CONFIG_CONTROLLER_IMAGE=$(podman run --rm ${release} image machine-config-controller)
MACHINE_CONFIG_SERVER_IMAGE=$(podman run --rm ${release} image machine-config-server)
MACHINE_CONFIG_DAEMON_IMAGE=$(podman run --rm ${release} image machine-config-daemon)
MACHINE_CONFIG_OSCONTENT=$(podman run --rm ${release} image machine-os-content)

KUBE_APISERVER_OPERATOR_IMAGE=$(podman run --rm ${release} image cluster-kube-apiserver-operator)
KUBE_CONTROLLER_MANAGER_OPERATOR_IMAGE=$(podman run --rm ${release} image cluster-kube-controller-manager-operator)
Expand Down Expand Up @@ -129,6 +130,7 @@ then
--machine-config-controller-image=${MACHINE_CONFIG_CONTROLLER_IMAGE} \
--machine-config-server-image=${MACHINE_CONFIG_SERVER_IMAGE} \
--machine-config-daemon-image=${MACHINE_CONFIG_DAEMON_IMAGE} \
--machine-config-oscontent-image=${MACHINE_CONFIG_OSCONTENT}

# Bootstrap MachineConfigController uses /etc/mcc/bootstrap/manifests/ dir to
# 1. read the controller config rendered by MachineConfigOperator
Expand Down