fix version check to work with release candidates (#336)

DataDog · Jul 20, 2021 · 17299c9 · 17299c9
1 parent 37ef64e
commit 17299c9
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 2 deletions.
diff --git a/api/v1alpha1/datadogagent_default.go b/api/v1alpha1/datadogagent_default.go
@@ -308,7 +308,9 @@ func DefaultDatadogAgentSpecAgentConfig(agent *DatadogAgentSpecAgentSpec) *NodeA
 	// Let Env AD do the work for us
 	// Image is defaulted prior to this function.
 	agentTag := strings.TrimSuffix(utils.GetTagFromImageName(agent.Image.Name), "-jmx")
-	if !(agentTag == "latest" || utils.IsAboveMinVersion(agentTag, "7.27.0") || utils.IsAboveMinVersion(agentTag, "6.27.0")) {
+	// Check against image tag + "-0"; otherwise prelease versions are not compared.
+	// (See https://github.com/Masterminds/semver#working-with-prerelease-versions)
+	if !(agentTag == "latest" || utils.IsAboveMinVersion(agentTag, "7.27.0-0") || utils.IsAboveMinVersion(agentTag, "6.27.0-0")) {
 		if socketOverride := DefaultContainerSocket(agent.Config); !IsEqualStruct(socketOverride, CRISocketConfig{}) {
 			configOverride.CriSocket = socketOverride
 		}

diff --git a/controllers/datadogagent/finalizer.go b/controllers/datadogagent/finalizer.go
@@ -55,7 +55,7 @@ func (r *Reconciler) handleFinalizer(reqLogger logr.Logger, dda *datadoghqv1alph
 func (r *Reconciler) finalizeDad(reqLogger logr.Logger, dda *datadoghqv1alpha1.DatadogAgent) {
 	_, err := r.cleanupMetricsServerAPIService(reqLogger, dda)
 	if err != nil {
-		reqLogger.Error(err,"Could not delete Metrics Server API Service")
+		reqLogger.Error(err, "Could not delete Metrics Server API Service")
 	}
 	r.forwarders.Unregister(dda)
 	reqLogger.Info("Successfully finalized DatadogAgent")

diff --git a/pkg/utils/version_test.go b/pkg/utils/version_test.go
@@ -22,6 +22,31 @@ func TestCompareVersion(t *testing.T) {
 			minVersion: "7.26.0-rc.5",
 			expected:   true,
 		},
+		{
+			version:    "7.29.0-rc.5",
+			minVersion: "7.27.0-0",
+			expected:   true,
+		},
+		{
+			version:    "7.30.0",
+			minVersion: "7.27.1-0",
+			expected:   true,
+		},
+		{
+			version:    "7.25.0",
+			minVersion: "7.27.1-0",
+			expected:   false,
+		},
+		{
+			version:    "6.27.0",
+			minVersion: "6.28.0-0",
+			expected:   false,
+		},
+		{
+			version:    "6.28.1",
+			minVersion: "6.28.0-0",
+			expected:   true,
+		},
 		{
 			version:    "6.27.0",
 			minVersion: "6.28.0",