cherry-pick: feat: add Delos cloud names (#7320) (#7321)

Co-authored-by: John Stupka <[email protected]>

Author: cameronmeissner

pkg/agent/datamodel/const.go

@@ -80,6 +80,8 @@ const (
 	AzureChinaCloud = "AzureChinaCloud"
 	// AzureGermanCloud is a const string reference identifier for german cloud.
 	AzureGermanCloud = "AzureGermanCloud"
+	// AzureGermanCloud is a const string reference identifier for german cloud.
+	AzureGermanyCloud = "AzureGermanyCloud"
 	// AzureBleuCloud is a const string reference identifier for bleu cloud.
 	AzureBleuCloud = "AzureBleuCloud"
 	// AzureUSGovernmentCloud is a const string reference identifier for us government cloud.

pkg/agent/datamodel/osimageconfig.go

@@ -135,6 +135,17 @@ var (
 			AKS1804Deprecated: AKSUbuntu1804OSImageConfig, // for back-compat
 			AKSWindows2019PIR: AKSWindowsServer2019OSImageConfig,
 		},
+		AzureGermanyCloud: {
+			Ubuntu:            Ubuntu1604OSImageConfig,
+			Ubuntu1804:        Ubuntu1804OSImageConfig,
+			Ubuntu1804Gen2:    Ubuntu1804Gen2OSImageConfig,
+			RHEL:              RHELOSImageConfig,
+			AKSUbuntu1604:     AKSUbuntu1604OSImageConfig,
+			AKS1604Deprecated: AKSUbuntu1604OSImageConfig, // for back-compat
+			AKSUbuntu1804:     AKSUbuntu1804OSImageConfig,
+			AKS1804Deprecated: AKSUbuntu1804OSImageConfig, // for back-compat
+			AKSWindows2019PIR: AKSWindowsServer2019OSImageConfig,
+		},
 		USNatCloud: {
 			Ubuntu:            Ubuntu1604OSImageConfig,
 			Ubuntu1804:        Ubuntu1804OSImageConfig,

pkg/agent/datamodel/sig_config.go

@@ -65,6 +65,8 @@ func GetCloudTargetEnv(location string) string {
 		return AzureUSGovernmentCloud
 	case strings.HasPrefix(loc, "bleu"):
 		return AzureBleuCloud
+	case strings.HasPrefix(loc, "delos"):
+		return AzureGermanyCloud
 	case strings.HasPrefix(strings.ToLower(loc), "usnat"):
 		return USNatCloud
 	case strings.HasPrefix(strings.ToLower(loc), "ussec"):

pkg/agent/utils.go

@@ -311,11 +311,14 @@ func GetCloudTargetEnv(location string) string {
 	case strings.HasPrefix(loc, "china"):
 		return "AzureChinaCloud"
 	case loc == "germanynortheast" || loc == "germanycentral":
+		// Deprecated AzureGermanCloud
 		return "AzureGermanCloud"
 	case strings.HasPrefix(loc, "usgov") || strings.HasPrefix(loc, "usdod"):
 		return "AzureUSGovernmentCloud"
 	case strings.HasPrefix(loc, "bleu"):
 		return "AzureBleuCloud"
+	case strings.HasPrefix(loc, "delos"):
+		return "AzureGermanyCloud"
 	default:
 		return "AzurePublicCloud"
 	}