feat: add readiness & liveness probe for fluentd (#980)

* add types for readiness/liveness probe Signed-off-by: juicer <cwguoz@gmail.com> * readiness probe and liveness probe for fluentd Signed-off-by: juicer <cwguoz@gmail.com> * generated docs Signed-off-by: juicer <cwguoz@gmail.com> --------- Signed-off-by: juicer <cwguoz@gmail.com>
fluent · Nov 6, 2023 · 516c17b · 516c17b
1 parent fb92dfa
commit 516c17b
Show file tree

Hide file tree

Showing 9 changed files with 1,164 additions and 0 deletions.
diff --git a/apis/fluentd/v1alpha1/fluentd_types.go b/apis/fluentd/v1alpha1/fluentd_types.go
@@ -112,6 +112,10 @@ type FluentdSpec struct {
 	// Storage for position db. You will use it if tail input is enabled.
 	// Applicable when the mode is "agent", and will be ignored when the mode is "collector"
 	PositionDB corev1.VolumeSource `json:"positionDB,omitempty"`
+	// LivenessProbe represents the liveness probe for the fluentd container.
+	LivenessProbe *corev1.Probe `json:"livenessProbe,omitempty"`
+	// ReadinessProbe represents the readiness probe for the fluentd container.
+	ReadinessProbe *corev1.Probe `json:"readinessProbe,omitempty"`
 }
 
 // FluentDService the service of the FluentD

diff --git a/apis/fluentd/v1alpha1/zz_generated.deepcopy.go b/apis/fluentd/v1alpha1/zz_generated.deepcopy.go
diff --git a/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_fluentds.yaml b/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_fluentds.yaml
diff --git a/config/crd/bases/fluentd.fluent.io_fluentds.yaml b/config/crd/bases/fluentd.fluent.io_fluentds.yaml
diff --git a/docs/fluentd.md b/docs/fluentd.md
@@ -360,6 +360,8 @@ FluentdSpec defines the desired state of Fluentd
 | mode | Mode to determine whether to run Fluentd as collector or agent. | string |
 | containerSecurityContext | ContainerSecurityContext represents the security context for the fluentd container. | *corev1.SecurityContext |
 | positionDB | Storage for position db. You will use it if tail input is enabled. Applicable when the mode is \"agent\", and will be ignored when the mode is \"collector\" | [corev1.VolumeSource](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.17/#volume-v1-core) |
+| livenessProbe | LivenessProbe represents the liveness probe for the fluentd container. | *corev1.Probe |
+| readinessProbe | ReadinessProbe represents the readiness probe for the fluentd container. | *corev1.Probe |
 
 [Back to TOC](#table-of-contents)
 # FluentdStatus

diff --git a/manifests/setup/fluent-operator-crd.yaml b/manifests/setup/fluent-operator-crd.yaml
diff --git a/manifests/setup/setup.yaml b/manifests/setup/setup.yaml
diff --git a/pkg/operator/fluentd-daemonset.go b/pkg/operator/fluentd-daemonset.go
@@ -107,6 +107,8 @@ func MakeFluentdDaemonSet(fd fluentdv1alpha1.Fluentd) *appsv1.DaemonSet {
 								},
 							},
 							SecurityContext: fd.Spec.ContainerSecurityContext,
+							LivenessProbe:   fd.Spec.LivenessProbe,
+							ReadinessProbe:  fd.Spec.ReadinessProbe,
 						},
 					},
 					NodeSelector: fd.Spec.NodeSelector,

diff --git a/pkg/operator/sts.go b/pkg/operator/sts.go
@@ -108,6 +108,8 @@ func MakeStatefulSet(fd fluentdv1alpha1.Fluentd) *appsv1.StatefulSet {
 									Value: BufferMountPath,
 								},
 							},
+							ReadinessProbe: fd.Spec.ReadinessProbe,
+							LivenessProbe:  fd.Spec.LivenessProbe,
 						},
 					},
 					NodeSelector: fd.Spec.NodeSelector,