Merge pull request #125 from voelzmo/fix/hpa-metric-spec-conversion

Fix HPA MetricSpec conversion

controllers/hpa_util.go

@@ -98,7 +98,7 @@ func (r *HvpaReconciler) Convert_v2_HPA_to_v2beta1(in *autoscalingv2.HorizontalP
 func (r *HvpaReconciler) Convert_v2beta1_MetricSpec_to_v2(err error, in autoscaling.MetricSpec) (*autoscalingv2.MetricSpec, error) {
 	out := &autoscalingv2.MetricSpec{}
 	internalHpaMetricSpec := &kubernetesinternalautoscaling.MetricSpec{}
-	err = r.Scheme.Convert(in, internalHpaMetricSpec, context.TODO())
+	err = r.Scheme.Convert(&in, internalHpaMetricSpec, context.TODO())
 	if err != nil {
 		return nil, err
 	}

controllers/hvpa_controller_test.go

@@ -19,6 +19,7 @@ package controllers
 import (
 	"context"
 	"fmt"
+	"k8s.io/utils/pointer"
 	"time"
 
 	. "github.com/onsi/ginkgo"
@@ -191,6 +192,24 @@ var _ = Describe("#TestReconcile", func() {
 				return fmt.Errorf("Error: Expected 1 HPA; found %v", len(hpaList.Items))
 			}, timeout).Should(Succeed())
 
+			// Update the HPA spec and expect the change to be reconciled
+			hvpa := &autoscalingv1alpha1.Hvpa{}
+			c.Get(context.TODO(), types.NamespacedName{Name: instance.Name, Namespace: instance.Namespace}, hvpa)
+			hvpa.Spec.Hpa.Template.Spec.MinReplicas = pointer.Int32(3)
+			err = c.Update(context.TODO(), hvpa)
+			Expect(err).NotTo(HaveOccurred())
+			Eventually(func() error {
+				var actualMinReplicas int32
+				c.List(context.TODO(), hpaList)
+				for _, hpa := range hpaList.Items {
+					actualMinReplicas = *hpa.Spec.MinReplicas
+				}
+				if actualMinReplicas != 3 {
+					return fmt.Errorf("Expected minReplicas 3, got %v", actualMinReplicas)
+				}
+				return nil
+			}, timeout).Should(Succeed())
+
 			// Create a pod for the target deployment, and update status to "OOMKilled".
 			// The field hvpa.status.overrideScaleUpStabilization should be set to true.
 			p := v1.Pod{