Add retry to the test port forwarder (#714)

Author: thegridman

.gitignore

@@ -55,6 +55,7 @@ test/**/test-report.xml
 /hack/sdk/*
 
 # Generated file created by the build
+api/**/zz_*.go
 bundle.Dockerfile
 /__debug_bin
 hack/istio*/

Makefile

@@ -152,7 +152,7 @@ TEST_APPLICATION_IMAGE_SPRING_CNBP   := $(OPERATOR_IMAGE_REGISTRY)/operator-test
 TEST_APPLICATION_IMAGE_SPRING_2      := $(OPERATOR_IMAGE_REGISTRY)/operator-test-spring-2:1.0.0
 TEST_APPLICATION_IMAGE_SPRING_FAT_2  := $(OPERATOR_IMAGE_REGISTRY)/operator-test-spring-fat-2:1.0.0
 TEST_APPLICATION_IMAGE_SPRING_CNBP_2 := $(OPERATOR_IMAGE_REGISTRY)/operator-test-spring-cnbp-2:1.0.0
-SKIP_SPRING_CNBP                     := false
+SKIP_SPRING_CNBP                     ?= false
 
 # ----------------------------------------------------------------------------------------------------------------------
 # Operator Lifecycle Manager properties
@@ -2526,6 +2526,7 @@ push-test-images:
 	$(DOCKER_CMD) push $(PUSH_ARGS) $(TEST_APPLICATION_IMAGE_HELIDON_2)
 	$(DOCKER_CMD) push $(PUSH_ARGS) $(TEST_APPLICATION_IMAGE_HELIDON_3)
 	$(DOCKER_CMD) push $(PUSH_ARGS) $(TEST_APPLICATION_IMAGE_SPRING)
+	$(DOCKER_CMD) push $(PUSH_ARGS) $(TEST_APPLICATION_IMAGE_SPRING_2)
 	$(DOCKER_CMD) push $(PUSH_ARGS) $(TEST_APPLICATION_IMAGE_SPRING_FAT)
 	$(DOCKER_CMD) push $(PUSH_ARGS) $(TEST_APPLICATION_IMAGE_SPRING_FAT_2)
 ifneq (true,$(SKIP_SPRING_CNBP))

api/v1/coherenceresourcespec_types.go

@@ -996,6 +996,7 @@ func (in *CoherenceResourceSpec) CreateDefaultEnv(deployment CoherenceResource)
 		corev1.EnvVar{Name: EnvVarCohHealthPort, Value: Int32ToString(in.GetHealthPort())},
 		corev1.EnvVar{Name: EnvVarCoherenceTTL, Value: "0"},
 		corev1.EnvVar{Name: EnvVarCohCtlHome, Value: VolumeMountPathUtils},
+		corev1.EnvVar{Name: EnvVarCohResourceName, Value: deployment.GetName()},
 	)
 
 	ann := deployment.GetAnnotations()

api/v1/common_test.go

@@ -373,6 +373,10 @@ func createMinimalExpectedPodSpec(deployment coh.CoherenceResource) corev1.PodTe
 			Name:  "COHERENCE_IPMONITOR_PINGTIMEOUT",
 			Value: "0",
 		},
+		{
+			Name:  coh.EnvVarCohResourceName,
+			Value: deployment.GetName(),
+		},
 	}
 
 	if deployment.GetType() == coh.CoherenceTypeJob {

api/v1/constants.go

@@ -219,6 +219,7 @@ const (
 	EnvVarCohSkipVersionCheck    = "COHERENCE_OPERATOR_SKIP_VERSION_CHECK"
 	EnvVarCohPodUID              = "COHERENCE_OPERATOR_POD_UID"
 	EnvVarCohIdentity            = "COHERENCE_OPERATOR_IDENTITY"
+	EnvVarCohResourceName        = "COHERENCE_OPERATOR_RESOURCE_NAME"
 	EnvVarCohAppDir              = "COHERENCE_OPERATOR_APP_DIR"
 	EnvVarCohSkipSite            = "COHERENCE_OPERATOR_SKIP_SITE"
 	EnvVarCohSite                = "COHERENCE_OPERATOR_SITE_INFO_LOCATION"