Add Node hostname to the Coherence Pod anti-affinity rules (#556)

Author: thegridman

api/v1/coherenceresourcespec_types.go

@@ -264,7 +264,7 @@ type CoherenceResourceSpec struct {
 	// Use the host's ipc namespace. Optional: Default to false.
 	// +optional
 	HostIPC *bool `json:"hostIPC,omitempty"`
-	// Configure various networks and DNS settings for Pods in this rolw.
+	// Configure various networks and DNS settings for Pods in this role.
 	// +optional
 	Network *NetworkSpec `json:"network,omitempty"`
 	// The configuration for the Coherence operator image name
@@ -771,7 +771,7 @@ func (in *CoherenceResourceSpec) CreateStatefulSet(deployment *Coherence) appsv1
 		UpdateStrategy: appsv1.StatefulSetUpdateStrategy{
 			Type: appsv1.RollingUpdateStatefulSetStrategyType,
 		},
-		RevisionHistoryLimit: pointer.Int32Ptr(5),
+		RevisionHistoryLimit: pointer.Int32(5),
 		ServiceName:          deployment.GetHeadlessServiceName(),
 		Selector: &metav1.LabelSelector{
 			MatchLabels: in.CreatePodSelectorLabels(deployment),
@@ -973,6 +973,8 @@ func (in *CoherenceResourceSpec) AddEnvVarIfAbsent(envVar corev1.EnvVar) {
 }
 
 // AddEnvVarIfAbsent adds the specified EnvVar to the destination slice if one with the same name does not already exist.
+//
+//goland:noinspection ALL
 func AddEnvVarIfAbsent(dest []corev1.EnvVar, envVar corev1.EnvVar) []corev1.EnvVar {
 	for _, e := range dest {
 		if e.Name == envVar.Name {
@@ -1005,7 +1007,7 @@ func (in *CoherenceResourceSpec) CreateDefaultEnv(deployment *Coherence) []corev
 				SecretKeyRef: &corev1.SecretKeySelector{
 					LocalObjectReference: corev1.LocalObjectReference{Name: OperatorConfigName},
 					Key:                  OperatorConfigKeyHost,
-					Optional:             pointer.BoolPtr(true),
+					Optional:             pointer.Bool(true),
 				},
 			},
 		},
@@ -1151,12 +1153,19 @@ func (in *CoherenceResourceSpec) CreateDefaultPodAffinity(deployment *Coherence)
 					},
 				},
 				{
-					Weight: 1,
+					Weight: 10,
 					PodAffinityTerm: corev1.PodAffinityTerm{
 						TopologyKey:   operator.LabelOciNodeFaultDomain,
 						LabelSelector: &selector,
 					},
 				},
+				{
+					Weight: 1,
+					PodAffinityTerm: corev1.PodAffinityTerm{
+						TopologyKey:   operator.LabelHostName,
+						LabelSelector: &selector,
+					},
+				},
 			},
 		},
 	}

pkg/operator/operator.go

@@ -4,7 +4,7 @@
  * http://oss.oracle.com/licenses/upl.
  */
 
-// The operator package contains types and functions used directly by the Operator main
+// Package operator package contains types and functions used directly by the Operator main
 package operator
 
 import (
@@ -28,7 +28,7 @@ const (
 	DefaultRestHost       = "0.0.0.0"
 	DefaultRestPort int32 = 8000
 
-	// DefaultCertValidity makes new certificates default to a 1 year expiration
+	// DefaultCertValidity makes new certificates default to a one-year expiration
 	DefaultCertValidity = 365 * 24 * time.Hour
 	// DefaultRotateBefore defines how long before expiration a certificate
 	// should be re-issued
@@ -75,8 +75,11 @@ const (
 
 	// OCI Node Labels
 
-	// LabelOciNodeFaultDomain is the OCI Node label fo the fault domain.
+	// LabelOciNodeFaultDomain is the OCI Node label for the fault domain.
 	LabelOciNodeFaultDomain = "oci.oraclecloud.com/fault-domain"
+
+	// LabelHostName is the Node label for the Node's hostname.
+	LabelHostName = "kubernetes.io/hostname"
 )
 
 var setupLog = ctrl.Log.WithName("setup")