more azure fettling

konstructio · Oct 3, 2024 · 24bda49 · 24bda49
1 parent bb8ebc1
commit 24bda49
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 1 deletion.
diff --git a/docs/docs.go b/docs/docs.go
@@ -1134,6 +1134,10 @@ const docTemplate = `{
                 "azure_auth": {
                     "$ref": "#/definitions/types.AzureAuth"
                 },
+                "azure_dns_zone_resource_group": {
+                    "description": "Azure",
+                    "type": "string"
+                },
                 "civo_auth": {
                     "$ref": "#/definitions/types.CivoAuth"
                 },

diff --git a/docs/swagger.json b/docs/swagger.json
@@ -1128,6 +1128,10 @@
                 "azure_auth": {
                     "$ref": "#/definitions/types.AzureAuth"
                 },
+                "azure_dns_zone_resource_group": {
+                    "description": "Azure",
+                    "type": "string"
+                },
                 "civo_auth": {
                     "$ref": "#/definitions/types.CivoAuth"
                 },

diff --git a/docs/swagger.yaml b/docs/swagger.yaml
@@ -95,6 +95,9 @@ definitions:
         type: string
       azure_auth:
         $ref: '#/definitions/types.AzureAuth'
+      azure_dns_zone_resource_group:
+        description: Azure
+        type: string
       civo_auth:
         $ref: '#/definitions/types.CivoAuth'
       cloud_provider:

diff --git a/extensions/azure/secrets.go b/extensions/azure/secrets.go
@@ -15,7 +15,6 @@ func BootstrapAzureMgmtCluster(clientset kubernetes.Interface, cl *pkgtypes.Clus
 		DestinationGitopsRepoURL: destinationGitopsRepoURL,
 		GitProtocol:              cl.GitProtocol,
 		CloudflareAPIToken:       cl.CloudflareAuth.APIToken,
-		CloudAuth:                cl.CivoAuth.Token,
 		DNSProvider:              cl.DNSProvider,
 		CloudProvider:            cl.CloudProvider,
 		HTTPSPassword:            cl.GitAuth.Token,

diff --git a/internal/controller/cluster.go b/internal/controller/cluster.go
@@ -267,6 +267,7 @@ func (clctrl *ClusterController) CreateTokens(kind string) interface{} {
 		case "azure":
 			gitopsTemplateTokens.AzureStorageResourceGroup = "kubefirst-state" // @todo(sje): take from resourceGroup var in internal/controller/state.go
 			gitopsTemplateTokens.AzureStorageContainerName = "terraform"       // @todo(sje): take from containerName var in internal/controller/state.go
+			gitopsTemplateTokens.AzureDNSZoneResourceGroup = clctrl.AzureDNSZoneResourceGroup
 		case "k3s":
 			gitopsTemplateTokens.K3sServersPrivateIps = clctrl.K3sAuth.K3sServersPrivateIps
 			gitopsTemplateTokens.K3sServersPublicIps = clctrl.K3sAuth.K3sServersPublicIps

diff --git a/pkg/providerConfigs/detokenize.go b/pkg/providerConfigs/detokenize.go
@@ -88,8 +88,14 @@ func detokenizeGitops(tokens *GitopsDirectoryValues, gitProtocol string, useClou
 			newContents = strings.ReplaceAll(newContents, "<AWS_NODE_CAPACITY_TYPE>", tokens.AwsNodeCapacityType)
 
 			// Azure
+			azureDnsZoneName := ""
+			if tokens.ExternalDNSProviderName == "azure" {
+				azureDnsZoneName = fullDomainName
+			}
 			newContents = strings.ReplaceAll(newContents, "<KUBEFIRST_STATE_STORE_RESOURCE_GROUP>", tokens.AzureStorageResourceGroup)
 			newContents = strings.ReplaceAll(newContents, "<KUBEFIRST_STATE_STORE_CONTAINER_NAME>", tokens.AzureStorageContainerName)
+			newContents = strings.ReplaceAll(newContents, "<AZURE_DNS_ZONE_RESOURCE_GROUP>", tokens.AzureDNSZoneResourceGroup)
+			newContents = strings.ReplaceAll(newContents, "<AZURE_DNS_ZONE_NAME>", azureDnsZoneName) // This is only set if using Azure for DNS
 
 			// google
 			newContents = strings.ReplaceAll(newContents, "<GOOGLE_PROJECT>", tokens.GoogleProject)

diff --git a/pkg/providerConfigs/types.go b/pkg/providerConfigs/types.go
@@ -53,6 +53,7 @@ type GitopsDirectoryValues struct {
 
 	AzureStorageResourceGroup string
 	AzureStorageContainerName string
+	AzureDNSZoneResourceGroup string
 
 	GoogleAuth       string
 	GoogleProject    string

diff --git a/pkg/types/cluster.go b/pkg/types/cluster.go
@@ -119,6 +119,9 @@ type Cluster struct {
 	AWSKMSKeyID               string `bson:"aws_kms_key_id,omitempty" json:"aws_kms_key_id,omitempty"`
 	AWSKMSKeyDetokenizedCheck bool   `bson:"aws_kms_key_detokenized_check" json:"aws_kms_key_detokenized_check"`
 
+	// Azure
+	AzureDNSZoneResourceGroup string `bson:"azure_dns_zone_resource_group,omitempty" json:"azure_dns_zone_resource_group,omitempty"`
+
 	// Telemetry
 	UseTelemetry bool `bson:"use_telemetry"`
 

diff --git a/pkg/utils/tokens.go b/pkg/utils/tokens.go
@@ -152,6 +152,7 @@ func CreateTokensFromDatabaseRecord(cl *pkgtypes.Cluster, registryPath string, s
 		// @todo(sje): is this not used?
 		gitopsTemplateTokens.AzureStorageResourceGroup = "kubefirst-state" // @todo(sje): take from resourceGroup var in internal/controller/state.go
 		gitopsTemplateTokens.AzureStorageContainerName = "terraform"       // @todo(sje): take from containerName var in internal/controller/state.go
+		gitopsTemplateTokens.AzureDNSZoneResourceGroup = cl.AzureDNSZoneResourceGroup
 	}
 
 	return gitopsTemplateTokens