From 674d762616ba8526aff8a717b59ba195c73bd749 Mon Sep 17 00:00:00 2001 From: Anand Swaminathan Date: Wed, 24 Mar 2021 15:47:14 -0700 Subject: [PATCH 1/2] Fix clusterresource Project Signed-off-by: Anand Swaminathan --- pkg/clusterresource/controller.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/clusterresource/controller.go b/pkg/clusterresource/controller.go index 8e23e0ef8..f4776c957 100644 --- a/pkg/clusterresource/controller.go +++ b/pkg/clusterresource/controller.go @@ -338,7 +338,7 @@ func (c *controller) syncNamespace(ctx context.Context, project models.Project, // First, add the special case namespace template which is always substituted by the system // rather than fetched via a user-specified source. templateValues[fmt.Sprintf(templateVariableFormat, namespaceVariable)] = namespace - templateValues[fmt.Sprintf(templateVariableFormat, projectVariable)] = project.Name + templateValues[fmt.Sprintf(templateVariableFormat, projectVariable)] = project.Identifier templateValues[fmt.Sprintf(templateVariableFormat, domainVariable)] = domain.Name var config = string(template) From e08561aa58d30a750137c995495a19a70b0906c0 Mon Sep 17 00:00:00 2001 From: Anand Swaminathan Date: Wed, 24 Mar 2021 15:50:02 -0700 Subject: [PATCH 2/2] Fix clusterresource domain Signed-off-by: Anand Swaminathan --- pkg/clusterresource/controller.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/clusterresource/controller.go b/pkg/clusterresource/controller.go index f4776c957..4c1baf702 100644 --- a/pkg/clusterresource/controller.go +++ b/pkg/clusterresource/controller.go @@ -339,7 +339,7 @@ func (c *controller) syncNamespace(ctx context.Context, project models.Project, // rather than fetched via a user-specified source. templateValues[fmt.Sprintf(templateVariableFormat, namespaceVariable)] = namespace templateValues[fmt.Sprintf(templateVariableFormat, projectVariable)] = project.Identifier - templateValues[fmt.Sprintf(templateVariableFormat, domainVariable)] = domain.Name + templateValues[fmt.Sprintf(templateVariableFormat, domainVariable)] = domain.ID var config = string(template) for templateKey, templateValue := range templateValues {