Skip to content

feat: probe use built-in, discarded healthcheck.sh #907

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
drivebyer merged 2 commits into from
May 6, 2024
Merged

feat: probe use built-in, discarded healthcheck.sh #907

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b43c471
feat: probe use built-in, discarded healthcheck.sh
drivebyer Apr 30, 2024
700b8dd
use shell
drivebyer Apr 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 23 additions & 7 deletions k8sutils/statefulset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,9 @@ func createPVCTemplate(volumeName string, stsMeta metav1.ObjectMeta, storageSpec

// generateContainerDef generates container definition for Redis
func generateContainerDef(name string, containerParams containerParameters, clusterMode, nodeConfVolume, enableMetrics bool, externalConfig, clusterVersion *string, mountpath []corev1.VolumeMount, sidecars []redisv1beta2.Sidecar) []corev1.Container {
sentinelCntr := containerParams.Role == "sentinel"
enableTLS := containerParams.TLSConfig != nil
enableAuth := containerParams.EnabledPassword != nil && *containerParams.EnabledPassword
containerDefinition := []corev1.Container{
{
Name: name,
Expand All @@ -363,8 +366,8 @@ func generateContainerDef(name string, containerParams containerParameters, clus
containerParams.Port,
clusterVersion,
),
ReadinessProbe: getProbeInfo(containerParams.ReadinessProbe),
LivenessProbe: getProbeInfo(containerParams.LivenessProbe),
ReadinessProbe: getProbeInfo(containerParams.ReadinessProbe, sentinelCntr, enableTLS, enableAuth),
LivenessProbe: getProbeInfo(containerParams.LivenessProbe, sentinelCntr, enableTLS, enableAuth),
VolumeMounts: getVolumeMount(name, containerParams.PersistenceEnabled, clusterMode, nodeConfVolume, externalConfig, mountpath, containerParams.TLSConfig, containerParams.ACLConfig),
},
}
Expand Down Expand Up @@ -593,7 +596,23 @@ func getVolumeMount(name string, persistenceEnabled *bool, clusterMode bool, nod
}

// getProbeInfo generate probe for Redis StatefulSet
func getProbeInfo(probe *commonapi.Probe) *corev1.Probe {
func getProbeInfo(probe *commonapi.Probe, sentinel, enableTLS, enableAuth bool) *corev1.Probe {
healthChecker := []string{
"redis-cli",
"-h", "$(hostname)",
}
if sentinel {
healthChecker = append(healthChecker, "-p", "${SENTINEL_PORT}")
} else {
healthChecker = append(healthChecker, "-p", "${REDIS_PORT}")
}
if enableAuth {
healthChecker = append(healthChecker, "-a", "${REDIS_PASSWORD}")
}
if enableTLS {
healthChecker = append(healthChecker, "--tls", "--cert", "${REDIS_TLS_CERT}", "--key", "${REDIS_TLS_CERT_KEY}", "--cacert", "${REDIS_TLS_CA_KEY}")
}
healthChecker = append(healthChecker, "ping")
return &corev1.Probe{
InitialDelaySeconds: probe.InitialDelaySeconds,
PeriodSeconds: probe.PeriodSeconds,
Expand All @@ -602,10 +621,7 @@ func getProbeInfo(probe *commonapi.Probe) *corev1.Probe {
SuccessThreshold: probe.SuccessThreshold,
ProbeHandler: corev1.ProbeHandler{
Exec: &corev1.ExecAction{
Command: []string{
"bash",
"/usr/bin/healthcheck.sh",
},
Command: []string{"sh", "-c", strings.Join(healthChecker, " ")},
},
},
}
Expand Down