Issue #3915 - Bug: namespace-scoped agent could not deploy operator w…

…ith 'Namespace' set to a different namespace in the yaml file Signed-off-by: Le Zhang <[email protected]>
open-horizon · Oct 6, 2023 · 25fe8e5 · 25fe8e5
1 parent a85861c
commit 25fe8e5
Show file tree

Hide file tree

Showing 3 changed files with 269 additions and 17 deletions.
diff --git a/externalpolicy/builtin_properties.go b/externalpolicy/builtin_properties.go
@@ -61,7 +61,7 @@ func NodeBuiltInPropMap(nodeType string) map[string]string {
 		return map[string]string{PROP_NODE_CPU: "2.23.4", PROP_NODE_MEMORY: "2.23.4", PROP_NODE_ARCH: "2.23.4", PROP_NODE_HARDWAREID: "2.24.5", PROP_NODE_PRIVILEGED: "2.24.10",
 			PROP_NODE_OS: "2.30.0", PROP_NODE_CONTAINERIZED: "2.30.0"}
 	} else if nodeType == "cluster" {
-		return map[string]string{PROP_NODE_K8S_VERSION: "2.26.4", PROP_NODE_CPU: "2.23.4", PROP_NODE_MEMORY: "2.23.4", PROP_NODE_ARCH: "2.23.4", PROP_NODE_PRIVILEGED: "2.24.10"}
+		return map[string]string{PROP_NODE_K8S_NAMESPACE_SCOPED: "2.31.0", PROP_NODE_K8S_NAMESPACE: "2.31.0", PROP_NODE_K8S_VERSION: "2.26.4", PROP_NODE_CPU: "2.23.4", PROP_NODE_MEMORY: "2.23.4", PROP_NODE_ARCH: "2.23.4", PROP_NODE_PRIVILEGED: "2.24.10"}
 	}
 
 	return map[string]string{}