YuzuZensai/netbird-kubernetes-operator
1
0
Fork 0
mirror of https://github.com/YuzuZensai/netbird-kubernetes-operator.git synced 2026-09-13 18:59:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enforce import ordering and aliases (#216)

Browse Source 
This change ensures import ordering and aliases is standardized.
Something that is extra important when working with Kuberentes apis that
have "standard" import aliases.

Signed-off-by: Philip Laine <philip.laine@gmail.com>
This commit is contained in:
Philip Laine
2026-04-30 13:39:11 +02:00
committed by GitHub
parent cae1ab796b
commit 74012deb27
35 changed files with 584 additions and 512 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/controller/nbsetupkey_controller.go
+21 -21
View File
@@ -23,14 +23,14 @@ import (
"github.com/google/uuid"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/handler"
"sigs.k8s.io/controller-runtime/pkg/reconcile"
netbirdiov1 "github.com/netbirdio/kubernetes-operator/api/v1"
nbv1 "github.com/netbirdio/kubernetes-operator/api/v1"
)
// NBSetupKeyReconciler reconciles a NBSetupKey object
@@ -46,7 +46,7 @@ func (r *NBSetupKeyReconciler) Reconcile(ctx context.Context, req ctrl.Request)
logger := ctrl.Log.WithName("NBSetupKey").WithValues("namespace", req.Namespace, "name", req.Name)
logger.Info("Reconciling NBSetupKey")
nbSetupKey := netbirdiov1.NBSetupKey{}
nbSetupKey := nbv1.NBSetupKey{}
err := r.Get(ctx, req.NamespacedName, &nbSetupKey)
if err != nil {
logger.Error(fmt.Errorf("internalError"), "error getting NBSetupKey", "err", err)
@@ -55,12 +55,12 @@ func (r *NBSetupKeyReconciler) Reconcile(ctx context.Context, req ctrl.Request)
if nbSetupKey.Spec.SecretKeyRef.Name == "" || nbSetupKey.Spec.SecretKeyRef.Key == "" {
logger.Error(fmt.Errorf("invalid NBSetupKey"), "secretKeyRef must contain both secret name and secret key")
return ctrl.Result{}, r.setStatus(ctx, &nbSetupKey, netbirdiov1.NBSetupKeyStatus{
Conditions: []netbirdiov1.NBCondition{
return ctrl.Result{}, r.setStatus(ctx, &nbSetupKey, nbv1.NBSetupKeyStatus{
Conditions: []nbv1.NBCondition{
{
Type: netbirdiov1.NBSetupKeyReady,
Type: nbv1.NBSetupKeyReady,
Status: corev1.ConditionFalse,
LastProbeTime: v1.Now(),
LastProbeTime: metav1.Now(),
Reason: "InvalidConfig",
Message: "secretKeyRef must contain both secret name and secret key.",
},
@@ -85,10 +85,10 @@ func (r *NBSetupKeyReconciler) Reconcile(ctx context.Context, req ctrl.Request)
return ctrl.Result{}, err
}
logger.Error(fmt.Errorf("invalid NBSetupKey"), "secret referenced not found", "err", err)
return ctrl.Result{}, r.setStatus(ctx, &nbSetupKey, netbirdiov1.NBSetupKeyStatus{Conditions: []netbirdiov1.NBCondition{{
Type: netbirdiov1.NBSetupKeyReady,
return ctrl.Result{}, r.setStatus(ctx, &nbSetupKey, nbv1.NBSetupKeyStatus{Conditions: []nbv1.NBCondition{{
Type: nbv1.NBSetupKeyReady,
Status: corev1.ConditionFalse,
LastProbeTime: v1.Now(),
LastProbeTime: metav1.Now(),
Reason: "SecretNotExists",
Message: "Referenced secret does not exist",
}}})
@@ -97,10 +97,10 @@ func (r *NBSetupKeyReconciler) Reconcile(ctx context.Context, req ctrl.Request)
uuidBytes, ok := secret.Data[nbSetupKey.Spec.SecretKeyRef.Key]
if !ok {
logger.Error(fmt.Errorf("invalid NBSetupKey"), "secret key referenced not found")
return ctrl.Result{}, r.setStatus(ctx, &nbSetupKey, netbirdiov1.NBSetupKeyStatus{Conditions: []netbirdiov1.NBCondition{{
Type: netbirdiov1.NBSetupKeyReady,
return ctrl.Result{}, r.setStatus(ctx, &nbSetupKey, nbv1.NBSetupKeyStatus{Conditions: []nbv1.NBCondition{{
Type: nbv1.NBSetupKeyReady,
Status: corev1.ConditionFalse,
LastProbeTime: v1.Now(),
LastProbeTime: metav1.Now(),
Reason: "SecretKeyNotExists",
Message: "Referenced secret key does not exist",
}}})
@@ -109,22 +109,22 @@ func (r *NBSetupKeyReconciler) Reconcile(ctx context.Context, req ctrl.Request)
_, err = uuid.Parse(string(uuidBytes))
if err != nil {
logger.Error(fmt.Errorf("invalid NBSetupKey"), "setupKey is not a valid UUID", "err", err)
return ctrl.Result{}, r.setStatus(ctx, &nbSetupKey, netbirdiov1.NBSetupKeyStatus{Conditions: []netbirdiov1.NBCondition{{
Type: netbirdiov1.NBSetupKeyReady,
return ctrl.Result{}, r.setStatus(ctx, &nbSetupKey, nbv1.NBSetupKeyStatus{Conditions: []nbv1.NBCondition{{
Type: nbv1.NBSetupKeyReady,
Status: corev1.ConditionFalse,
LastProbeTime: v1.Now(),
LastProbeTime: metav1.Now(),
Reason: "InvalidSetupKey",
Message: "Referenced secret is not a valid SetupKey",
}}})
}
return ctrl.Result{}, r.setStatus(ctx, &nbSetupKey, netbirdiov1.NBSetupKeyStatus{Conditions: []netbirdiov1.NBCondition{{
Type: netbirdiov1.NBSetupKeyReady,
return ctrl.Result{}, r.setStatus(ctx, &nbSetupKey, nbv1.NBSetupKeyStatus{Conditions: []nbv1.NBCondition{{
Type: nbv1.NBSetupKeyReady,
Status: corev1.ConditionTrue,
LastProbeTime: v1.Now(),
LastProbeTime: metav1.Now(),
}}})
}
func (r *NBSetupKeyReconciler) setStatus(ctx context.Context, nbsetupkey *netbirdiov1.NBSetupKey, status netbirdiov1.NBSetupKeyStatus) error {
func (r *NBSetupKeyReconciler) setStatus(ctx context.Context, nbsetupkey *nbv1.NBSetupKey, status nbv1.NBSetupKeyStatus) error {
nbsetupkey.Status = status
err := r.Status().Update(ctx, nbsetupkey)
return err
@@ -135,7 +135,7 @@ func (r *NBSetupKeyReconciler) SetupWithManager(mgr ctrl.Manager) error {
r.ReferencedSecrets = make(map[string]types.NamespacedName)
return ctrl.NewControllerManagedBy(mgr).
For(&netbirdiov1.NBSetupKey{}).
For(&nbv1.NBSetupKey{}).
Named("nbsetupkey").
Watches(
&corev1.Secret{},