Tolerations, nodeSelector and cluster-preferred-endpoint-type

Author: kurtmc

api/v1/valkey_types.go

@@ -82,6 +82,16 @@ type ValkeySpec struct {
 
 	// Service Password
 	ServicePassword *corev1.SecretKeySelector `json:"servicePassword,omitempty"`
+
+	// Tolerations
+	Tolerations []corev1.Toleration `json:"tolerations,omitempty"`
+
+	// Node Selector
+	NodeSelector map[string]string `json:"nodeSelector,omitempty"`
+
+	// Which endpoint is shown as the preferred endpoint valid values are 'ip', 'hostname', or 'unknown-endpoint'.
+	// +kubebuilder:default:="hostname"
+	ClusterPreferredEndpointType string `json:"clusterPreferredEndpointType,omitempty"`
 }
 
 // ExternalAccess defines the external access configuration

api/v1/zz_generated.deepcopy.go

@@ -80,6 +80,11 @@ spec:
                 default: cluster.local
                 description: Cluster Domain - used for DNS
                 type: string
+              clusterPreferredEndpointType:
+                default: hostname
+                description: Which endpoint is shown as the preferred endpoint valid
+                  values are 'ip', 'hostname', or 'unknown-endpoint'.
+                type: string
               exporterImage:
                 description: Exporter Image to use
                 type: string
@@ -211,6 +216,11 @@ spec:
               image:
                 description: Image to use
                 type: string
+              nodeSelector:
+                additionalProperties:
+                  type: string
+                description: Node Selector
+                type: object
               nodes:
                 default: 3
                 description: Number of shards
@@ -722,6 +732,45 @@ spec:
                 default: false
                 description: TLS Support
                 type: boolean
+              tolerations:
+                description: Tolerations
+                items:
+                  description: |-
+                    The pod this Toleration is attached to tolerates any taint that matches
+                    the triple <key,value,effect> using the matching operator <operator>.
+                  properties:
+                    effect:
+                      description: |-
+                        Effect indicates the taint effect to match. Empty means match all taint effects.
+                        When specified, allowed values are NoSchedule, PreferNoSchedule and NoExecute.
+                      type: string
+                    key:
+                      description: |-
+                        Key is the taint key that the toleration applies to. Empty means match all taint keys.
+                        If the key is empty, operator must be Exists; this combination means to match all values and all keys.
+                      type: string
+                    operator:
+                      description: |-
+                        Operator represents a key's relationship to the value.
+                        Valid operators are Exists and Equal. Defaults to Equal.
+                        Exists is equivalent to wildcard for value, so that a pod can
+                        tolerate all taints of a particular category.
+                      type: string
+                    tolerationSeconds:
+                      description: |-
+                        TolerationSeconds represents the period of time the toleration (which must be
+                        of effect NoExecute, otherwise this field is ignored) tolerates the taint. By default,
+                        it is not set, which means tolerate the taint forever (do not evict). Zero and
+                        negative values will be treated as 0 (evict immediately) by the system.
+                      format: int64
+                      type: integer
+                    value:
+                      description: |-
+                        Value is the taint value the toleration matches to.
+                        If the operator is Exists, the value should be empty, otherwise just a regular string.
+                      type: string
+                  type: object
+                type: array
               volumePermissions:
                 default: false
                 description: Turn on an init container to set permissions on the persistent

config/crd/bases/hyperspike.io_valkeys.yaml

@@ -1746,7 +1746,8 @@ cluster-config-file /data/nodes.conf
 # the client to reach out on the same endpoint it used for making the last request, but use
 # the port provided in the response.
 
-cluster-preferred-endpoint-type hostname
+cluster-preferred-endpoint-type {{ .Spec.ClusterPreferredEndpointType }}
+
 
 ########################## CLUSTER DOCKER/NAT support  ########################
 

internal/controller/scripts/valkey.conf

@@ -2102,6 +2102,8 @@ func (r *ValkeyReconciler) upsertStatefulSet(ctx context.Context, valkey *hyperv
 							},
 						},
 					},
+					Tolerations:  valkey.Spec.Tolerations,
+					NodeSelector: valkey.Spec.NodeSelector,
 					Containers: []corev1.Container{
 						{
 							Image: image,