feat: detoknize ORIGIN_ISSUER_IS_ENABLED for metaphor (#521)

konstructio · Dec 13, 2024 · 86e1c48 · 86e1c48
1 parent e8a977b
commit 86e1c48
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 0 deletions.
diff --git a/internal/controller/cluster.go b/internal/controller/cluster.go
@@ -285,6 +285,7 @@ func (clctrl *ClusterController) CreateTokens(kind string) interface{} {
 			MetaphorDevelopmentIngressURL: fmt.Sprintf("metaphor-development.%s", fullDomainName),
 			MetaphorStagingIngressURL:     fmt.Sprintf("metaphor-staging.%s", fullDomainName),
 			MetaphorProductionIngressURL:  fmt.Sprintf("metaphor-production.%s", fullDomainName),
+			OriginIssuerIsEnabled:         cl.CloudflareAuth.OriginCaIssuerKey != "",
 		}
 		return metaphorTemplateTokens
 	}

diff --git a/internal/router/api/v1/cluster.go b/internal/router/api/v1/cluster.go
@@ -327,6 +327,7 @@ func PostCreateCluster(c *gin.Context) {
 			clusterDefinition.GoogleAuth = cluster.GoogleAuth
 			clusterDefinition.K3sAuth = cluster.K3sAuth
 			clusterDefinition.GitAuth = cluster.GitAuth
+			clusterDefinition.CloudflareAuth = cluster.CloudflareAuth
 		}
 	}
 

diff --git a/pkg/providerConfigs/detokenize.go b/pkg/providerConfigs/detokenize.go
@@ -303,6 +303,7 @@ func detokenizeGitopsMetaphor(tokens *MetaphorTokenValues) filepath.WalkFunc {
 			newContents = strings.ReplaceAll(newContents, "<METAPHOR_DEVELOPMENT_INGRESS_URL>", tokens.MetaphorDevelopmentIngressURL)
 			newContents = strings.ReplaceAll(newContents, "<METAPHOR_PRODUCTION_INGRESS_URL>", tokens.MetaphorProductionIngressURL)
 			newContents = strings.ReplaceAll(newContents, "<METAPHOR_STAGING_INGRESS_URL>", tokens.MetaphorStagingIngressURL)
+			newContents = strings.ReplaceAll(newContents, "<ORIGIN_ISSUER_IS_ENABLED>", fmt.Sprintf("%t", tokens.OriginIssuerIsEnabled))
 
 			err = os.WriteFile(path, []byte(newContents), 0)
 			if err != nil {

diff --git a/pkg/providerConfigs/types.go b/pkg/providerConfigs/types.go
@@ -109,4 +109,5 @@ type MetaphorTokenValues struct {
 	MetaphorDevelopmentIngressURL string
 	MetaphorProductionIngressURL  string
 	MetaphorStagingIngressURL     string
+	OriginIssuerIsEnabled         bool
 }