Fix test failures

Author: thegridman

api/v1/coherence_webhook.go

@@ -54,6 +54,9 @@ func (in *Coherence) Default() {
 		in.Spec.EnsureCoherenceUtilsImage(&utilsImage)
 
 		// Set the features supported by this version
+		if in.Annotations == nil {
+			in.Annotations = make(map[string]string)
+		}
 		in.Annotations[AnnotationFeatureSuspend] = "true"
 	} else {
 		logger.Info("skipping defaulting for existing resource")

api/v1/common_test.go

@@ -265,10 +265,6 @@ func createMinimalExpectedStatefulSet(deployment *coh.Coherence) *appsv1.Statefu
 				Name:  "OPERATOR_REQUEST_TIMEOUT",
 				Value: "120",
 			},
-			{
-				Name:  coh.EnvVarCohIdentity,
-				Value: deployment.Name + "@" + deployment.Namespace,
-			},
 		},
 	}
 

api/v1/constants.go

@@ -73,8 +73,6 @@ const (
 	VolumeMountPathManagementCerts = VolumeMountRoot + "/coherence/certs/management"
 	VolumeMountPathMetricsCerts    = VolumeMountRoot + "/coherence/certs/metrics"
 
-	AnnotationIdentity = "coherence.k8s.operator.identity"
-
 	// Start command for the runner
 	RunnerCommand = VolumeMountPathUtils + "/runner"
 

controllers/statefulset/statefulset_controller.go

@@ -359,7 +359,7 @@ func (in *ReconcileStatefulSet) patchStatefulSet(deployment *coh.Coherence, curr
 
 	// ensure the utils image is present so that we do not patch on a Coherence resource
 	// from pre-3.1.x that does not have images set
-	if deployment.Spec.CoherenceUtils.Image == nil {
+	if deployment.Spec.CoherenceUtils == nil || deployment.Spec.CoherenceUtils.Image == nil {
 		utilsImage := in.getUtilsImage(desired)
 		in.setUtilsImage(original, utilsImage)
 		in.setUtilsImage(current, utilsImage)

pkg/runner/runner_test.go

@@ -116,7 +116,7 @@ func AppendCommonExpectedArgs(args []string) []string {
 		"-XX:+PrintFlagsFinal",
 		"-Dcoherence.wka=test-wka..svc.cluster.local",
 		"-Dcoherence.cluster=test",
-		"-Dcoherence.k8s.operator.identity=test@",
+		//"-Dcoherence.k8s.operator.identity=test@",
 		"-Dcoherence.k8s.operator.health.port=6676",
 		"-Dcoherence.management.http.port=30000",
 		"-Dcoherence.metrics.http.port=9612",