Add src and image to envs

charts/radix-operator/templates/radixapplication.yaml

@@ -365,6 +365,10 @@ spec:
                                     type: boolean
                                 type: object
                             type: object
+                          dockerfileName:
+                            description: 'Name of the Dockerfile that builds the component.
+                              More info: https://www.radix.equinor.com/references/reference-radix-config/#dockerfilename'
+                            type: string
                           enabled:
                             description: 'Controls if the component shall be deployed
                               to this environment. More info: https://www.radix.equinor.com/references/reference-radix-config/#enabled'
@@ -442,6 +446,10 @@ spec:
                                 - clientId
                                 type: object
                             type: object
+                          image:
+                            description: 'Name of an existing container image to use
+                              when running the component. More info: https://www.radix.equinor.com/references/reference-radix-config/#image'
+                            type: string
                           imageTagName:
                             description: 'The imageTagName allows for flexible configuration
                               of fixed images, built outside of Radix, to be configured
@@ -595,6 +603,10 @@ spec:
                                   type: object
                                 type: array
                             type: object
+                          src:
+                            description: 'Path to the Dockerfile that builds the component.
+                              More info: https://www.radix.equinor.com/references/reference-radix-config/#src'
+                            type: string
                           variables:
                             additionalProperties:
                               type: string
@@ -1322,6 +1334,10 @@ spec:
                             format: int32
                             minimum: 0
                             type: integer
+                          dockerfileName:
+                            description: 'Name of the Dockerfile that builds the component.
+                              More info: https://www.radix.equinor.com/references/reference-radix-config/#dockerfilename'
+                            type: string
                           enabled:
                             description: Controls if the job shall be deployed to
                               this environment.
@@ -1349,6 +1365,10 @@ spec:
                                 - clientId
                                 type: object
                             type: object
+                          image:
+                            description: 'Name of an existing container image to use
+                              when running the job. More info: https://www.radix.equinor.com/references/reference-radix-config/#image-2'
+                            type: string
                           imageTagName:
                             description: 'The imageTagName allows for flexible configuration
                               of fixed images, built outside of Radix, to be configured
@@ -1510,6 +1530,10 @@ spec:
                                   type: object
                                 type: array
                             type: object
+                          src:
+                            description: 'Path to the Dockerfile that builds the component.
+                              More info: https://www.radix.equinor.com/references/reference-radix-config/#src'
+                            type: string
                           timeLimitSeconds:
                             description: 'Environment specific value for the maximum
                               number of seconds the job can run. More info: https://www.radix.equinor.com/references/reference-radix-config/#timelimitseconds-2'

json-schema/radixapplication.json

@@ -353,6 +353,10 @@
                       },
                       "type": "object"
                     },
+                    "dockerfileName": {
+                      "description": "Name of the Dockerfile that builds the component. More info: https://www.radix.equinor.com/references/reference-radix-config/#dockerfilename",
+                      "type": "string"
+                    },
                     "enabled": {
                       "description": "Controls if the component shall be deployed to this environment. More info: https://www.radix.equinor.com/references/reference-radix-config/#enabled",
                       "type": "boolean"
@@ -440,6 +444,10 @@
                       },
                       "type": "object"
                     },
+                    "image": {
+                      "description": "Name of an existing container image to use when running the component. More info: https://www.radix.equinor.com/references/reference-radix-config/#image",
+                      "type": "string"
+                    },
                     "imageTagName": {
                       "description": "The imageTagName allows for flexible configuration of fixed images, built outside of Radix, to be configured with separate tag for each environment. More info: https://www.radix.equinor.com/references/reference-radix-config/#imagetagname",
                       "type": "string"
@@ -591,6 +599,10 @@
                       },
                       "type": "object"
                     },
+                    "src": {
+                      "description": "Path to the Dockerfile that builds the component. More info: https://www.radix.equinor.com/references/reference-radix-config/#src",
+                      "type": "string"
+                    },
                     "variables": {
                       "additionalProperties": {
                         "type": "string"
@@ -1369,6 +1381,10 @@
                       "minimum": 0,
                       "type": "integer"
                     },
+                    "dockerfileName": {
+                      "description": "Name of the Dockerfile that builds the component. More info: https://www.radix.equinor.com/references/reference-radix-config/#dockerfilename",
+                      "type": "string"
+                    },
                     "enabled": {
                       "description": "Controls if the job shall be deployed to this environment.",
                       "type": "boolean"
@@ -1399,6 +1415,10 @@
                       },
                       "type": "object"
                     },
+                    "image": {
+                      "description": "Name of an existing container image to use when running the job. More info: https://www.radix.equinor.com/references/reference-radix-config/#image-2",
+                      "type": "string"
+                    },
                     "imageTagName": {
                       "description": "The imageTagName allows for flexible configuration of fixed images, built outside of Radix, to be configured with separate tag for each environment. More info: https://www.radix.equinor.com/references/reference-radix-config/#imagetagname-2",
                       "type": "string"
@@ -1557,6 +1577,10 @@
                       },
                       "type": "object"
                     },
