Adapted dependency-watchdog component to work with DWD v0.7.0

gardener · Mar 1, 2022 · 6e52ca2 · 6e52ca2
1 parent 4e69680
commit 6e52ca2
Show file tree

Hide file tree

Showing 4 changed files with 105 additions and 12 deletions.
diff --git a/pkg/operation/botanist/component/dependencywatchdog/dependency_watchdog.go b/pkg/operation/botanist/component/dependencywatchdog/dependency_watchdog.go
@@ -362,6 +362,17 @@ func (d *dependencyWatchdog) clusterRoleRules() []rbacv1.PolicyRule {
 				Resources: []string{"deployments", "deployments/scale"},
 				Verbs:     []string{"get", "list", "watch", "update"},
 			},
+			{
+				APIGroups: []string{"coordination.k8s.io"},
+				Resources: []string{"leases"},
+				Verbs:     []string{"create"},
+			},
+			{
+				APIGroups:     []string{"coordination.k8s.io"},
+				ResourceNames: []string{"dependency-watchdog-probe"},
+				Resources:     []string{"leases"},
+				Verbs:         []string{"get", "watch", "update"},
+			},
 		}
 	}
 

diff --git a/pkg/operation/botanist/component/dependencywatchdog/dependency_watchdog_test.go b/pkg/operation/botanist/component/dependencywatchdog/dependency_watchdog_test.go
@@ -131,6 +131,22 @@ rules:`
   - list
   - watch
   - update
+- apiGroups:
+  - coordination.k8s.io
+  resources:
+  - leases
+  verbs:
+  - create
+- apiGroups:
+  - coordination.k8s.io
+  resourceNames:
+  - dependency-watchdog-probe
+  resources:
+  - leases
+  verbs:
+  - get
+  - watch
+  - update
 `
 					}
 

diff --git a/pkg/operation/botanist/component/kubeapiserver/dependency_watchdog.go b/pkg/operation/botanist/component/kubeapiserver/dependency_watchdog.go
@@ -15,6 +15,7 @@
 package kubeapiserver
 
 import (
+	worker "github.com/gardener/gardener/extensions/pkg/controller/worker/genericactuator"
 	v1beta1constants "github.com/gardener/gardener/pkg/apis/core/v1beta1/constants"
 
 	restarterapi "github.com/gardener/dependency-watchdog/pkg/restarter/api"
@@ -70,12 +71,44 @@ func DependencyWatchdogProbeConfiguration() ([]scalerapi.ProbeDependants, error)
 			Internal:      &scalerapi.ProbeDetails{KubeconfigSecretName: DependencyWatchdogInternalProbeSecretName},
 			PeriodSeconds: pointer.Int32(30),
 		},
-		DependantScales: []*scalerapi.DependantScaleDetails{{
-			ScaleRef: autoscalingv1.CrossVersionObjectReference{
-				APIVersion: appsv1.SchemeGroupVersion.String(),
-				Kind:       "Deployment",
-				Name:       v1beta1constants.DeploymentNameKubeControllerManager,
+		DependantScales: []*scalerapi.DependantScaleDetails{
+			{
+				ScaleRef: autoscalingv1.CrossVersionObjectReference{
+					APIVersion: appsv1.SchemeGroupVersion.String(),
+					Kind:       "Deployment",
+					Name:       v1beta1constants.DeploymentNameKubeControllerManager,
+				},
+				ScaleUpDelaySeconds: pointer.Int32(120),
+			},
+			{
+				ScaleRef: autoscalingv1.CrossVersionObjectReference{
+					APIVersion: appsv1.SchemeGroupVersion.String(),
+					Kind:       "Deployment",
+					Name:       worker.McmDeploymentName,
+				},
+				ScaleUpDelaySeconds: pointer.Int32(60),
+				ScaleRefDependsOn: []autoscalingv1.CrossVersionObjectReference{
+					{
+						APIVersion: appsv1.SchemeGroupVersion.String(),
+						Kind:       "Deployment",
+						Name:       v1beta1constants.DeploymentNameKubeControllerManager,
+					},
+				},
 			},
-		}},
+			{
+				ScaleRef: autoscalingv1.CrossVersionObjectReference{
+					APIVersion: appsv1.SchemeGroupVersion.String(),
+					Kind:       "Deployment",
+					Name:       v1beta1constants.DeploymentNameClusterAutoscaler,
+				},
+				ScaleRefDependsOn: []autoscalingv1.CrossVersionObjectReference{
+					{
+						APIVersion: appsv1.SchemeGroupVersion.String(),
+						Kind:       "Deployment",
+						Name:       worker.McmDeploymentName,
+					},
+				},
+			},
+		},
 	}}, nil
 }
diff --git a/pkg/operation/botanist/component/kubeapiserver/dependency_watchdog_test.go b/pkg/operation/botanist/component/kubeapiserver/dependency_watchdog_test.go
@@ -21,6 +21,7 @@ import (
 	scalerapi "github.com/gardener/dependency-watchdog/pkg/scaler/api"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+	appsv1 "k8s.io/api/apps/v1"
 	autoscalingv1 "k8s.io/api/autoscaling/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/utils/pointer"
@@ -67,13 +68,45 @@ var _ = Describe("DependencyWatchdog", func() {
 					Internal:      &scalerapi.ProbeDetails{KubeconfigSecretName: "dependency-watchdog-internal-probe"},
 					PeriodSeconds: pointer.Int32(30),
 				},
-				DependantScales: []*scalerapi.DependantScaleDetails{{
-					ScaleRef: autoscalingv1.CrossVersionObjectReference{
-						APIVersion: "apps/v1",
-						Kind:       "Deployment",
-						Name:       "kube-controller-manager",
+				DependantScales: []*scalerapi.DependantScaleDetails{
+					{
+						ScaleRef: autoscalingv1.CrossVersionObjectReference{
+							APIVersion: "apps/v1",
+							Kind:       "Deployment",
+							Name:       "kube-controller-manager",
+						},
+						ScaleUpDelaySeconds: pointer.Int32(120),
+					},
+					{
+						ScaleRef: autoscalingv1.CrossVersionObjectReference{
+							APIVersion: "apps/v1",
+							Kind:       "Deployment",
+							Name:       "machine-controller-manager",
+						},
+						ScaleUpDelaySeconds: pointer.Int32(60),
+						ScaleRefDependsOn: []autoscalingv1.CrossVersionObjectReference{
+							{
+								APIVersion: appsv1.SchemeGroupVersion.String(),
+								Kind:       "Deployment",
+								Name:       "kube-controller-manager",
+							},
+						},
 					},
-				}},
+					{
+						ScaleRef: autoscalingv1.CrossVersionObjectReference{
+							APIVersion: "apps/v1",
+							Kind:       "Deployment",
+							Name:       "cluster-autoscaler",
+						},
+						ScaleRefDependsOn: []autoscalingv1.CrossVersionObjectReference{
+							{
+								APIVersion: appsv1.SchemeGroupVersion.String(),
+								Kind:       "Deployment",
+								Name:       "machine-controller-manager",
+							},
+						},
+					},
+				},
 			}))
 			Expect(err).NotTo(HaveOccurred())
 		})