fix: inverted condition

Author: cwrau

pkg/reconcilers/etcd_cluster/reconciler.go

@@ -47,6 +47,8 @@ import (
 var (
 	etcdVolumeResizeEvent           = "EtcdVolumeAutoResize"
 	etcdVolumeSizeReCalculatedEvent = "EtcdVolumeSizeRecalculated"
+
+	etcdClientVersion3_7 = semver.MustParse(version.V3_7.String())
 )
 
 type EtcdClusterReconciler interface {
@@ -814,7 +816,7 @@ func (er *etcdClusterReconciler) buildEtcdArgs(
 		"quota-backend-bytes":         strconv.FormatInt(storageQuota, 10),
 	}
 
-	if int64(etcdVersion.Minor) >= version.V3_7.Minor { //nolint:gosec // semver minor will never overflow int64
+	if etcdVersion.LT(etcdClientVersion3_7) {
 		// this is deprecated and will be removed in 3.7
 		// TODO: remove this when we roll 3.7
 		args["snapshot-count"] = "10000"

pkg/reconcilers/etcd_cluster/reconciler_test.go

@@ -12,13 +12,15 @@ import (
 	"k8s.io/utils/ptr"
 	capiv2 "sigs.k8s.io/cluster-api/api/core/v1beta2"
 
+	semver "github.com/blang/semver/v4"
 	. "github.com/onsi/gomega"
 	"github.com/teutonet/cluster-api-provider-hosted-control-plane/api/v1alpha1"
 	. "github.com/teutonet/cluster-api-provider-hosted-control-plane/test"
 	"go.etcd.io/etcd/api/v3/etcdserverpb"
 	clientv3 "go.etcd.io/etcd/client/v3"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	corev1ac "k8s.io/client-go/applyconfigurations/core/v1"
 )
 
 func TestEtcdClusterReconciler_getETCDVolumeSize(t *testing.T) {
@@ -883,3 +885,60 @@ func TestEtcdClusterReconciler_reconcileETCDBackup(t *testing.T) {
 		g.Expect(hcp.Status.ETCDNextBackupTime).NotTo(BeZero())
 	})
 }
+
+func TestBuildEtcdArgs_SnapshotCount(t *testing.T) {
+	tests := []struct {
+		name                string
+		etcdVersion         semver.Version
+		expectSnapshotCount bool
+	}{
+		{
+			name:                "version < 3.7 sets snapshot-count",
+			etcdVersion:         semver.MustParse("3.6.0"),
+			expectSnapshotCount: true,
+		},
+		{
+			name:                "version >= 3.7 omits snapshot-count",
+			etcdVersion:         semver.MustParse("3.7.0"),
+			expectSnapshotCount: false,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			g := NewWithT(t)
+
+			reconciler := &etcdClusterReconciler{}
+			hcp := &v1alpha1.HostedControlPlane{
+				ObjectMeta: metav1.ObjectMeta{Namespace: "test-ns"},
+				Status:     v1alpha1.HostedControlPlaneStatus{ETCDVolumeSize: resource.MustParse("10Gi")},
+			}
+			cluster := &capiv2.Cluster{
+				ObjectMeta: metav1.ObjectMeta{Name: "test-cluster", Namespace: "test-ns"},
+			}
+			serverPort := corev1ac.ContainerPort().WithContainerPort(2379)
+			peerPort := corev1ac.ContainerPort().WithContainerPort(2380)
+			metricsPort := corev1ac.ContainerPort().WithContainerPort(2381)
+			dataMount := corev1ac.VolumeMount().WithMountPath("/var/lib/etcd")
+			certMount := corev1ac.VolumeMount().WithMountPath("/etc/etcd")
+
+			args := reconciler.buildEtcdArgs(
+				context.Background(),
+				hcp,
+				cluster,
+				tt.etcdVersion,
+				dataMount,
+				certMount,
+				serverPort,
+				peerPort,
+				metricsPort,
+			)
+
+			if tt.expectSnapshotCount {
+				g.Expect(args).To(ContainElement("--snapshot-count=10000"))
+			} else {
+				g.Expect(args).NotTo(ContainElement(ContainSubstring("snapshot-count")))
+			}
+		})
+	}
+}