diff --git a/pkg/commands/build/testdata/testcase-multibases-conflict/base/kustomization.yaml b/pkg/commands/build/testdata/testcase-multibases-conflict/base/kustomization.yaml index f913dbaf5..816593c7a 100644 --- a/pkg/commands/build/testdata/testcase-multibases-conflict/base/kustomization.yaml +++ b/pkg/commands/build/testdata/testcase-multibases-conflict/base/kustomization.yaml @@ -2,3 +2,4 @@ resources: - serviceaccount.yaml - rolebinding.yaml namePrefix: base- +nameSuffix: -suffix diff --git a/pkg/commands/build/testdata/testcase-multibases-conflict/overlays/a/kustomization.yaml b/pkg/commands/build/testdata/testcase-multibases-conflict/overlays/a/kustomization.yaml index 166dba8ac..fb034fc6d 100644 --- a/pkg/commands/build/testdata/testcase-multibases-conflict/overlays/a/kustomization.yaml +++ b/pkg/commands/build/testdata/testcase-multibases-conflict/overlays/a/kustomization.yaml @@ -2,6 +2,7 @@ bases: - ../../base/ namePrefix: a- +nameSuffix: -suffixA resources: - serviceaccount.yaml diff --git a/pkg/commands/build/testdata/testcase-multibases-conflict/overlays/b/kustomization.yaml b/pkg/commands/build/testdata/testcase-multibases-conflict/overlays/b/kustomization.yaml index 1e19a7607..899058b14 100644 --- a/pkg/commands/build/testdata/testcase-multibases-conflict/overlays/b/kustomization.yaml +++ b/pkg/commands/build/testdata/testcase-multibases-conflict/overlays/b/kustomization.yaml @@ -2,3 +2,4 @@ bases: - ../../base/ namePrefix: b- +nameSuffix: -suffixB diff --git a/pkg/commands/build/testdata/testcase-multibases-nonconflict/base/kustomization.yaml b/pkg/commands/build/testdata/testcase-multibases-nonconflict/base/kustomization.yaml index f913dbaf5..816593c7a 100644 --- a/pkg/commands/build/testdata/testcase-multibases-nonconflict/base/kustomization.yaml +++ b/pkg/commands/build/testdata/testcase-multibases-nonconflict/base/kustomization.yaml @@ -2,3 +2,4 @@ resources: - serviceaccount.yaml - rolebinding.yaml namePrefix: base- +nameSuffix: -suffix diff --git a/pkg/commands/build/testdata/testcase-multibases-nonconflict/expected.yaml b/pkg/commands/build/testdata/testcase-multibases-nonconflict/expected.yaml index efa826d0e..f1df1b22c 100644 --- a/pkg/commands/build/testdata/testcase-multibases-nonconflict/expected.yaml +++ b/pkg/commands/build/testdata/testcase-multibases-nonconflict/expected.yaml @@ -1,33 +1,33 @@ apiVersion: v1 kind: ServiceAccount metadata: - name: a-base-serviceaccount + name: a-base-serviceaccount-suffix-suffixA --- apiVersion: v1 kind: ServiceAccount metadata: - name: b-base-serviceaccount + name: b-base-serviceaccount-suffix-suffixB --- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: RoleBinding metadata: - name: a-base-rolebinding + name: a-base-rolebinding-suffix-suffixA roleRef: apiGroup: rbac.authorization.k8s.io kind: Role name: role subjects: - kind: ServiceAccount - name: a-base-serviceaccount + name: a-base-serviceaccount-suffix-suffixA --- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: RoleBinding metadata: - name: b-base-rolebinding + name: b-base-rolebinding-suffix-suffixB roleRef: apiGroup: rbac.authorization.k8s.io kind: Role name: role subjects: - kind: ServiceAccount - name: b-base-serviceaccount + name: b-base-serviceaccount-suffix-suffixB diff --git a/pkg/commands/build/testdata/testcase-multibases-nonconflict/overlays/a/kustomization.yaml b/pkg/commands/build/testdata/testcase-multibases-nonconflict/overlays/a/kustomization.yaml index 2b15edc85..5e05f791d 100644 --- a/pkg/commands/build/testdata/testcase-multibases-nonconflict/overlays/a/kustomization.yaml +++ b/pkg/commands/build/testdata/testcase-multibases-nonconflict/overlays/a/kustomization.yaml @@ -2,3 +2,4 @@ bases: - ../../base/ namePrefix: a- +nameSuffix: -suffixA diff --git a/pkg/commands/build/testdata/testcase-multibases-nonconflict/overlays/b/kustomization.yaml b/pkg/commands/build/testdata/testcase-multibases-nonconflict/overlays/b/kustomization.yaml index 1e19a7607..899058b14 100644 --- a/pkg/commands/build/testdata/testcase-multibases-nonconflict/overlays/b/kustomization.yaml +++ b/pkg/commands/build/testdata/testcase-multibases-nonconflict/overlays/b/kustomization.yaml @@ -2,3 +2,4 @@ bases: - ../../base/ namePrefix: b- +nameSuffix: -suffixB