Add SkipRequiredChainLinkLabelsValidation

Author: lukaszcl

lib/k8s/e2e/common/test_common.go

@@ -49,11 +49,12 @@ func GetTestEnvConfig(t *testing.T) *environment.Config {
 		Msg("TestEnvConfig")
 
 	return &environment.Config{
-		NamespacePrefix: TestEnvType,
-		Test:            t,
-		Labels:          nsLabels,
-		WorkloadLabels:  workloadPodLabels,
-		PodLabels:       workloadPodLabels,
+		NamespacePrefix:                       TestEnvType,
+		Test:                                  t,
+		Labels:                                nsLabels,
+		WorkloadLabels:                        workloadPodLabels,
+		PodLabels:                             workloadPodLabels,
+		SkipRequiredChainLinkLabelsValidation: true,
 	}
 }
 

lib/k8s/environment/environment.go

@@ -129,6 +129,8 @@ type Config struct {
 	detachRunner bool
 	// fundReturnFailed the status of a fund return
 	fundReturnFailed bool
+	// Skip validating that all required chain.link labels are present in the final manifest
+	SkipRequiredChainLinkLabelsValidation bool
 }
 
 func defaultEnvConfig() *Config {
@@ -865,10 +867,12 @@ func (m *Environment) RunCustomReadyConditions(customCheck *client.ReadyCheckDat
 	}
 	log.Debug().Bool("ManifestUpdate", m.Cfg.SkipManifestUpdate).Msg("Update mode")
 
-	// make sure all required chain.link labels are present in the final manifest
-	// if err := m.validateRequiredChainLinkLabels(); err != nil {
-	// 	return err
-	// }
+	if !m.Cfg.SkipRequiredChainLinkLabelsValidation {
+		// make sure all required chain.link labels are present in the final manifest
+		if err := m.validateRequiredChainLinkLabels(); err != nil {
+			return err
+		}
+	}
 
 	if !m.Cfg.SkipManifestUpdate || m.Cfg.JobImage != "" {
 		if err := m.DeployCustomReadyConditions(customCheck, podCount); err != nil {