From afbfeb7a58e5fee056248e8c96a69f85ccd235cb Mon Sep 17 00:00:00 2001 From: Jens Freimann Date: Tue, 27 Oct 2020 14:10:44 +0100 Subject: [PATCH] use payload image url from environment variable If set, use the environment variable KATA_PAYLOAD_IMAGE as the URL from where we download the container image with the RPMs that will be installed on the worker nodes. Signed-off-by: Jens Freimann --- images/daemon/pkg/daemon/kata_openshift.go | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/images/daemon/pkg/daemon/kata_openshift.go b/images/daemon/pkg/daemon/kata_openshift.go index f71afa1a..fbae5973 100644 --- a/images/daemon/pkg/daemon/kata_openshift.go +++ b/images/daemon/pkg/daemon/kata_openshift.go @@ -380,9 +380,18 @@ func installRPMs(k *KataOpenShift) error { fmt.Println(err) } - srcRef, err := alltransports.ParseImageName("docker://quay.io/isolatedcontainers/kata-operator-payload:" + k.PayloadTag) + payloadImage := os.Getenv("KATA_PAYLOAD_IMAGE") + if payloadImage == "" { + payloadImage = "docker://quay.io/isolatedcontainers/kata-operator-payload:" + k.PayloadTag + } else { + log.Println("WARNING: kataconfig installation is tainted") + log.Println("Using env variable KATA_PAYLOAD_IMAGE " + payloadImage) + payloadImage = "docker://" + payloadImage + } + + srcRef, err := alltransports.ParseImageName(payloadImage) if err != nil { - fmt.Println("Invalid source name") + fmt.Println("Invalid source name of payload container image: " + payloadImage) return err } destRef, err := alltransports.ParseImageName("oci:/opt/kata-install/kata-image:latest")