Răsfoiți Sursa

POR-1803: add ack-system as system namespace (#3669)

jose-fully-ported 2 ani în urmă
părinte
comite
0fe67d8c6f

+ 14 - 5
api/server/handlers/environment/common.go

@@ -45,11 +45,20 @@ func getGithubClientFromEnvironment(config *config.Config, env *models.Environme
 }
 
 func isSystemNamespace(namespace string) bool {
-	return namespace == "cert-manager" || namespace == "ingress-nginx" ||
-		namespace == "kube-node-lease" || namespace == "kube-public" ||
-		namespace == "kube-system" || namespace == "monitoring" ||
-		namespace == "porter-agent-system" || namespace == "default" ||
-		namespace == "ingress-nginx-private"
+	systemNamespaces := map[string]bool{
+		"ack-system":            true,
+		"cert-manager":          true,
+		"default":               true,
+		"ingress-nginx":         true,
+		"ingress-nginx-private": true,
+		"kube-node-lease":       true,
+		"kube-public":           true,
+		"kube-system":           true,
+		"monitoring":            true,
+		"porter-agent-system":   true,
+	}
+
+	return systemNamespaces[namespace]
 }
 
 func isGithubPRClosed(

+ 14 - 5
api/server/handlers/webhook/github_incoming.go

@@ -435,11 +435,20 @@ func (c *GithubIncomingWebhookHandler) processPushEvent(event *github.PushEvent,
 }
 
 func isSystemNamespace(namespace string) bool {
-	return namespace == "cert-manager" || namespace == "ingress-nginx" ||
-		namespace == "kube-node-lease" || namespace == "kube-public" ||
-		namespace == "kube-system" || namespace == "monitoring" ||
-		namespace == "porter-agent-system" || namespace == "default" ||
-		namespace == "ingress-nginx-private"
+	systemNamespaces := map[string]bool{
+		"ack-system":            true,
+		"cert-manager":          true,
+		"default":               true,
+		"ingress-nginx":         true,
+		"ingress-nginx-private": true,
+		"kube-node-lease":       true,
+		"kube-public":           true,
+		"kube-system":           true,
+		"monitoring":            true,
+		"porter-agent-system":   true,
+	}
+
+	return systemNamespaces[namespace]
 }
 
 func getGithubClientFromEnvironment(config *config.Config, env *models.Environment) (*github.Client, error) {

+ 14 - 5
cli/cmd/commands/apply.go

@@ -1453,11 +1453,20 @@ func getReleaseType(ctx context.Context, projectID uint, res *switchboardTypes.R
 }
 
 func isSystemNamespace(namespace string) bool {
-	return namespace == "cert-manager" || namespace == "ingress-nginx" ||
-		namespace == "kube-node-lease" || namespace == "kube-public" ||
-		namespace == "kube-system" || namespace == "monitoring" ||
-		namespace == "porter-agent-system" || namespace == "default" ||
-		namespace == "ingress-nginx-private"
+	systemNamespaces := map[string]bool{
+		"ack-system":            true,
+		"cert-manager":          true,
+		"default":               true,
+		"ingress-nginx":         true,
+		"ingress-nginx-private": true,
+		"kube-node-lease":       true,
+		"kube-public":           true,
+		"kube-system":           true,
+		"monitoring":            true,
+		"porter-agent-system":   true,
+	}
+
+	return systemNamespaces[namespace]
 }
 
 type ErrorEmitterHook struct{}

+ 1 - 0
dashboard/src/main/home/add-on-dashboard/AddOnDashboard.tsx

@@ -40,6 +40,7 @@ type Props = {
 };
 
 const namespaceBlacklist = [
+  "ack-system",
   "cert-manager",
   "ingress-nginx",
   "kube-node-lease",