feat(cluster) Changes after CodeReview (#453)

cloudoperators · Aug 26, 2024 · 7267082 · 7267082
1 parent 59e53b4
commit 7267082
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 14 deletions.
diff --git a/pkg/controllers/cluster/direct_access_controller.go b/pkg/controllers/cluster/direct_access_controller.go
@@ -135,7 +135,7 @@ func (r *DirectAccessReconciler) Reconcile(ctx context.Context, req ctrl.Request
 		return ctrl.Result{}, err
 	}
 
-	UpdateMetrics(cluster)
+	updateMetrics(cluster)
 	return ctrl.Result{RequeueAfter: defaultRequeueInterval}, nil
 }
 

diff --git a/pkg/controllers/cluster/headscale_access_controller.go b/pkg/controllers/cluster/headscale_access_controller.go
@@ -211,7 +211,7 @@ func (r *HeadscaleAccessReconciler) Reconcile(ctx context.Context, req ctrl.Requ
 		return ctrl.Result{}, err
 	}
 
-	UpdateMetrics(cluster)
+	updateMetrics(cluster)
 	return ctrl.Result{RequeueAfter: defaultRequeueInterval}, nil
 }
 

diff --git a/pkg/controllers/cluster/metrics.go b/pkg/controllers/cluster/metrics.go
@@ -9,8 +9,8 @@ import (
 )
 
 var (
-	kubernetesVersionsCounter = prometheus.NewCounterVec(
-		prometheus.CounterOpts{
+	kubernetesVersionsGauge = prometheus.NewGaugeVec(
+		prometheus.GaugeOpts{
 			Name: "greenhouse_cluster_k8s_versions_total",
 		},
 		[]string{"cluster", "namespace", "version"})
@@ -23,19 +23,17 @@ var (
 )
 
 func init() {
-	metrics.Registry.MustRegister(kubernetesVersionsCounter)
+	metrics.Registry.MustRegister(kubernetesVersionsGauge)
 	metrics.Registry.MustRegister(secondsToTokenExpiryGauge)
 }
 
-//+kubebuilder:rbac:groups=greenhouse.sap,resources=clusters,verbs=get;list
-
-func UpdateMetrics(cluster *greenhousev1alpha1.Cluster) {
+func updateMetrics(cluster *greenhousev1alpha1.Cluster) {
 	kubernetesVersionLabels := prometheus.Labels{
 		"cluster":   cluster.Name,
 		"namespace": cluster.Namespace,
 		"version":   cluster.Status.KubernetesVersion,
 	}
-	kubernetesVersionsCounter.With(kubernetesVersionLabels).Inc()
+	kubernetesVersionsGauge.With(kubernetesVersionLabels).Set(float64(1))
 
 	secondsToExpiry := cluster.Status.BearerTokenExpirationTimestamp.Unix() - time.Now().Unix()
 	secondsToExpiryLabels := prometheus.Labels{

diff --git a/pkg/controllers/cluster/metrics_test.go b/pkg/controllers/cluster/metrics_test.go
@@ -14,7 +14,6 @@ import (
 
 var _ = Describe("Metrics controller", Ordered, func() {
 	var (
-		//remoteClient     client.Client
 		remoteEnvTest *envtest.Environment
 	)
 
@@ -40,10 +39,9 @@ var _ = Describe("Metrics controller", Ordered, func() {
 			},
 		}
 
-		counterBefore := prometheusTest.CollectAndCount(kubernetesVersionsCounter)
-		UpdateMetrics(cluster)
-		counterAfter := prometheusTest.CollectAndCount(kubernetesVersionsCounter)
-		Expect(counterAfter).To(BeEquivalentTo(counterBefore + 1))
+		updateMetrics(cluster)
+		counterAfter := prometheusTest.ToFloat64(kubernetesVersionsGauge.WithLabelValues(cluster.Name, cluster.Namespace, cluster.Status.KubernetesVersion))
+		Expect(counterAfter).To(BeEquivalentTo(1))
 		tokenExpiry := prometheusTest.ToFloat64(secondsToTokenExpiryGauge.WithLabelValues(cluster.Name, cluster.Namespace))
 		Expect(tokenExpiry).To(BeNumerically(">=", 595))
 		Expect(tokenExpiry).To(BeNumerically("<=", 600))