Add option to use project name as namespace for the task pods (flyteo…

…rg#166) * Add option to use project name as namespace for the task pods Signed-off-by: Jeev B <[email protected]> * rename Signed-off-by: Jeev B <[email protected]>
eapolinario · Mar 25, 2021 · 1ef63b1 · 1ef63b1
1 parent f0ec216
commit 1ef63b1
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/pkg/common/namespace.go b/pkg/common/namespace.go
@@ -7,16 +7,19 @@ type NamespaceMapping int
 const namespaceFormat = "%s-%s"
 
 const (
-	ProjectDomain NamespaceMapping = iota
-	Domain        NamespaceMapping = iota
+	NamespaceMappingProjectDomain NamespaceMapping = iota
+	NamespaceMappingDomain        NamespaceMapping = iota
+	NamespaceMappingProject       NamespaceMapping = iota
 )
 
 // GetNamespaceName returns kubernetes namespace name
 func GetNamespaceName(mapping NamespaceMapping, project, domain string) string {
 	switch mapping {
-	case Domain:
+	case NamespaceMappingDomain:
 		return domain
-	case ProjectDomain:
+	case NamespaceMappingProject:
+		return project
+	case NamespaceMappingProjectDomain:
 		fallthrough
 	default:
 		return fmt.Sprintf(namespaceFormat, project, domain)

diff --git a/pkg/common/namespace_test.go b/pkg/common/namespace_test.go
@@ -13,9 +13,10 @@ func TestGetNamespaceName(t *testing.T) {
 		domain  string
 		want    string
 	}{
-		{ProjectDomain, "project", "production", "project-production"},
+		{NamespaceMappingProjectDomain, "project", "production", "project-production"},
 		{20 /*Dummy enum value that is not supported*/, "project", "development", "project-development"},
-		{Domain, "project", "production", "production"},
+		{NamespaceMappingDomain, "project", "production", "production"},
+		{NamespaceMappingProject, "project", "production", "project"},
 	}
 
 	for _, tc := range testCases {

diff --git a/pkg/runtime/namespace_config_provider.go b/pkg/runtime/namespace_config_provider.go
@@ -12,6 +12,7 @@ import (
 const (
 	namespaceMappingKey   = "namespace_mapping"
 	domainVariable        = "domain"
+	projectVariable       = "project"
 	projectDomainVariable = "project-domain"
 )
 
@@ -27,12 +28,14 @@ func (p *NamespaceMappingConfigurationProvider) GetNamespaceMappingConfig() comm
 
 	switch mapping {
 	case domainVariable:
-		return common.Domain
+		return common.NamespaceMappingDomain
+	case projectVariable:
+		return common.NamespaceMappingProject
 	case projectDomainVariable:
-		return common.ProjectDomain
+		return common.NamespaceMappingProjectDomain
 	default:
 		logger.Warningf(context.Background(), "Unsupported value for namespace_mapping in config, defaulting to <project>-<domain>")
-		return common.ProjectDomain
+		return common.NamespaceMappingProjectDomain
 	}
 }