Remove namespace from orderManifests dependencies

The namespace being added to these was incorrect - it should be empty
since the "correct" namespace on the managed cluster is the managed
cluster namespace... which has different names on different clusters.

Note: the dependencies from orderPolicies *are correct* - those are
always root policies, so the namespace is prepended to the name during
canonicalization.

This PR was going to make this work, but was decided against:
open-cluster-management-io/governance-policy-framework-addon#15

Signed-off-by: Justin Kulikauskas <[email protected]>

Author: JustinKuli

internal/plugin.go

@@ -1302,7 +1302,7 @@ func (p *Plugin) assertValidConfig() error {
 // The generated policy is written to the plugin's output buffer. An error is returned if the
 // manifests specified in the configuration are invalid or can't be read.
 func (p *Plugin) createPolicy(policyConf *types.PolicyConfig) error {
-	policyTemplates, err := getPolicyTemplates(policyConf, p.PolicyDefaults.Namespace)
+	policyTemplates, err := getPolicyTemplates(policyConf)
 	if err != nil {
 		return err
 	}

internal/testdata/ordering/three-ordered-manifests.yaml

@@ -33,7 +33,6 @@ spec:
         compliance: Compliant
         kind: ConfigurationPolicy
         name: one
-        namespace: my-policies
       objectDefinition:
         apiVersion: policy.open-cluster-management.io/v1
         kind: ConfigurationPolicy
@@ -56,7 +55,6 @@ spec:
         compliance: Compliant
         kind: ConfigurationPolicy
         name: one2
-        namespace: my-policies
       objectDefinition:
         apiVersion: policy.open-cluster-management.io/v1
         kind: ConfigurationPolicy

internal/utils.go

@@ -150,7 +150,7 @@ func getManifests(policyConf *types.PolicyConfig) ([][]map[string]interface{}, e
 // policyConf.ConsolidateManifests = false will generate a policy templates slice
 // that each template includes a single manifest specified in policyConf.
 // An error is returned if one or more manifests cannot be read or are invalid.
-func getPolicyTemplates(policyConf *types.PolicyConfig, ns string) ([]map[string]interface{}, error) {
+func getPolicyTemplates(policyConf *types.PolicyConfig) ([]map[string]interface{}, error) {
 	manifestGroups, err := getManifests(policyConf)
 	if err != nil {
 		return nil, err
@@ -260,13 +260,6 @@ func getPolicyTemplates(policyConf *types.PolicyConfig, ns string) ([]map[string
 				policyTemplates[i]["extraDependencies"] = []types.PolicyDependency{previousTemplate}
 			}
 
-			prevNS, found, err := unstructured.NestedString(tmpl, "objectDefinition", "metadata", "namespace")
-			if !found || err != nil {
-				previousTemplate.Namespace = ns
-			} else {
-				previousTemplate.Namespace = prevNS
-			}
-
 			// these fields are known to exist since the plugin created them
 			previousTemplate.Name, _, _ = unstructured.NestedString(tmpl, "objectDefinition", "metadata", "name")
 			previousTemplate.APIVersion, _, _ = unstructured.NestedString(tmpl, "objectDefinition", "apiVersion")

internal/utils_test.go

@@ -243,7 +243,7 @@ data:
 			Name:      "policy-app-config",
 		}
 
-		policyTemplates, err := getPolicyTemplates(&policyConf, "default")
+		policyTemplates, err := getPolicyTemplates(&policyConf)
 		if err != nil {
 			t.Fatalf("Failed to get the policy templates: %v", err)
 		}
@@ -405,7 +405,7 @@ resources:
 			Name: "policy-kustomize",
 		}
 
-		policyTemplates, err := getPolicyTemplates(&policyConf, "default")
+		policyTemplates, err := getPolicyTemplates(&policyConf)
 		if err != nil {
 			if test.ErrMsg != "" {
 				assertEqual(t, err.Error(), test.ErrMsg)
@@ -544,7 +544,7 @@ data:
 			Name:      "policy-app-config",
 		}
 
-		policyTemplates, err := getPolicyTemplates(&policyConf, "default")
+		policyTemplates, err := getPolicyTemplates(&policyConf)
 		if err != nil {
 			t.Fatalf("Failed to get the policy templates: %v", err)
 		}
@@ -745,7 +745,7 @@ func TestGetPolicyTemplateFromPolicyTypeManifest(t *testing.T) {
 			},
 		}
 
-		policyTemplates, err := getPolicyTemplates(&policyConf, "default")
+		policyTemplates, err := getPolicyTemplates(&policyConf)
 		if err != nil {
 			t.Fatalf("Failed to get the policy templates: %v", err)
 		}
@@ -818,7 +818,7 @@ data:
 		Name:      "policy-app-config",
 	}
 
-	policyTemplates, err := getPolicyTemplates(&policyConf, "default")
+	policyTemplates, err := getPolicyTemplates(&policyConf)
 	if err != nil {
 		t.Fatalf("Failed to get the policy templates: %v", err)
 	}
@@ -906,7 +906,7 @@ data:
 		Name:      "policy-app-config",
 	}
 
-	policyTemplates, err := getPolicyTemplates(&policyConf, "default")
+	policyTemplates, err := getPolicyTemplates(&policyConf)
 	if err != nil {
 		t.Fatalf("Failed to get the policy templates: %v ", err)
 	}
@@ -1015,7 +1015,7 @@ data:
 		Name:      "policy-app-config",
 	}
 
-	_, err = getPolicyTemplates(&policyConf, "default")
+	_, err = getPolicyTemplates(&policyConf)
 	assertEqual(t, err != nil, true)
 }
 
@@ -1047,7 +1047,7 @@ metadata:
 		Name:      "policy-kyverno-config",
 	}
 
-	policyTemplates, err := getPolicyTemplates(&policyConf, "default")
+	policyTemplates, err := getPolicyTemplates(&policyConf)
 	if err != nil {
 		t.Fatalf("Failed to get the policy templates: %v", err)
 	}
@@ -1104,7 +1104,7 @@ func TestGetPolicyTemplateNoManifests(t *testing.T) {
 		Name:      "policy-app-config",
 	}
 
-	_, err := getPolicyTemplates(&policyConf, "default")
+	_, err := getPolicyTemplates(&policyConf)
 	if err == nil {
 		t.Fatal("Expected an error but did not get one")
 	}
@@ -1132,7 +1132,7 @@ func TestGetPolicyTemplateInvalidPath(t *testing.T) {
 		Name: "policy-app-config",
 	}
 
-	_, err := getPolicyTemplates(&policyConf, "default")
+	_, err := getPolicyTemplates(&policyConf)
 	if err == nil {
 		t.Fatal("Expected an error but did not get one")
 	}
@@ -1161,7 +1161,7 @@ func TestGetPolicyTemplateInvalidManifest(t *testing.T) {
 		Name:      "policy-app-config",
 	}
 
-	_, err = getPolicyTemplates(&policyConf, "default")
+	_, err = getPolicyTemplates(&policyConf)
 	if err == nil {
 		t.Fatal("Expected an error but did not get one")
 	}