+                    "src": {
+                      "description": "Path to the Dockerfile that builds the component. More info: https://www.radix.equinor.com/references/reference-radix-config/#src",
+                      "type": "string"
+                    },
                     "timeLimitSeconds": {
                       "description": "Environment specific value for the maximum number of seconds the job can run. More info: https://www.radix.equinor.com/references/reference-radix-config/#timelimitseconds-2",
                       "format": "int64",

pipeline-runner/internal/tekton/tekton.go

@@ -26,15 +26,15 @@ const (
 // CreateActionPipelineJob Create action pipeline job
 func CreateActionPipelineJob(containerName string, action string, pipelineInfo *model.PipelineInfo, appName string, initContainers []corev1.Container, envVars *[]corev1.EnvVar) *batchv1.Job {
 	imageTag := pipelineInfo.PipelineArguments.ImageTag
-	jobName := pipelineInfo.PipelineArguments.JobName
+	pipelineJobName := pipelineInfo.PipelineArguments.JobName
 	timestamp := time.Now().Format("20060102150405")
 	hash := strings.ToLower(utils.RandStringStrSeed(5, pipelineInfo.PipelineArguments.JobName))
 	backOffLimit := int32(0)
 	job := batchv1.Job{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: fmt.Sprintf("radix-%s-pipelines-%s-%s-%s", action, timestamp, imageTag, hash),
 			Labels: map[string]string{
-				kube.RadixJobNameLabel:  jobName,
+				kube.RadixJobNameLabel:  pipelineJobName,
 				kube.RadixAppLabel:      appName,
 				kube.RadixImageTagLabel: imageTag,
 				kube.RadixJobTypeLabel:  getActionPipelineJobTypeLabelByPipelinesAction(action),
@@ -44,7 +44,7 @@ func CreateActionPipelineJob(containerName string, action string, pipelineInfo *
 			BackoffLimit: &backOffLimit,
 			Template: corev1.PodTemplateSpec{
 				ObjectMeta: metav1.ObjectMeta{
-					Labels:      radixlabels.ForPipelineJobName(jobName),
+					Labels:      radixlabels.ForPipelineJobName(pipelineJobName),
 					Annotations: annotations.ForClusterAutoscalerSafeToEvict(false),
 				},
 				Spec: corev1.PodSpec{

pipeline-runner/internal/wait/job.go

@@ -3,7 +3,9 @@ package wait
 import (
 	"errors"
 	"fmt"
+	"strings"
 
+	"github.com/equinor/radix-operator/pkg/apis/kube"
 	logger "github.com/sirupsen/logrus"
 	batchv1 "k8s.io/api/batch/v1"
 	corev1 "k8s.io/api/core/v1"
@@ -51,7 +53,7 @@ func waitForCompletionOf(kubeClient kubernetes.Interface, job *batchv1.Job) erro
 				case currJob.Status.Succeeded == 1:
 					errChan <- nil
 				case currJob.Status.Failed == 1:
-					errChan <- fmt.Errorf("job failed. See log for more details")
+					errChan <- fmt.Errorf("job failed. See more details in the log of the job %s", getJobDescription(currJob))
 				}
 			}
 		},
@@ -106,6 +108,20 @@ func waitForCompletionOf(kubeClient kubernetes.Interface, job *batchv1.Job) erro
 	return err
 }
 
+func getJobDescription(job *batchv1.Job) string {
+	var lines []string
+	if jobType, ok := job.GetLabels()[kube.RadixJobTypeLabel]; ok {
+		lines = append(lines, jobType)
+	}
+	if componentName, ok := job.GetLabels()[kube.RadixComponentLabel]; ok {
+		lines = append(lines, fmt.Sprintf("for the component %s", componentName))
+	}
+	if envName, ok := job.GetLabels()[kube.RadixEnvLabel]; ok {
+		lines = append(lines, fmt.Sprintf("for the environment %s", envName))
+	}
+	return strings.Join(lines, " ")
+}
+
 func checkPodIsTerminatedOrFailed(containerStatuses *[]corev1.ContainerStatus) error {
 	for _, containerStatus := range *containerStatuses {
 		if containerStatus.State.Terminated != nil {

pipeline-runner/model/pipelineInfo.go

@@ -35,8 +35,8 @@ type PipelineInfo struct {
 	GitCommitHash string
 	GitTags       string
 
-	// Holds information about components to be built
-	BuildComponentImages pipeline.BuildComponentImages
+	// Holds information about components to be built for each environment
+	BuildComponentImages pipeline.EnvironmentBuildComponentImages
 
 	// Hold information about components to be deployed
 	DeployEnvironmentComponentImages pipeline.DeployEnvironmentComponentImages

pipeline-runner/pipelines/app.go

@@ -130,12 +130,13 @@ func (cli *PipelineRunner) CreateResultConfigMap() error {
 	if err != nil {
 		return err
 	}
-	jobName := cli.pipelineInfo.PipelineArguments.JobName
+	pipelineJobName := cli.pipelineInfo.PipelineArguments.JobName
+
 	configMap := corev1.ConfigMap{
 		ObjectMeta: metav1.ObjectMeta{
-			Name: jobName,
+			Name: pipelineJobName,
 			Labels: map[string]string{
-				kube.RadixJobNameLabel:       jobName,
+				kube.RadixJobNameLabel:       pipelineJobName,
 				kube.RadixConfigMapTypeLabel: string(kube.RadixPipelineResultConfigMap),
 			},
 		},