Merge branch 'TT-1802-FIx-e2e-k8s-tests-in-the-CTF' of https://github.com/smartcontractkit/chainlink-testing-framework into TT-1802-FIx-e2e-k8s-tests-in-the-CTF

Author: lukaszcl

lib/k8s/environment/environment.go

@@ -515,11 +515,13 @@ func (m *Environment) ReplaceHelm(name string, chart ConnectedChart) (*Environme
 	workloadLabels, err := getComponentLabels(m.Cfg.WorkloadLabels, chart.GetLabels())
 	if err != nil {
 		m.err = err
+		return nil, err
 	}
 
 	podLabels, err := getComponentLabels(m.Cfg.PodLabels, chart.GetLabels())
 	if err != nil {
 		m.err = err
+		return nil, err
 	}
 
 	addRequiredChainLinkLabelsToWorkloads(h, workloadLabels)
@@ -620,7 +622,7 @@ func (m *Environment) UpdateHelm(name string, values map[string]any) (*Environme
 	return m.ReplaceHelm(name, chart)
 }
 
-// AddHelmCharts adds multiple helm charts to the testing environment
+// Charts adds multiple helm charts to the testing environment
 func (m *Environment) AddHelmCharts(charts []ConnectedChart) *Environment {
 	if m.err != nil {
 		return m
@@ -676,11 +678,13 @@ func (m *Environment) AddHelm(chart ConnectedChart) *Environment {
 	workloadLabels, err := getComponentLabels(m.Cfg.WorkloadLabels, chart.GetLabels())
 	if err != nil {
 		m.err = err
+		return m
 	}
 
 	podLabels, err := getComponentLabels(m.Cfg.PodLabels, chart.GetLabels())
 	if err != nil {
 		m.err = err
+		return m
 	}
 	addRequiredChainLinkLabelsToWorkloads(h, workloadLabels)
 	addDefaultPodAnnotationsAndLabels(h, markNotSafeToEvict(m.Cfg.PreventPodEviction, nil), podLabels)

lib/k8s/pkg/cdk8s/blockscout/blockscout.go

@@ -79,7 +79,8 @@ func New(props *Props) func(root cdk8s.Chart) environment.ConnectedChart {
 		}
 		vars := vars{
 			Labels: &map[string]*string{
-				"app": ptr.Ptr(c.GetName()),
+				"app":                  ptr.Ptr(c.GetName()),
+				"chain.link/component": ptr.Ptr("blockscout"),
 			},
 			ConfigMapName: fmt.Sprintf("%s-cm", c.GetName()),
 			BaseName:      c.GetName(),
@@ -117,7 +118,8 @@ type vars struct {
 func service(chart cdk8s.Chart, vars vars) {
 	k8s.NewKubeService(chart, ptr.Ptr(fmt.Sprintf("%s-service", vars.BaseName)), &k8s.KubeServiceProps{
 		Metadata: &k8s.ObjectMeta{
-			Name: ptr.Ptr(vars.BaseName),
+			Name:   ptr.Ptr(vars.BaseName),
+			Labels: vars.Labels,
 		},
 		Spec: &k8s.ServiceSpec{
 			Ports: &[]*k8s.ServicePort{
@@ -173,7 +175,8 @@ func deployment(chart cdk8s.Chart, vars vars) {
 		ptr.Ptr(fmt.Sprintf("%s-deployment", vars.BaseName)),
 		&k8s.KubeDeploymentProps{
 			Metadata: &k8s.ObjectMeta{
-				Name: ptr.Ptr(vars.BaseName),
+				Name:   ptr.Ptr(vars.BaseName),
+				Labels: vars.Labels,
 			},
 			Spec: &k8s.DeploymentSpec{
 				Selector: &k8s.LabelSelector{

lib/k8s/pkg/cdk8s/goc/goc.go

@@ -54,7 +54,8 @@ func New() func(root cdk8s.Chart) environment.ConnectedChart {
 		c := &Chart{}
 		vars := vars{
 			Labels: &map[string]*string{
-				"app": ptr.Ptr(c.GetName()),
+				"app":                  ptr.Ptr(c.GetName()),
+				"chain.link/component": ptr.Ptr("goc"),
 			},
 			ConfigMapName: fmt.Sprintf("%s-cm", c.GetName()),
 			BaseName:      c.GetName(),
@@ -82,7 +83,8 @@ type vars struct {
 func service(chart cdk8s.Chart, vars vars) {
 	k8s.NewKubeService(chart, ptr.Ptr(fmt.Sprintf("%s-service", vars.BaseName)), &k8s.KubeServiceProps{
 		Metadata: &k8s.ObjectMeta{
-			Name: ptr.Ptr(vars.BaseName),
+			Name:   ptr.Ptr(vars.BaseName),
+			Labels: vars.Labels,
 		},
 		Spec: &k8s.ServiceSpec{
 			Ports: &[]*k8s.ServicePort{
@@ -103,7 +105,8 @@ func deployment(chart cdk8s.Chart, vars vars) {
 		ptr.Ptr(fmt.Sprintf("%s-deployment", vars.BaseName)),
 		&k8s.KubeDeploymentProps{
 			Metadata: &k8s.ObjectMeta{
-				Name: ptr.Ptr(vars.BaseName),
+				Name:   ptr.Ptr(vars.BaseName),
+				Labels: vars.Labels,
 			},
 			Spec: &k8s.DeploymentSpec{
 				Selector: &k8s.LabelSelector{

lib/k8s/pkg/cdk8s/http_dummy/dummy.go

@@ -69,7 +69,8 @@ func New() func(root cdk8s.Chart) environment.ConnectedChart {
 		c := &Chart{}
 		vars := vars{
 			Labels: &map[string]*string{
-				"app": ptr.Ptr(c.GetName()),
+				"app":                  ptr.Ptr(c.GetName()),
+				"chain.link/component": ptr.Ptr("http_dummy"),
 			},
 			ConfigMapName: fmt.Sprintf("%s-cm", c.GetName()),
 			BaseName:      c.GetName(),
@@ -97,7 +98,8 @@ type vars struct {
 func service(chart cdk8s.Chart, vars vars) {
 	k8s.NewKubeService(chart, ptr.Ptr(fmt.Sprintf("%s-service", vars.BaseName)), &k8s.KubeServiceProps{
 		Metadata: &k8s.ObjectMeta{
-			Name: ptr.Ptr(vars.BaseName),
+			Name:   ptr.Ptr(vars.BaseName),
+			Labels: vars.Labels,
 		},
 		Spec: &k8s.ServiceSpec{
 			Ports: &[]*k8s.ServicePort{
@@ -118,7 +120,8 @@ func deployment(chart cdk8s.Chart, vars vars) {
 		ptr.Ptr(fmt.Sprintf("%s-deployment", vars.BaseName)),
 		&k8s.KubeDeploymentProps{
 			Metadata: &k8s.ObjectMeta{
-				Name: ptr.Ptr(vars.BaseName),
+				Name:   ptr.Ptr(vars.BaseName),
+				Labels: vars.Labels,
 			},
 			Spec: &k8s.DeploymentSpec{
 				Selector: &k8s.LabelSelector{