add labels to legacy remote runner

Author: Tofel

lib/k8s/environment/environment.go

@@ -263,6 +263,7 @@ func (m *Environment) validateRequiredChainLinkLabels() error {
 	}
 
 	for _, child := range *children {
+		// most of our workloads are Helm charts
 		if h, ok := child.(cdk8s.Helm); ok {
 			for _, ao := range *h.ApiObjects() {
 				switch *ao.Kind() {
@@ -276,6 +277,19 @@ func (m *Environment) validateRequiredChainLinkLabels() error {
 				}
 			}
 		}
+		// but legacy runners have no Helm charts, but are programmatically defined as KubeJobs
+		if j, ok := child.(k8s.KubeJob); ok {
+			// but secrets or role bindings can also be cast to KubeJob, so we need to check if kind is Job
+			if j.Kind() == nil || *j.Kind() != "Job" {
+				continue
+			}
+			for _, l := range requiredChainLinkWorkloadLabels {
+				maybeLabel := j.Metadata().GetLabel(&l)
+				if maybeLabel == nil {
+					missingWorkloadLabels[*j.Name()] = append(missingWorkloadLabels[*j.Name()], l)
+				}
+			}
+		}
 	}
 
 	if len(missingWorkloadLabels) > 0 {
@@ -380,25 +394,7 @@ func (m *Environment) AddChart(f func(root cdk8s.Chart) ConnectedChart) *Environ
 	}
 	config.JSIIGlobalMu.Lock()
 	defer config.JSIIGlobalMu.Unlock()
-	chart := f(m.root)
-
-	h := cdk8s.NewHelm(m.root, ptr.Ptr(chart.GetName()), &cdk8s.HelmProps{
-		Chart: ptr.Ptr(chart.GetPath()),
-		HelmFlags: &[]*string{
-			ptr.Ptr("--namespace"),
-			ptr.Ptr(m.Cfg.Namespace),
-		},
-		ReleaseName: ptr.Ptr(chart.GetName()),
-		Values:      chart.GetValues(),
-	})
-
-	componentLabels, err := getComponentLabels(m.Cfg.WorkloadLabels, chart.GetLabels())
-	if err != nil {
-		m.err = err
-	}
-
-	addRequiredChainLinkLabels(h, componentLabels)
-	m.Charts = append(m.Charts, chart)
+	m.Charts = append(m.Charts, f(m.root))
 	return m
 }
 

lib/k8s/environment/runner.go

@@ -51,13 +51,30 @@ func (m Chart) ExportData(e *Environment) error {
 }
 
 func (m Chart) GetLabels() map[string]string {
-	return map[string]string{
-		"chain.link/component": "k8s-test-runner-legacy",
+	if m.GetProps() == nil {
+		return nil
 	}
+
+	if props, ok := m.GetProps().(*Props); ok {
+		if props == nil {
+			return nil
+		}
+		labels := make(map[string]string)
+		for k, v := range *props.Labels {
+			if v == nil {
+				continue
+			}
+			labels[k] = *v
+		}
+	}
+
+	return nil
 }
 
 func NewRunner(props *Props) func(root cdk8s.Chart) ConnectedChart {
 	return func(root cdk8s.Chart) ConnectedChart {
+		labels := *props.Labels
+		labels["chain.link/component"] = ptr.Ptr("k8s-test-runner-legacy")
 		c := &Chart{
 			Props: props,
 		}
@@ -80,6 +97,7 @@ func NewRunner(props *Props) func(root cdk8s.Chart) ConnectedChart {
 func DataFromRunner(props *Props) func(root cdk8s.Chart) ConnectedChart {
 	labels := *props.Labels
 	labels["app"] = ptr.Ptr("runner-data")
+	labels["chain.link/component"] = ptr.Ptr("k8s-test-runner-data-legacy")
 	return func(root cdk8s.Chart) ConnectedChart {
 		c := &Chart{
 			Props: props,
@@ -264,7 +282,8 @@ func job(chart cdk8s.Chart, props *Props) {
 		ptr.Ptr(fmt.Sprintf("%s-job", props.BaseName)),
 		&k8s.KubeJobProps{
 			Metadata: &k8s.ObjectMeta{
-				Name: ptr.Ptr(props.BaseName),
+				Name:   ptr.Ptr(props.BaseName),
+				Labels: props.Labels,
 			},
 			Spec: &k8s.JobSpec{
 				Template: &k8s.PodTemplateSpec{