From fa17c7b2ef0008ebfd9d9d63a9c769f1d8f75899 Mon Sep 17 00:00:00 2001 From: trown Date: Wed, 17 Jul 2019 13:43:49 -0400 Subject: [PATCH] bootkube: add static pod images to bookube flags These images are used by openstack and KNI in order to set up some infra services that are not provided in our case. This includes node level DNS and loadbalancing, as well as keepalived to provide failover for these services. This requires the flags to be added in MCO first: https://github.com/openshift/machine-config-operator/pull/983 The images are used in these MCO PRs: https://github.com/openshift/machine-config-operator/pull/795 https://github.com/openshift/machine-config-operator/pull/740 --- .../files/usr/local/bin/bootkube.sh.template | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/data/data/bootstrap/files/usr/local/bin/bootkube.sh.template b/data/data/bootstrap/files/usr/local/bin/bootkube.sh.template index 010953d679e..2c5c815f187 100755 --- a/data/data/bootstrap/files/usr/local/bin/bootkube.sh.template +++ b/data/data/bootstrap/files/usr/local/bin/bootkube.sh.template @@ -21,6 +21,11 @@ MACHINE_CONFIG_OSCONTENT=$(podman run --quiet --rm ${release} image machine-os-c MACHINE_CONFIG_ETCD_IMAGE=$(podman run --quiet --rm ${release} image etcd) MACHINE_CONFIG_KUBE_CLIENT_AGENT_IMAGE=$(podman run --quiet --rm ${release} image kube-client-agent) MACHINE_CONFIG_INFRA_IMAGE=$(podman run --quiet --rm ${release} image pod) +MACHINE_CONFIG_KEEPALIVED_IMAGE=$(podman run --quiet --rm ${release} image keepalived-ipfailover) +MACHINE_CONFIG_COREDNS_IMAGE=$(podman run --quiet --rm ${release} image coredns) +MACHINE_CONFIG_MDNS_PUBLISHER_IMAGE=$(podman run --quiet --rm ${release} image mdns-publisher) +MACHINE_CONFIG_HAPROXY_IMAGE=$(podman run --quiet --rm ${release} image haproxy-router) +MACHINE_CONFIG_BAREMETAL_RUNTIMECFG_IMAGE=$(podman run --quiet --rm ${release} image baremetal-runtimecfg) KUBE_ETCD_SIGNER_SERVER_IMAGE=$(podman run --quiet --rm ${release} image kube-etcd-signer-server) @@ -193,7 +198,12 @@ then --machine-config-operator-image=${MACHINE_CONFIG_OPERATOR_IMAGE} \ --machine-config-oscontent-image=${MACHINE_CONFIG_OSCONTENT} \ --infra-image=${MACHINE_CONFIG_INFRA_IMAGE} \ - --cloud-config-file=/assets/manifests/cloud-provider-config.yaml + --cloud-config-file=/assets/manifests/cloud-provider-config.yaml \ + --keepalived-image=${MACHINE_CONFIG_KEEPALIVED_IMAGE} \ + --coredns-image=${MACHINE_CONFIG_COREDNS_IMAGE} \ + --mdns-publisher-image=${MACHINE_CONFIG_MDNS_PUBLISHER_IMAGE} \ + --haproxy-image=${MACHINE_CONFIG_HAPROXY_IMAGE} \ + --baremetal-runtimecfg-image=${MACHINE_CONFIG_BAREMETAL_RUNTIMECFG_IMAGE} # Bootstrap MachineConfigController uses /etc/mcc/bootstrap/manifests/ dir to # 1. read the controller config rendered by MachineConfigOperator