Skip to content

Renamed MaintenanceController to GardenerNodeLifecycleController #176

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
Nov 12, 2025
Merged

Renamed MaintenanceController to GardenerNodeLifecycleController #176

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
2 changes: 1 addition & 1 deletion cmd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ func main() {
os.Exit(1)
}

if err = (&controller.MaintenanceController{
if err = (&controller.GardenerNodeLifecycleController{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
}).SetupWithManager(mgr, certificateNamespace); err != nil {
Expand Down
11 changes: 5 additions & 6 deletions ...rnal/controller/maintenance_controller.go → ...ler/gardener_node_lifecycle_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,14 @@ import (
"github.com/cobaltcore-dev/openstack-hypervisor-operator/internal/openstack"
)

type MaintenanceController struct {
type GardenerNodeLifecycleController struct {
k8sclient.Client
Scheme *runtime.Scheme
serviceClient *gophercloud.ServiceClient
namespace string
}

const (
labelManagedBy = "app.kubernetes.io/managed-by"
labelDeployment = "cobaltcore-maintenance-controller"
maintenancePodsNamespace = "kube-system"
labelCriticalComponent = "node.gardener.cloud/critical-component"
Expand All @@ -65,7 +64,7 @@ const (
// +kubebuilder:rbac:groups="apps",resources=deployments,verbs=create;delete;get;list;patch;update;watch
// +kubebuilder:rbac:groups="policy",resources=poddisruptionbudgets,verbs=create;delete;get;list;patch;update;watch

func (r *MaintenanceController) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
func (r *GardenerNodeLifecycleController) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
log := logger.FromContext(ctx).WithName(req.Name)
ctx = logger.IntoContext(ctx, log)

Expand Down Expand Up @@ -115,7 +114,7 @@ func (r *MaintenanceController) Reconcile(ctx context.Context, req ctrl.Request)
return ctrl.Result{}, nil
}

func (r *MaintenanceController) ensureBlockingPodDisruptionBudget(ctx context.Context, node *corev1.Node, minAvailable int32) error {
func (r *GardenerNodeLifecycleController) ensureBlockingPodDisruptionBudget(ctx context.Context, node *corev1.Node, minAvailable int32) error {
name := nameForNode(node)
podDisruptionBudget := &policyv1.PodDisruptionBudget{
ObjectMeta: metav1.ObjectMeta{
Expand Down Expand Up @@ -165,7 +164,7 @@ func labelsForNode(node *corev1.Node) map[string]string {
}
}

func (r *MaintenanceController) ensureSignallingDeployment(ctx context.Context, node *corev1.Node, scale int32, ready bool) error {
func (r *GardenerNodeLifecycleController) ensureSignallingDeployment(ctx context.Context, node *corev1.Node, scale int32, ready bool) error {
name := nameForNode(node)
deployment := &appsv1.Deployment{
ObjectMeta: metav1.ObjectMeta{
Expand Down Expand Up @@ -250,7 +249,7 @@ func (r *MaintenanceController) ensureSignallingDeployment(ctx context.Context,
}

// SetupWithManager sets up the controller with the Manager.
func (r *MaintenanceController) SetupWithManager(mgr ctrl.Manager, namespace string) error {
func (r *GardenerNodeLifecycleController) SetupWithManager(mgr ctrl.Manager, namespace string) error {
ctx := context.Background()
_ = logger.FromContext(ctx)
r.namespace = namespace
Expand Down
8 changes: 4 additions & 4 deletions ...controller/maintenance_controller_test.go → ...ardener_node_lifecycle_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
)

var _ = Describe("Maintenance Controller", func() {
var _ = Describe("Gardener Maintenance Controller", func() {
const nodeName = "node-test"
var maintenanceController *MaintenanceController
var controller *GardenerNodeLifecycleController

BeforeEach(func() {
maintenanceController = &MaintenanceController{
controller = &GardenerNodeLifecycleController{
Client: k8sClient,
Scheme: k8sClient.Scheme(),
}
Expand Down Expand Up @@ -64,7 +64,7 @@ var _ = Describe("Maintenance Controller", func() {
}

By("Reconciling the created resource")
_, err := maintenanceController.Reconcile(ctx, req)
_, err := controller.Reconcile(ctx, req)
Expect(err).NotTo(HaveOccurred())
})
})
Expand Down
Loading