enabled self heal through readiness and liveness probes

tomp21 · Dec 26, 2024 · 2db2bbe · 2db2bbe
1 parent 5d66705
commit 2db2bbe
Show file tree

Hide file tree

Showing 3 changed files with 79 additions and 2 deletions.
diff --git a/internal/controller/reconcilers/configmaps/health/ping_liveness_master.sh b/internal/controller/reconcilers/configmaps/health/ping_liveness_master.sh
@@ -6,7 +6,7 @@ response=$(
   timeout -s 15 $1 \
   redis-cli \
     -h $REDIS_MASTER_HOST \
-    -p $REDIS_MASTER_PORT_NUMBER \
+    -p $REDIS_PORT \
     ping
 )
 if [ "$?" -eq "124" ]; then

diff --git a/internal/controller/reconcilers/configmaps/health/ping_readiness_master.sh b/internal/controller/reconcilers/configmaps/health/ping_readiness_master.sh
@@ -6,7 +6,7 @@ response=$(
   timeout -s 15 $1 \
   redis-cli \
     -h $REDIS_MASTER_HOST \
-    -p $REDIS_MASTER_PORT_NUMBER \
+    -p $REDIS_PORT \
     ping
 )
 if [ "$?" -eq "124" ]; then

diff --git a/internal/controller/reconcilers/statefulset_reconciler.go b/internal/controller/reconcilers/statefulset_reconciler.go
@@ -215,6 +215,32 @@ func getMasterContainers(name, image string) []corev1.Container {
 					Name:      fmt.Sprintf("%s-data", name),
 					MountPath: "/data",
 				},
+				{
+					Name:      "health",
+					MountPath: "/health",
+				},
+			},
+			LivenessProbe: &corev1.Probe{
+				ProbeHandler: corev1.ProbeHandler{
+					Exec: &corev1.ExecAction{
+						Command: []string{
+							"sh",
+							"-c",
+							"/health/ping_liveness_local.sh 5",
+						},
+					},
+				},
+			},
+			ReadinessProbe: &corev1.Probe{
+				ProbeHandler: corev1.ProbeHandler{
+					Exec: &corev1.ExecAction{
+						Command: []string{
+							"sh",
+							"-c",
+							"/health/ping_readiness_local.sh 1",
+						},
+					},
+				},
 			},
 			Resources: getResources(),
 		},
@@ -240,6 +266,17 @@ func getReplicaContainers(name, image string) []corev1.Container {
 						},
 					},
 				},
+				{
+					Name: "REDIS_MASTER_PASSWORD",
+					ValueFrom: &corev1.EnvVarSource{
+						SecretKeyRef: &corev1.SecretKeySelector{
+							LocalObjectReference: corev1.LocalObjectReference{
+								Name: name,
+							},
+							Key: PasswordSecretKey,
+						},
+					},
+				},
 				{
 					Name:  "REDIS_REPLICATION_MODE",
 					Value: "replica",
@@ -256,6 +293,10 @@ func getReplicaContainers(name, image string) []corev1.Container {
 					Name:  "HEADLESS_SERVICE",
 					Value: fmt.Sprintf("%s-headless", name),
 				},
+				{
+					Name:  "ALLOW_EMPLTY_PASSWORD",
+					Value: "no",
+				},
 			},
 			Ports: []corev1.ContainerPort{
 				{
@@ -275,6 +316,32 @@ func getReplicaContainers(name, image string) []corev1.Container {
 					Name:      fmt.Sprintf("%s-data", name),
 					MountPath: "/data",
 				},
+				{
+					Name:      "health",
+					MountPath: "/health",
+				},
+			},
+			LivenessProbe: &corev1.Probe{
+				ProbeHandler: corev1.ProbeHandler{
+					Exec: &corev1.ExecAction{
+						Command: []string{
+							"sh",
+							"-c",
+							"/health/ping_liveness_local_and_master.sh 5",
+						},
+					},
+				},
+			},
+			ReadinessProbe: &corev1.Probe{
+				ProbeHandler: corev1.ProbeHandler{
+					Exec: &corev1.ExecAction{
+						Command: []string{
+							"sh",
+							"-c",
+							"/health/ping_readiness_local_and_master.sh 1",
+						},
+					},
+				},
 			},
 			Resources: getResources(),
 		},
@@ -329,6 +396,16 @@ func getVolumes() []corev1.Volume {
 					DefaultMode: &defaultMode,
 				},
 			},
+		}, {
+			Name: "health",
+			VolumeSource: corev1.VolumeSource{
+				ConfigMap: &corev1.ConfigMapVolumeSource{
+					LocalObjectReference: corev1.LocalObjectReference{
+						Name: "redis-health",
+					},
+					DefaultMode: &defaultMode,
+				},
+			},
 		},
 	}
 }