Skip to content

Commit

Permalink
use payload image url from environment variable
Browse files Browse the repository at this point in the history
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 <jfreimann@redhat.com>
  • Loading branch information
jensfr committed Nov 30, 2020
1 parent b0103d2 commit afbfeb7
Showing 1 changed file with 11 additions and 2 deletions.
13 changes: 11 additions & 2 deletions images/daemon/pkg/daemon/kata_openshift.go
Expand Up @@ -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")
Expand Down

0 comments on commit afbfeb7

Please sign in to comment.