From b43bd5440d6384a8d26cd92155bc509006124bd8 Mon Sep 17 00:00:00 2001 From: Jerome Brette Date: Thu, 27 Jun 2019 14:43:20 -0500 Subject: [PATCH] Update Issue 1264 Reproduction Test --- pkg/target/namespaces_test.go | 48 +++++++++++++++++++++++++++-------- 1 file changed, 37 insertions(+), 11 deletions(-) diff --git a/pkg/target/namespaces_test.go b/pkg/target/namespaces_test.go index 084221947..0ce86eea1 100644 --- a/pkg/target/namespaces_test.go +++ b/pkg/target/namespaces_test.go @@ -5,7 +5,6 @@ package target_test import ( "sigs.k8s.io/kustomize/v3/pkg/kusttest" - "strings" "testing" ) @@ -51,19 +50,46 @@ resources: - role.yaml `) - _, err := th.MakeKustTarget().MakeCustomizedResMap() - // TODO: Fix #1044 - // This should not be an error - + m, err := th.MakeKustTarget().MakeCustomizedResMap() + // This validates Fix #1444. This should not be an error anymore - // the secrets have the same name but are in different namespaces. // The ClusterRole (by def) is not in a namespace, // an in this case applies to *any* Secret resource // named "dummy" - if err == nil { - t.Fatalf("unexpected lack of error") - } - if !strings.Contains( - err.Error(), - "slice case - multiple matches for ~G_v1_Secret|default|dummy") { - t.Fatalf("unexpected error: %s", err) + if err != nil { + t.Fatalf("Err: %v", err) } + th.AssertActualEqualsExpected(m, ` +apiVersion: v1 +data: + dummy: "" +kind: Secret +metadata: + name: dummy + namespace: default +type: Opaque +--- +apiVersion: v1 +data: + dummy: "" +kind: Secret +metadata: + name: dummy + namespace: kube-system +type: Opaque +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: dummy +rules: +- apiGroups: + - "" + resourceNames: + - dummy + resources: + - secrets + verbs: + - get +`) }