Merge pull request #425 from bpradipt/fix-delete-job

podvm: Fix payload image override

Author: bpradipt

controllers/image_generator.go

@@ -311,10 +311,13 @@ func (r *ImageGenerator) createJobFromFile(jobFileName string) (*batchv1.Job, er
 	// If RELATED_PODVM_PAYLOAD_IMAGE environment variable is set, use it
 	// Otherwise, use the default podvm payload image
 	// There is only one initContainer in the job, so we don't need to check the container name
-	podvmPayloadImage := os.Getenv("RELATED_IMAGE_PODVM_PAYLOAD")
-	if podvmPayloadImage != "" {
-		igLogger.Info("Using podvm payload image from environment variable", "image", podvmPayloadImage)
-		job.Spec.Template.Spec.InitContainers[0].Image = podvmPayloadImage
+	// The initContainer is only used for the create job "osc-podvm-create-job.yaml"
+	if jobFileName == "osc-podvm-create-job.yaml" {
+		podvmPayloadImage := os.Getenv("RELATED_IMAGE_PODVM_PAYLOAD")
+		if podvmPayloadImage != "" {
+			igLogger.Info("Using podvm payload image from environment variable", "image", podvmPayloadImage)
+			job.Spec.Template.Spec.InitContainers[0].Image = podvmPayloadImage
+		}
 	}
 
 	return job, nil