From a6be05fa5f7bb219422cd9765a58e890801ade04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Andr=C3=A9?= Date: Fri, 5 Jul 2019 20:06:03 +0200 Subject: [PATCH] Simplify building MCO image Since https://github.com/openshift/machine-config-operator/pull/850 and https://github.com/openshift/installer/pull/1875 the installer will take a single image for the machine config operator. --- build_mco.sh | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/build_mco.sh b/build_mco.sh index 6ad2655..4faa870 100755 --- a/build_mco.sh +++ b/build_mco.sh @@ -33,24 +33,15 @@ export DEST_IMAGE="quay.io/$USERNAME/origin-release:$TAG" export FROM_IMAGE="registry.svc.ci.openshift.org/origin/release:4.2" pushd $GOPATH/src/github.com/openshift/machine-config-operator -for image in controller daemon operator server; do - export WHAT=machine-config-$image - ./hack/build-image.sh -done - -for image in controller daemon operator server; do - export WHAT=machine-config-$image - export REPO="quay.io/$USERNAME" - ./hack/push-image.sh -done +export WHAT=machine-config-operator +export REPO="quay.io/$USERNAME" +./hack/build-image.sh +./hack/push-image.sh oc adm release new \ --from-release="$FROM_IMAGE" \ --to-image="$DEST_IMAGE" \ --server https://api.ci.openshift.org \ -n openshift \ - machine-config-operator=quay.io/$USERNAME/origin-machine-config-operator:latest \ - machine-config-controller=quay.io/$USERNAME/origin-machine-config-controller:latest \ - machine-config-daemon=quay.io/$USERNAME/origin-machine-config-daemon:latest \ - machine-config-server=quay.io/$USERNAME/origin-machine-config-server:latest + machine-config-operator=quay.io/$USERNAME/origin-machine-config-operator:latest popd