Skip to content

Commit 633304e

Browse files
committed
fix some minor issues
Signed-off-by: Ryan Zhang <yangzhangrice@hotmail.com>
1 parent 66caaba commit 633304e

File tree

2 files changed

+5
-10
lines changed

2 files changed

+5
-10
lines changed

pkg/propertyprovider/azure/controllers/node.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@ import (
2626
"k8s.io/apimachinery/pkg/api/errors"
2727
"k8s.io/klog/v2"
2828
ctrl "sigs.k8s.io/controller-runtime"
29-
"sigs.k8s.io/controller-runtime/pkg/builder"
3029
"sigs.k8s.io/controller-runtime/pkg/client"
31-
"sigs.k8s.io/controller-runtime/pkg/predicate"
3230

3331
"github.com/kubefleet-dev/kubefleet/pkg/propertyprovider/azure/trackers"
3432
)
@@ -95,6 +93,6 @@ func (r *NodeReconciler) SetupWithManager(mgr ctrl.Manager, controllerName strin
9593
// Reconcile any node changes (create, update, delete).
9694
return ctrl.NewControllerManagedBy(mgr).
9795
Named(controllerName).
98-
For(&corev1.Node{}, builder.WithPredicates(predicate.GenerationChangedPredicate{})).
96+
For(&corev1.Node{}).
9997
Complete(r)
10098
}

pkg/propertyprovider/azure/provider.go

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -473,16 +473,13 @@ func (p *PropertyProvider) collectK8sVersion(_ context.Context, properties map[c
473473
// Check if we have a cached version that is still valid.
474474
p.k8sVersionMutex.RLock()
475475
if p.cachedK8sVersion != "" && now.Sub(p.cachedK8sVersionObservedTime) < k8sVersionCacheTTL {
476+
defer p.k8sVersionMutex.RUnlock()
476477
// Cache is still valid, use the cached version.
477-
cachedVersion := p.cachedK8sVersion
478-
cacheTime := p.cachedK8sVersionObservedTime
479-
p.k8sVersionMutex.RUnlock()
480-
481478
properties[propertyprovider.K8sVersionProperty] = clusterv1beta1.PropertyValue{
482-
Value: cachedVersion,
483-
ObservationTime: metav1.NewTime(cacheTime),
479+
Value: p.cachedK8sVersion,
480+
ObservationTime: metav1.NewTime(p.cachedK8sVersionObservedTime),
484481
}
485-
klog.V(2).InfoS("Using cached Kubernetes version", "version", cachedVersion, "cacheAge", now.Sub(cacheTime))
482+
klog.V(2).InfoS("Using cached Kubernetes version", "version", p.cachedK8sVersion, "cacheAge", now.Sub(p.cachedK8sVersionObservedTime))
486483
return
487484
}
488485
p.k8sVersionMutex.RUnlock()

0 commit comments

Comments
 (0)