k8s/controller: always map "default" Consul namespace to empty string

hashicorp · Jan 4, 2023 · 958a9d6 · 958a9d6
1 parent fc3a7d6
commit 958a9d6
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/internal/k8s/controller.go b/internal/k8s/controller.go
@@ -56,10 +56,20 @@ type ConsulNamespaceConfig struct {
 }
 
 func (c ConsulNamespaceConfig) Namespace(namespace string) string {
+	var consulNamespace string
+
 	if c.MirrorKubernetesNamespaces {
-		return c.MirrorKubernetesNamespacePrefix + namespace
+		consulNamespace = c.MirrorKubernetesNamespacePrefix + namespace
+	} else {
+		consulNamespace = c.ConsulDestinationNamespace
+	}
+
+	// Always map the default namespace to "" for compatibility with Consul OSS
+	if consulNamespace == "default" {
+		consulNamespace = ""
 	}
-	return c.ConsulDestinationNamespace
+
+	return consulNamespace
 }
 
 type Kubernetes struct {