Merge pull request openstack-k8s-operators#486 from antonioromito/main

Add IPv6 support for Redis with pod-specific IP binding

Author: openshift-merge-bot[bot]

pkg/redis/statefulset.go

@@ -100,7 +100,7 @@ func StatefulSet(
 					Containers: []corev1.Container{
 						{
 							Image:        r.Spec.ContainerImage,
-							Command:      []string{"/var/lib/operator-scripts/start_redis_replication.sh"},
+							Command:      []string{"/usr/bin/dumb-init", "--", "/var/lib/operator-scripts/start_redis_replication.sh"},
 							Name:         "redis",
 							Env:          commonEnvVars,
 							Resources:    r.Spec.Resources,
@@ -125,9 +125,8 @@ func StatefulSet(
 							},
 						}, {
 							Image:   r.Spec.ContainerImage,
-							Command: []string{"/var/lib/operator-scripts/start_sentinel.sh"},
-
-							Name: "sentinel",
+							Command: []string{"/usr/bin/dumb-init", "--", "/var/lib/operator-scripts/start_sentinel.sh"},
+							Name:    "sentinel",
 							Env: append(commonEnvVars, corev1.EnvVar{
 								Name:  "SENTINEL_QUORUM",
 								Value: strconv.Itoa((int(*r.Spec.Replicas) / 2) + 1),

templates/redis/bin/common.sh

@@ -10,6 +10,9 @@ TIMEOUT=3
 POD_NAME=$HOSTNAME
 POD_FQDN=$HOSTNAME.$SVC_FQDN
 
+# Extract pod IP from /etc/hosts
+POD_IP=$(grep "$HOSTNAME" /etc/hosts | awk '{print $1}' | head -1)
+
 if test -d /var/lib/config-data/tls; then
     REDIS_CLI_CMD="redis-cli --tls"
     REDIS_CONFIG=/var/lib/redis/redis-tls.conf
@@ -35,7 +38,7 @@ function generate_configs() {
     cd /var/lib/config-data/default
     for cfg in $(find -L * -name '*.conf.in'); do
         log "Generating config file from template $PWD/${cfg}"
-        sed -e "s/{ POD_FQDN }/${POD_FQDN}/" "${cfg}" > "/var/lib/config-data/generated/${cfg%.in}"
+        sed -e "s/{ POD_FQDN }/${POD_FQDN}/g" -e "s/{ POD_IP }/${POD_IP}/g" "${cfg}" > "/var/lib/config-data/generated/${cfg%.in}"
     done
 }
 

templates/redis/config/redis.conf.in

@@ -1,5 +1,5 @@
 dir /var/lib/redis
-bind { POD_FQDN } localhost
+bind { POD_IP } localhost
 replica-announce-ip { POD_FQDN }
 port 6379
 tcp-backlog 511

templates/redis/config/sentinel.conf.in

@@ -1,5 +1,5 @@
 dir /var/lib/redis
-bind { POD_FQDN } localhost
+bind { POD_IP } localhost
 sentinel resolve-hostnames yes
 sentinel announce-hostnames yes
 sentinel announce-ip { POD_FQDN }