Read token from status for backwards compatibility

DataDog · Feb 15, 2022 · 138a946 · 138a946
1 parent 71276a4
commit 138a946
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/apis/datadoghq/v1alpha1/datadogagent_default.go b/apis/datadoghq/v1alpha1/datadogagent_default.go
@@ -172,7 +172,13 @@ func defaultClusterAgentToken(dda *DatadogAgent, dso *DatadogAgentStatus) {
 	if tokenAlreadyDefaulted {
 		dso.DefaultOverride.Credentials.Token = dda.Status.DefaultOverride.Credentials.Token
 	} else {
-		dso.DefaultOverride.Credentials.Token = apiutils.GenerateRandomString(32)
+		// For backwards-compatibility, if the token is already in the status
+		// use it.
+		if dso.ClusterAgent != nil && dso.ClusterAgent.GeneratedToken != "" {
+			dso.DefaultOverride.Credentials.Token = dso.ClusterAgent.GeneratedToken
+		} else {
+			dso.DefaultOverride.Credentials.Token = apiutils.GenerateRandomString(32)
+		}
 	}
 }