From 7811d9f2bc3780ae4197433c118442602dfb1165 Mon Sep 17 00:00:00 2001 From: Jingfang Liu Date: Wed, 5 Sep 2018 13:01:56 -0700 Subject: [PATCH] Add multibases test with namereference conflict --- .../base/kustomization.yaml | 4 ++++ .../base/rolebinding.yaml | 11 +++++++++++ .../base/serviceaccount.yaml | 4 ++++ .../combined/kustomization.yaml | 3 +++ .../overlays/a/kustomization.yaml | 7 +++++++ .../overlays/a/serviceaccount.yaml | 4 ++++ .../overlays/b/kustomization.yaml | 4 ++++ .../testdata/testcase-multibases-conflict/test.yaml | 4 ++++ 8 files changed, 41 insertions(+) create mode 100644 pkg/commands/testdata/testcase-multibases-conflict/base/kustomization.yaml create mode 100644 pkg/commands/testdata/testcase-multibases-conflict/base/rolebinding.yaml create mode 100644 pkg/commands/testdata/testcase-multibases-conflict/base/serviceaccount.yaml create mode 100644 pkg/commands/testdata/testcase-multibases-conflict/combined/kustomization.yaml create mode 100644 pkg/commands/testdata/testcase-multibases-conflict/overlays/a/kustomization.yaml create mode 100644 pkg/commands/testdata/testcase-multibases-conflict/overlays/a/serviceaccount.yaml create mode 100644 pkg/commands/testdata/testcase-multibases-conflict/overlays/b/kustomization.yaml create mode 100644 pkg/commands/testdata/testcase-multibases-conflict/test.yaml diff --git a/pkg/commands/testdata/testcase-multibases-conflict/base/kustomization.yaml b/pkg/commands/testdata/testcase-multibases-conflict/base/kustomization.yaml new file mode 100644 index 000000000..9084ca255 --- /dev/null +++ b/pkg/commands/testdata/testcase-multibases-conflict/base/kustomization.yaml @@ -0,0 +1,4 @@ +resources: +- serviceaccount.yaml +- rolebinding.yaml +namePrefix: base- \ No newline at end of file diff --git a/pkg/commands/testdata/testcase-multibases-conflict/base/rolebinding.yaml b/pkg/commands/testdata/testcase-multibases-conflict/base/rolebinding.yaml new file mode 100644 index 000000000..c74e189ce --- /dev/null +++ b/pkg/commands/testdata/testcase-multibases-conflict/base/rolebinding.yaml @@ -0,0 +1,11 @@ +apiVersion: rbac.authorization.k8s.io/v1beta1 +kind: RoleBinding +metadata: + name: rolebinding +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: role +subjects: +- kind: ServiceAccount + name: serviceaccount diff --git a/pkg/commands/testdata/testcase-multibases-conflict/base/serviceaccount.yaml b/pkg/commands/testdata/testcase-multibases-conflict/base/serviceaccount.yaml new file mode 100644 index 000000000..f1fff56b2 --- /dev/null +++ b/pkg/commands/testdata/testcase-multibases-conflict/base/serviceaccount.yaml @@ -0,0 +1,4 @@ +apiVersion: v1 +kind: ServiceAccount +metadata: + name: serviceaccount diff --git a/pkg/commands/testdata/testcase-multibases-conflict/combined/kustomization.yaml b/pkg/commands/testdata/testcase-multibases-conflict/combined/kustomization.yaml new file mode 100644 index 000000000..5d1ecdfc7 --- /dev/null +++ b/pkg/commands/testdata/testcase-multibases-conflict/combined/kustomization.yaml @@ -0,0 +1,3 @@ +bases: +- ../overlays/a +- ../overlays/b diff --git a/pkg/commands/testdata/testcase-multibases-conflict/overlays/a/kustomization.yaml b/pkg/commands/testdata/testcase-multibases-conflict/overlays/a/kustomization.yaml new file mode 100644 index 000000000..0ff4668b5 --- /dev/null +++ b/pkg/commands/testdata/testcase-multibases-conflict/overlays/a/kustomization.yaml @@ -0,0 +1,7 @@ +bases: +- ../../base/ + +namePrefix: a- + +resources: +- serviceaccount.yaml \ No newline at end of file diff --git a/pkg/commands/testdata/testcase-multibases-conflict/overlays/a/serviceaccount.yaml b/pkg/commands/testdata/testcase-multibases-conflict/overlays/a/serviceaccount.yaml new file mode 100644 index 000000000..f1fff56b2 --- /dev/null +++ b/pkg/commands/testdata/testcase-multibases-conflict/overlays/a/serviceaccount.yaml @@ -0,0 +1,4 @@ +apiVersion: v1 +kind: ServiceAccount +metadata: + name: serviceaccount diff --git a/pkg/commands/testdata/testcase-multibases-conflict/overlays/b/kustomization.yaml b/pkg/commands/testdata/testcase-multibases-conflict/overlays/b/kustomization.yaml new file mode 100644 index 000000000..1e19a7607 --- /dev/null +++ b/pkg/commands/testdata/testcase-multibases-conflict/overlays/b/kustomization.yaml @@ -0,0 +1,4 @@ +bases: +- ../../base/ + +namePrefix: b- diff --git a/pkg/commands/testdata/testcase-multibases-conflict/test.yaml b/pkg/commands/testdata/testcase-multibases-conflict/test.yaml new file mode 100644 index 000000000..496ce95b8 --- /dev/null +++ b/pkg/commands/testdata/testcase-multibases-conflict/test.yaml @@ -0,0 +1,4 @@ +description: multibases with name reference +args: [] +filename: testdata/testcase-multibases-conflict/combined +expectedError: detected conflicts when resolving name references serviceaccount