Improve Makefile and add more logs to the velocity tests (#2330)

* Improve Makefile and add more logs to the velocity tests

Author: johscheuer

controllers/controllers.go

@@ -84,7 +84,7 @@ func processRequeue(
 	}
 
 	if requeue.delay == time.Duration(0) {
-		requeue.delay = 2 * time.Second
+		requeue.delay = 100 * time.Millisecond
 	}
 
 	recorder.Event(object, corev1.EventTypeNormal, "ReconciliationTerminatedEarly", requeue.message)

e2e/Makefile

@@ -36,22 +36,26 @@ DEFAULT_UNAVAILABLE_THRESHOLD?=30s
 CLOUD_PROVIDER?=
 # Multiple versions can be specified for these upgrades by separating them with a, e.g. 6.2.25:7.1.25,7.1.23:7.1.25
 UPGRADE_VERSIONS?="$(FDB_VERSION):$(NEXT_FDB_VERSION)"
-# Those are feature flags for the operator tests. Enable a feature if you want to run the operator tests with a specific
-# feature enabled e.g. like DNS.
-FEATURE_DNS?=
-FEATURE_LOCALITIES?=
 # Allows to specify the tag for a specific FDB version. Format is 7.1.57:7.1.57-testing,7.3.35:7.3.35-debugging
 FDB_VERSION_TAG_MAPPING?=
 # If the FEATURE_SERVER_SIDE_APPLY environment variable is not defined the test suite will be randomly enable (1) or disable (0)
 # the server side apply feature.
 ifndef FEATURE_SERVER_SIDE_APPLY
-  FEATURE_SERVER_SIDE_APPLY=$(shell shuf -i 0-1 -n 1)
+  ifeq ($(shell shuf -i 0-1 -n 1), 0)
+    FEATURE_SERVER_SIDE_APPLY=false
+  else
+    FEATURE_SERVER_SIDE_APPLY=true
+  endif
 endif
 
 # If the FEATURE_UNIFIED_IMAGE environment variable is not defined the test suite will be randomly enable (1) or disable (0)
 # the unified image feature.
 ifndef FEATURE_UNIFIED_IMAGE
-  FEATURE_UNIFIED_IMAGE=$(shell shuf -i 0-1 -n 1)
+  ifeq ($(shell shuf -i 0-1 -n 1), 0)
+    FEATURE_UNIFIED_IMAGE=false
+  else
+    FEATURE_UNIFIED_IMAGE=true
+  endif
 endif
 
 # If the STORAGE_ENGINE environment variable is not defined the test suite will be randomly choosing between the ssd
@@ -77,6 +81,21 @@ ifndef FEATURE_SYNCHRONIZATION_MODE
   endif
 endif
 
+ifndef FEATURE_LOCALITIES
+  ifeq ($(shell shuf -i 0-1 -n 1), 0)
+    FEATURE_LOCALITIES=false
+  else
+    FEATURE_LOCALITIES=true
+  endif
+endif
+
+ifndef FEATURE_DNS
+  ifeq ($(shell shuf -i 0-1 -n 1), 0)
+    FEATURE_DNS=false
+  else
+    FEATURE_DNS=true
+  endif
+endif
 # Make bash pickier about errors.
 SHELL=/bin/bash -euo pipefail
 
@@ -159,14 +178,6 @@ foundationdb-nightly-tests: GINKGO_LABEL_FILTER=--ginkgo.label-filter="foundatio
 # Run the actual foundationdb-nightly tests.
 foundationdb-nightly-tests: run
 
-ifdef FEATURE_LOCALITIES
-  FEATURE_LOCALITIES_FLAG=--feature-localities=$(FEATURE_LOCALITIES)
-endif
-
-ifdef FEATURE_DNS
-  FEATURE_DNS_FLAG=--feature-dns=$(FEATURE_DNS)
-endif
-
 %.run: %
 	@sleep $$(shuf -i 1-10 -n 1)
 	go test -timeout=$(TIMEOUT) $(VERBOSE) ./$< \
@@ -197,7 +208,9 @@ endif
 	  --feature-unified-image=$(FEATURE_UNIFIED_IMAGE) \
 	  --feature-server-side-apply=$(FEATURE_SERVER_SIDE_APPLY) \
 	  --feature-synchronization-mode=$(FEATURE_SYNCHRONIZATION_MODE) \
+	  --feature-dns=$(FEATURE_DNS) \
+	  --feature-localities=$(FEATURE_LOCALITIES) \
 	  --node-selector="$(NODE_SELECTOR)" \
 	  --default-unavailable-threshold=$(DEFAULT_UNAVAILABLE_THRESHOLD) \
-	  --seaweedfs-image=$(SEAWEEDFS_IMAGE) $(FEATURE_LOCALITIES_FLAG) $(FEATURE_DNS_FLAG) \
+	  --seaweedfs-image=$(SEAWEEDFS_IMAGE)  \
 	  | grep -v 'constructing many client instances from the same exec auth config can cause performance problems during cert rotation' &> $(BASE_DIR)/../logs/$<.log

e2e/fixtures/cluster_config.go

@@ -29,6 +29,7 @@ import (
 	"github.com/onsi/ginkgo/v2"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
+	"k8s.io/utils/ptr"
 )
 
 type cloudProvider string
@@ -54,7 +55,7 @@ const (
 )
 
 // GetRedundancyMode returns the redundancy mode based on the cluster configuration.
-func (config ClusterConfig) GetRedundancyMode() fdbv1beta2.RedundancyMode {
+func (config *ClusterConfig) GetRedundancyMode() fdbv1beta2.RedundancyMode {
 	if config.RedundancyMode != "" {
 		return config.RedundancyMode
 	}
@@ -74,6 +75,8 @@ type ClusterConfig struct {
 	DebugSymbols bool
 	// UseMaintenanceMode if enabled the FoundationDBCluster resource will enable the maintenance mode.
 	UseMaintenanceMode bool
+	// EnableTLS when set this value will be used to enable/disable TLS, the default is true.
+	EnableTLS *bool
 	// UseLocalityBasedExclusions if enabled the FoundationDBCluster resource will enable the locality based exclusions.
 	UseLocalityBasedExclusions *bool
 	// UseDNS if enabled the FoundationDBCluster resource will enable the DNS feature.
@@ -109,6 +112,8 @@ type ClusterConfig struct {
 	Name string
 	// TLSPeerVerification represents the TLS peer verification that should be used for the cluster.
 	TLSPeerVerification string
+	// Version used to create the FDB cluster with.
+	Version *string
 	// cloudProvider defines the cloud provider used to create the Kubernetes cluster. This value is set in the SetDefaults
 	// method.
 	cloudProvider cloudProvider
@@ -200,6 +205,26 @@ func (config *ClusterConfig) SetDefaults(factory *Factory) {
 	if config.SynchronizationMode == "" {
 		config.SynchronizationMode = factory.GetSynchronizationMode()
 	}
+
+	if config.UseDNS == nil {
+		config.UseDNS = ptr.To(factory.options.featureOperatorDNS)
+	}
+
+	if config.UseLocalityBasedExclusions == nil {
+		config.UseLocalityBasedExclusions = ptr.To(factory.options.featureOperatorLocalities)
+	}
+
+	if config.EnableTLS == nil {
+		config.EnableTLS = ptr.To(true)
+	}
+
+	if config.UseUnifiedImage == nil {
+		config.UseUnifiedImage = ptr.To(factory.UseUnifiedImage())
+	}
+
+	if config.Version == nil {
+		config.Version = ptr.To(factory.GetFDBVersion().String())
+	}
 }
 
 // getVolumeSize returns the volume size in as a string. If no volume size is defined a default will be set based on
@@ -555,6 +580,21 @@ func (config *ClusterConfig) CalculateRoleCounts() fdbv1beta2.RoleCounts {
 	return roleCounts
 }
 
+// GetUseUnifiedImage returns true when the unified image should be used.
+func (config *ClusterConfig) GetUseUnifiedImage() bool {
+	return ptr.Deref(config.UseUnifiedImage, true)
+}
+
+// TLSEnabled returns true when TLS should be enabled or false if TLS should be disabled.
+func (config *ClusterConfig) TLSEnabled() bool {
+	return ptr.Deref(config.EnableTLS, true)
+}
+
+// GetVersion returns the version to create the cluster with.
+func (config *ClusterConfig) GetVersion() string {
+	return ptr.Deref(config.Version, "")
+}
+
 func calculateProxies(proxies int) (int, int) {
 	// This calculation is only a rough estimate and can change based on the workload.
 	// Use 1/4 of the proxies for GRV or at max 4 processes
@@ -590,5 +630,7 @@ func (config *ClusterConfig) Copy() *ClusterConfig {
 		MemoryPerPod:               config.MemoryPerPod,
 		CpusPerPod:                 config.CpusPerPod,
 		SynchronizationMode:        config.SynchronizationMode,
+		EnableTLS:                  config.EnableTLS,
+		Version:                    config.Version,
 	}
 }