Undo port overrides

Author: kurtmc

api/v1/valkey_types.go

@@ -88,22 +88,6 @@ type ValkeySpec struct {
 
 	// Node Selector
 	NodeSelector map[string]string `json:"nodeSelector,omitempty"`
-
-	// Valkey container port
-	// +kubebuilder:default:=6379
-	ContainerPort int32 `json:"containerPort,omitempty"`
-
-	// Valkey container bus port
-	// +kubebuilder:default:=16379
-	ContainerBusPort int32 `json:"containerBusPort,omitempty"`
-
-	// Valkey container port
-	// +kubebuilder:default:=0
-	HostPort int32 `json:"hostPort,omitempty"`
-
-	// Valkey container bus port
-	// +kubebuilder:default:=0
-	HostBusPort int32 `json:"hostBusPort,omitempty"`
 }
 
 // ExternalAccess defines the external access configuration

config/manager/manager.yaml

@@ -19,7 +19,7 @@ metadata:
 data:
   nodes: "3"
   valkeyImage: "ghcr.io/halter/valkey:8.0.2"
-  exporterImage: "ghcr.io/halter/valkey-sidecar:v0.0.51"
+  exporterImage: "ghcr.io/halter/valkey-sidecar:v0.0.3"
 ---
 apiVersion: apps/v1
 kind: Deployment

internal/controller/scripts/valkey.conf

@@ -136,7 +136,7 @@ protected-mode yes
 
 # Accept connections on the specified port, default is 6379 (IANA #815344).
 # If port 0 is specified Valkey will not listen on a TCP socket.
-port {{ .Spec.ContainerPort }}
+#port 6379
 
 # TCP listen() backlog.
 #
@@ -826,7 +826,7 @@ replica-priority 100
 # Valkey implements server assisted support for client side caching of values.
 # This is implemented using an invalidation table that remembers, using
 # a radix key indexed by key name, what clients have which keys. In turn
-# this is used in order to send invalidation messages to clients.
+# this is used in order to send invalidation messages to clients. 
 #
 # When tracking is enabled for a client, all the read only queries are assumed
 # to be cached: this will force Valkey to store information in the invalidation
@@ -1026,9 +1026,9 @@ acllog-max-len 128
 #
 # aclfile /etc/valkey/users.acl
 
-# The option effect will be just setting the password for the default user.
-# Clients will still authenticate using AUTH <password> as usually, or more
-# explicitly with AUTH default <password> if they follow the new protocol:
+# The option effect will be just setting the password for the default user. 
+# Clients will still authenticate using AUTH <password> as usually, or more 
+# explicitly with AUTH default <password> if they follow the new protocol: 
 # both will work.
 #
 # The requirepass is not compatible with aclfile option and the ACL LOAD
@@ -1786,8 +1786,6 @@ cluster-preferred-endpoint-type hostname
 # cluster-announce-tls-port 6379
 # cluster-announce-port 0
 # cluster-announce-bus-port 6380
-cluster-announce-port {{ .Spec.HostPort }}
-cluster-announce-bus-port {{ .Spec.HostBusPort }}
 
 ################################## SLOW LOG ###################################
 

internal/controller/valkey_controller.go

@@ -2125,9 +2125,9 @@ func (r *ValkeyReconciler) upsertStatefulSet(ctx context.Context, valkey *hyperv
 							Name:            Valkey,
 							ImagePullPolicy: "IfNotPresent",
 							Command: []string{
-								"sh",
-								"-c",
-								`exec valkey-server /valkey/etc/valkey.conf --protected-mode no --cluster-announce-ip ${HOST_IP}`,
+								"valkey-server",
+								"/valkey/etc/valkey.conf",
+								"--protected-mode", "no",
 							},
 							Env: []corev1.EnvVar{
 								{
@@ -2155,24 +2155,18 @@ func (r *ValkeyReconciler) upsertStatefulSet(ctx context.Context, valkey *hyperv
 									Value: tls,
 								},
 								{
-									Name: "HOST_IP",
-									ValueFrom: &corev1.EnvVarSource{
-										FieldRef: &corev1.ObjectFieldSelector{
-											FieldPath: "status.hostIP",
-										},
-									},
+									Name:  "VALKEY_PORT_NUMBER",
+									Value: "6379",
 								},
 							},
 							Ports: []corev1.ContainerPort{
 								{
 									Name:          "tcp-valkey",
-									ContainerPort: valkey.Spec.ContainerPort,
-									HostPort:      valkey.Spec.HostPort,
+									ContainerPort: 6379,
 								},
 								{
 									Name:          "tcp-valkey-bus",
-									ContainerPort: valkey.Spec.ContainerBusPort,
-									HostPort:      valkey.Spec.HostBusPort,
+									ContainerPort: 16379,
 								},
 							},
 							LivenessProbe: &corev1.Probe{