Fix missing label selector on HPA

infinispan · Sep 4, 2024 · c35359e · c35359e
1 parent da838d6
commit c35359e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/api/v1/infinispan_types.go b/api/v1/infinispan_types.go
@@ -611,6 +611,9 @@ type InfinispanStatus struct {
 	// +optional
 	// +operator-sdk:csv:customresourcedefinitions:type=status,displayName="Operator Status"
 	Operator Operator `json:"operator,omitempty"`
+	// The Operator Selector
+	// +optional
+	Selector string  `json:"selector"`
 }
 
 type OperandPhase string
@@ -663,7 +666,7 @@ type Operator struct {
 
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
-// +kubebuilder:subresource:scale:specpath=.spec.replicas,statuspath=.status.replicas
+// +kubebuilder:subresource:scale:specpath=.spec.replicas,statuspath=.status.replicas,selectorpath=.status.selector
 // +operator-sdk:csv:customresourcedefinitions:displayName="Infinispan Cluster"
 
 // Infinispan is the Schema for the infinispans API

diff --git a/config/crd/bases/infinispan.org_infinispans.yaml b/config/crd/bases/infinispan.org_infinispans.yaml
@@ -2457,6 +2457,9 @@ spec:
                     description: The secret that contains user credentials.
                     type: string
                 type: object
+              selector:
+                description: The Operator Selector
+                type: string
               statefulSetName:
                 type: string
             type: object
@@ -2465,6 +2468,7 @@ spec:
     storage: true
     subresources:
       scale:
+        labelSelectorPath: .status.selector
         specReplicasPath: .spec.replicas
         statusReplicasPath: .status.replicas
       status: {}
diff --git a/pkg/reconcile/pipeline/infinispan/handler/provision/statefulsets.go b/pkg/reconcile/pipeline/infinispan/handler/provision/statefulsets.go
@@ -60,9 +60,16 @@ func ClusterStatefulSet(i *ispnv1.Infinispan, ctx pipeline.Context) {
 		return
 	}
 
+	selector, err := metav1.LabelSelectorAsSelector(statefulSet.Spec.Selector)
+
+	if err != nil {
+		ctx.Requeue(fmt.Errorf("error retrieving StatefulSet labels: %w", err))
+		return
+	}
 	_ = ctx.UpdateInfinispan(func() {
 		i.Status.Replicas = &i.Spec.Replicas
 		i.Status.StatefulSetName = statefulSet.Name
+		i.Status.Selector = selector.String()
 	})
 }