-
Notifications
You must be signed in to change notification settings - Fork 752
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
add_enhanced_livenessProbe_webhook (#1467)
Signed-off-by: jicheng.sk <jicheng.sk@alibaba-inc.com> Co-authored-by: jicheng.sk <jicheng.sk@alibaba-inc.com>
- Loading branch information
Showing
6 changed files
with
619 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| package v1alpha1 | ||
|
|
||
| const ( | ||
| // AnnotationUsingEnhancedLiveness indicates that the enhanced liveness probe of pod is enabled. | ||
| AnnotationUsingEnhancedLiveness = "apps.kruise.io/using-enhanced-liveness" | ||
| // AnnotationUsingEnhancedLiveness indicates the backup probe (json types) of the pod native container livnessprobe configuration. | ||
| AnnotationNativeContainerProbeContext = "apps.kruise.io/container-probe-context" | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| package mutating | ||
|
|
||
| import ( | ||
| "context" | ||
| "encoding/json" | ||
| "fmt" | ||
|
|
||
| admissionv1 "k8s.io/api/admission/v1" | ||
| v1 "k8s.io/api/core/v1" | ||
| "k8s.io/klog/v2" | ||
| "sigs.k8s.io/controller-runtime/pkg/webhook/admission" | ||
|
|
||
| alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" | ||
| "github.com/openkruise/kruise/pkg/util" | ||
| ) | ||
|
|
||
| type containerLivenessProbe struct { | ||
| Name string `json:"name"` | ||
| LivenessProbe v1.Probe `json:"livenessProbe"` | ||
| } | ||
|
|
||
| func (h *PodCreateHandler) enhancedLivenessProbeWhenPodCreate(ctx context.Context, req admission.Request, pod *v1.Pod) (skip bool, err error) { | ||
|
|
||
| if len(req.AdmissionRequest.SubResource) > 0 || | ||
| req.AdmissionRequest.Operation != admissionv1.Create || | ||
| req.AdmissionRequest.Resource.Resource != "pods" { | ||
| return true, nil | ||
| } | ||
|
|
||
| if !util.IsPodOwnedByKruise(pod) { | ||
| return true, nil | ||
| } | ||
|
|
||
| if !usingEnhancedLivenessProbe(pod) { | ||
| return true, nil | ||
| } | ||
|
|
||
| context, err := removeAndBackUpPodContainerLivenessProbe(pod) | ||
| if err != nil { | ||
| klog.Errorf("Remove pod (%v/%v) container livenessProbe config and backup error: %v", pod.Namespace, pod.Name, err) | ||
| return false, err | ||
| } | ||
| if context == "" { | ||
| return true, nil | ||
| } | ||
| klog.V(3).Infof("Mutating add pod(%s/%s) annotation[%s]=%s", pod.Namespace, pod.Name, alpha1.AnnotationNativeContainerProbeContext, context) | ||
| return false, nil | ||
| } | ||
|
|
||
| // return two parameters: | ||
| // 1. the json string of the pod containers native livenessProbe configurations. | ||
| // 2. the error reason of the function. | ||
| func removeAndBackUpPodContainerLivenessProbe(pod *v1.Pod) (string, error) { | ||
| containersLivenessProbe := []containerLivenessProbe{} | ||
| for index := range pod.Spec.Containers { | ||
| getContainer := &pod.Spec.Containers[index] | ||
| if getContainer.LivenessProbe == nil { | ||
| continue | ||
| } | ||
| containersLivenessProbe = append(containersLivenessProbe, containerLivenessProbe{ | ||
| Name: getContainer.Name, | ||
| LivenessProbe: *getContainer.LivenessProbe, | ||
| }) | ||
| getContainer.LivenessProbe = nil | ||
| } | ||
|
|
||
| if len(containersLivenessProbe) == 0 { | ||
| return "", nil | ||
| } | ||
| containersLivenessProbeRaw, err := json.Marshal(containersLivenessProbe) | ||
| if err != nil { | ||
| klog.Errorf("Failed to json marshal %v for pod: %v/%v, err: %v", | ||
| containersLivenessProbe, pod.Namespace, pod.Name, err) | ||
| return "", fmt.Errorf("Failed to json marshal %v for pod: %v/%v, err: %v", | ||
| containersLivenessProbe, pod.Namespace, pod.Name, err) | ||
| } | ||
| if pod.Annotations == nil { | ||
| pod.Annotations = map[string]string{} | ||
| } | ||
| pod.Annotations[alpha1.AnnotationNativeContainerProbeContext] = string(containersLivenessProbeRaw) | ||
| return pod.Annotations[alpha1.AnnotationNativeContainerProbeContext], nil | ||
| } | ||
|
|
||
| // return one parameter: | ||
| // 1. the native container livenessprobe is enabled when the alpha1.AnnotationUsingEnhancedLiveness is true. | ||
| func usingEnhancedLivenessProbe(pod *v1.Pod) bool { | ||
| return pod.Annotations[alpha1.AnnotationUsingEnhancedLiveness] == "true" | ||
| } |
Oops, something went wrong.