Skip to content

Scope Deployment and PodDisruptionBudget cache to maintenance objects #318

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
fwiesel merged 1 commit into from
Jul 2, 2026
+32 −16
Merged

Scope Deployment and PodDisruptionBudget cache to maintenance objects #318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 22 additions & 11 deletions cmd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ import (

"go.uber.org/zap"
"go.uber.org/zap/zapcore"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
policyv1 "k8s.io/api/policy/v1"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/runtime"
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
Expand Down Expand Up @@ -179,7 +181,24 @@ func main() {
bininfo.CommitOr("edge"))

leaderElectionID := "4c28796a.cloud.sap"
var cacheOptions cache.Options
// Deployments and PodDisruptionBudgets owned by the maintenance controller
// always live in kube-system and carry the cobaltcore-maintenance-controller
// label; restrict the cache to exactly those objects.
maintenanceSelector, err := labels.Parse(controller.MaintenanceLabelKey)
if err != nil {
setupLog.Error(err, "unable to parse maintenance label selector")
os.Exit(1)
}
maintenanceCacheConfig := cache.ByObject{
Namespaces: map[string]cache.Config{controller.MaintenanceNamespace: {}},
Label: maintenanceSelector,
}
Comment thread
fwiesel marked this conversation as resolved.
cacheOptions := cache.Options{
ByObject: map[client.Object]cache.ByObject{
&appsv1.Deployment{}: maintenanceCacheConfig,
&policyv1.PodDisruptionBudget{}: maintenanceCacheConfig,
},
}
Comment thread
fwiesel marked this conversation as resolved.
if global.LabelSelector != "" {
setupLog.Info("setting up cache with label selector", "selector", global.LabelSelector)
selector, err := labels.Parse(global.LabelSelector)
Expand All @@ -188,16 +207,8 @@ func main() {
os.Exit(1)
}

cacheOptions = cache.Options{
ByObject: map[client.Object]cache.ByObject{
&corev1.Node{}: {
Label: selector,
},
&kvmv1.Hypervisor{}: {
Label: selector,
},
},
}
cacheOptions.ByObject[&corev1.Node{}] = cache.ByObject{Label: selector}
cacheOptions.ByObject[&kvmv1.Hypervisor{}] = cache.ByObject{Label: selector}

h := sha256.New()
h.Write([]byte(leaderElectionID)) // Seed it with something "unique" to the project
Expand Down
7 changes: 7 additions & 0 deletions internal/controller/constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,11 @@ package controller
const (
labelHypervisor = "nova.openstack.cloud.sap/virt-driver"
testAggregateName = "tenant_filter_tests"

// MaintenanceLabelKey is the label key applied to Deployments and
// PodDisruptionBudgets owned by the maintenance controller.
MaintenanceLabelKey = "cobaltcore-maintenance-controller"
// MaintenanceNamespace is the namespace where the maintenance controller
// creates its Deployments and PodDisruptionBudgets.
MaintenanceNamespace = "kube-system"
)
8 changes: 3 additions & 5 deletions internal/controller/gardener_node_lifecycle_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,6 @@ type GardenerNodeLifecycleController struct {
}

const (
labelDeployment = "cobaltcore-maintenance-controller"
maintenancePodsNamespace = "kube-system"
labelCriticalComponent = "node.gardener.cloud/critical-component"
valueReasonTerminating = "terminating"
MaintenanceControllerName = "maintenance"
Expand Down Expand Up @@ -123,7 +121,7 @@ func (r *GardenerNodeLifecycleController) ensureBlockingPodDisruptionBudget(ctx
return err
}

podDisruptionBudget := policyv1ac.PodDisruptionBudget(name, maintenancePodsNamespace).
podDisruptionBudget := policyv1ac.PodDisruptionBudget(name, MaintenanceNamespace).
WithLabels(nodeLabels).
WithOwnerReferences(OwnerReference(node, &gvk)).
WithSpec(policyv1ac.PodDisruptionBudgetSpec().
Expand Down Expand Up @@ -155,7 +153,7 @@ func nameForNode(node *corev1.Node) string {

func labelsForNode(node *corev1.Node) map[string]string {
return map[string]string{
labelDeployment: nameForNode(node),
MaintenanceLabelKey: nameForNode(node),
}
}

Expand All @@ -178,7 +176,7 @@ func (r *GardenerNodeLifecycleController) ensureSignallingDeployment(ctx context
return err
}

deployment := apps1ac.Deployment(name, maintenancePodsNamespace).
deployment := apps1ac.Deployment(name, MaintenanceNamespace).
WithOwnerReferences(OwnerReference(node, &gvk)).
WithLabels(labels).
WithSpec(apps1ac.DeploymentSpec().
Expand Down
Loading