github/capsule
1
0
Fork 0
mirror of https://github.com/projectcapsule/capsule.git synced 2026-08-25 16:07:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: bump kubernetes 1.33 (#1423)

Browse Source 
* feat(deps): bump supported kubernetes version to 1.33

Signed-off-by: Oliver Bähler <oliverbaehler@hotmail.com>

* feat(controller): support discoveryv1 endpointslices only

Signed-off-by: Oliver Bähler <oliverbaehler@hotmail.com>

* feat(deps): bump ginkgo

Signed-off-by: Oliver Bähler <oliverbaehler@hotmail.com>

---------

Signed-off-by: Oliver Bähler <oliverbaehler@hotmail.com>
This commit is contained in:
Oliver Bähler
2025-04-30 17:19:01 +02:00
committed by GitHub
parent e286dc94a7
commit d93279bceb
8 changed files with 302 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/servicelabels/endpoint.go
-30
View File
@@ -1,30 +0,0 @@
// Copyright 2020-2023 Project Capsule Authors.
// SPDX-License-Identifier: Apache-2.0
package servicelabels
import (
"context"
"github.com/go-logr/logr"
corev1 "k8s.io/api/core/v1"
ctrl "sigs.k8s.io/controller-runtime"
)
type EndpointsLabelsReconciler struct {
abstractServiceLabelsReconciler
Log logr.Logger
}
func (r *EndpointsLabelsReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager) error {
r.abstractServiceLabelsReconciler = abstractServiceLabelsReconciler{
obj: &corev1.Endpoints{},
client: mgr.GetClient(),
log: r.Log,
}
return ctrl.NewControllerManagedBy(mgr).
For(r.abstractServiceLabelsReconciler.obj, r.abstractServiceLabelsReconciler.forOptionPerInstanceName(ctx)).
Complete(r)
}
controllers/servicelabels/endpoint_slices.go
+2 -13
View File
@@ -8,7 +8,6 @@ import (
"github.com/go-logr/logr"
discoveryv1 "k8s.io/api/discovery/v1"
discoveryv1beta1 "k8s.io/api/discovery/v1beta1"
ctrl "sigs.k8s.io/controller-runtime"
)
@@ -22,22 +21,12 @@ type EndpointSlicesLabelsReconciler struct {
func (r *EndpointSlicesLabelsReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager) error {
r.abstractServiceLabelsReconciler = abstractServiceLabelsReconciler{
obj: &discoveryv1.EndpointSlice{},
client: mgr.GetClient(),
log: r.Log,
}
switch {
case r.VersionMajor == 1 && r.VersionMinor < 16:
r.Log.Info("Skipping controller setup, as EndpointSlices are not supported on current kubernetes version", "VersionMajor", r.VersionMajor, "VersionMinor", r.VersionMinor)
return nil
case r.VersionMajor == 1 && r.VersionMinor < 25:
r.obj = &discoveryv1beta1.EndpointSlice{}
default:
r.obj = &discoveryv1.EndpointSlice{}
}
return ctrl.NewControllerManagedBy(mgr).
For(r.obj, r.abstractServiceLabelsReconciler.forOptionPerInstanceName(ctx)).
For(r.abstractServiceLabelsReconciler.obj, r.abstractServiceLabelsReconciler.forOptionPerInstanceName(ctx)).
Complete(r)
}