diff --git a/internal/controller/chianode/assemblers.go b/internal/controller/chianode/assemblers.go index 9d068b3..9cd4fef 100644 --- a/internal/controller/chianode/assemblers.go +++ b/internal/controller/chianode/assemblers.go @@ -398,7 +398,7 @@ func assembleChiaContainer(ctx context.Context, node k8schianetv1.ChiaNode, full input.LivenessProbe = node.Spec.ChiaConfig.LivenessProbe } else if node.Spec.ChiaHealthcheckConfig.Enabled { input.LivenessProbe = kube.AssembleChiaHealthcheckProbe(kube.AssembleChiaHealthcheckProbeInputs{ - Kind: consts.ChiaNodeKind, + Path: "/full_node", }) } @@ -406,7 +406,7 @@ func assembleChiaContainer(ctx context.Context, node k8schianetv1.ChiaNode, full input.ReadinessProbe = node.Spec.ChiaConfig.ReadinessProbe } else if node.Spec.ChiaHealthcheckConfig.Enabled { input.ReadinessProbe = kube.AssembleChiaHealthcheckProbe(kube.AssembleChiaHealthcheckProbeInputs{ - Kind: consts.ChiaNodeKind, + Path: "/full_node/readiness", }) } @@ -416,7 +416,7 @@ func assembleChiaContainer(ctx context.Context, node k8schianetv1.ChiaNode, full failThresh := int32(30) periodSec := int32(10) input.StartupProbe = kube.AssembleChiaHealthcheckProbe(kube.AssembleChiaHealthcheckProbeInputs{ - Kind: consts.ChiaNodeKind, + Path: "/full_node/readiness", FailureThreshold: &failThresh, PeriodSeconds: &periodSec, }) diff --git a/internal/controller/chiaseeder/assemblers.go b/internal/controller/chiaseeder/assemblers.go index 831d1bd..4dcd9e8 100644 --- a/internal/controller/chiaseeder/assemblers.go +++ b/internal/controller/chiaseeder/assemblers.go @@ -417,7 +417,7 @@ func assembleChiaContainer(seeder k8schianetv1.ChiaSeeder, fullNodePort int32, n input.LivenessProbe = seeder.Spec.ChiaConfig.LivenessProbe } else if seeder.Spec.ChiaHealthcheckConfig.Enabled && seeder.Spec.ChiaHealthcheckConfig.DNSHostname != nil { input.ReadinessProbe = kube.AssembleChiaHealthcheckProbe(kube.AssembleChiaHealthcheckProbeInputs{ - Kind: consts.ChiaSeederKind, + Path: "/seeder", }) } @@ -425,7 +425,7 @@ func assembleChiaContainer(seeder k8schianetv1.ChiaSeeder, fullNodePort int32, n input.ReadinessProbe = seeder.Spec.ChiaConfig.ReadinessProbe } else if seeder.Spec.ChiaHealthcheckConfig.Enabled && seeder.Spec.ChiaHealthcheckConfig.DNSHostname != nil { input.ReadinessProbe = kube.AssembleChiaHealthcheckProbe(kube.AssembleChiaHealthcheckProbeInputs{ - Kind: consts.ChiaSeederKind, + Path: "/seeder/readiness", }) } @@ -435,7 +435,7 @@ func assembleChiaContainer(seeder k8schianetv1.ChiaSeeder, fullNodePort int32, n failThresh := int32(30) periodSec := int32(10) input.StartupProbe = kube.AssembleChiaHealthcheckProbe(kube.AssembleChiaHealthcheckProbeInputs{ - Kind: consts.ChiaSeederKind, + Path: "/seeder/readiness", FailureThreshold: &failThresh, PeriodSeconds: &periodSec, }) diff --git a/internal/controller/chiatimelord/assemblers.go b/internal/controller/chiatimelord/assemblers.go index a71ebab..dbe577f 100644 --- a/internal/controller/chiatimelord/assemblers.go +++ b/internal/controller/chiatimelord/assemblers.go @@ -403,7 +403,7 @@ func assembleChiaContainer(ctx context.Context, tl k8schianetv1.ChiaTimelord, ne input.LivenessProbe = tl.Spec.ChiaConfig.LivenessProbe } else if tl.Spec.ChiaHealthcheckConfig.Enabled { input.LivenessProbe = kube.AssembleChiaHealthcheckProbe(kube.AssembleChiaHealthcheckProbeInputs{ - Kind: consts.ChiaTimelordKind, + Path: "/timelord", }) } @@ -411,7 +411,7 @@ func assembleChiaContainer(ctx context.Context, tl k8schianetv1.ChiaTimelord, ne input.ReadinessProbe = tl.Spec.ChiaConfig.ReadinessProbe } else if tl.Spec.ChiaHealthcheckConfig.Enabled { input.ReadinessProbe = kube.AssembleChiaHealthcheckProbe(kube.AssembleChiaHealthcheckProbeInputs{ - Kind: consts.ChiaTimelordKind, + Path: "/timelord/readiness", }) } @@ -421,7 +421,7 @@ func assembleChiaContainer(ctx context.Context, tl k8schianetv1.ChiaTimelord, ne failThresh := int32(30) periodSec := int32(10) input.StartupProbe = kube.AssembleChiaHealthcheckProbe(kube.AssembleChiaHealthcheckProbeInputs{ - Kind: consts.ChiaTimelordKind, + Path: "/timelord/readiness", FailureThreshold: &failThresh, PeriodSeconds: &periodSec, }) diff --git a/internal/controller/common/kube/assemblers.go b/internal/controller/common/kube/assemblers.go index 89820f4..b5cd4dd 100644 --- a/internal/controller/common/kube/assemblers.go +++ b/internal/controller/common/kube/assemblers.go @@ -247,7 +247,7 @@ func AssembleChiaHealthcheckContainer(input AssembleChiaHealthcheckContainerInpu // AssembleChiaHealthcheckProbeInputs contains configuration inputs to the AssembleChiaHealthcheckProbe function type AssembleChiaHealthcheckProbeInputs struct { - Kind consts.ChiaKind + Path string FailureThreshold *int32 PeriodSeconds *int32 } @@ -256,7 +256,7 @@ func AssembleChiaHealthcheckProbe(input AssembleChiaHealthcheckProbeInputs) *cor probe := corev1.Probe{ ProbeHandler: corev1.ProbeHandler{ HTTPGet: &corev1.HTTPGetAction{ - Path: "/", + Path: input.Path, Port: intstr.FromInt32(consts.ChiaHealthcheckPort), }, }, @@ -270,15 +270,5 @@ func AssembleChiaHealthcheckProbe(input AssembleChiaHealthcheckProbeInputs) *cor probe.PeriodSeconds = *input.PeriodSeconds } - switch input.Kind { - case consts.ChiaNodeKind: - probe.ProbeHandler.HTTPGet.Path = "/full_node" - case consts.ChiaSeederKind: - probe.ProbeHandler.HTTPGet.Path = "/seeder" - case consts.ChiaTimelordKind: - probe.ProbeHandler.HTTPGet.Path = "/timelord" - default: - return nil - } return &probe } diff --git a/internal/controller/common/kube/assemblers_test.go b/internal/controller/common/kube/assemblers_test.go index ca4c6da..682c0bc 100644 --- a/internal/controller/common/kube/assemblers_test.go +++ b/internal/controller/common/kube/assemblers_test.go @@ -497,7 +497,7 @@ func TestAssembleChiaHealthcheckProbe_Minimal(t *testing.T) { }, } actual := AssembleChiaHealthcheckProbe(AssembleChiaHealthcheckProbeInputs{ - Kind: consts.ChiaSeederKind, + Path: "/seeder", }) require.Equal(t, expected, *actual) } @@ -508,7 +508,7 @@ func TestAssembleChiaHealthcheckProbe_Full(t *testing.T) { expected := corev1.Probe{ ProbeHandler: corev1.ProbeHandler{ HTTPGet: &corev1.HTTPGetAction{ - Path: "/seeder", + Path: "/seeder/readiness", Port: intstr.FromInt32(consts.ChiaHealthcheckPort), }, }, @@ -516,7 +516,7 @@ func TestAssembleChiaHealthcheckProbe_Full(t *testing.T) { PeriodSeconds: periodSec, } actual := AssembleChiaHealthcheckProbe(AssembleChiaHealthcheckProbeInputs{ - Kind: consts.ChiaSeederKind, + Path: "/seeder/readiness", FailureThreshold: &failThresh, PeriodSeconds: &periodSec, })