diff --git a/pkg/app/application.go b/pkg/app/application.go index 1d78f064e..c383f5baa 100644 --- a/pkg/app/application.go +++ b/pkg/app/application.go @@ -98,8 +98,12 @@ func (a *Application) MakeUncustomizedResMap() (resmap.ResMap, error) { // resolveRefsToGeneratedResources fixes all name references. func (a *Application) resolveRefsToGeneratedResources(m resmap.ResMap) (resmap.ResMap, error) { - r := []transformers.Transformer{transformers.NewNameHashTransformer()} + err := transformers.NewNameHashTransformer().Transform(m) + if err != nil { + return nil, err + } + r := []transformers.Transformer{} t, err := transformers.NewDefaultingNameReferenceTransformer() if err != nil { return nil, err diff --git a/pkg/commands/testdata/testcase-variable-ref/expected.diff b/pkg/commands/testdata/testcase-variable-ref/expected.diff index 5af63a66f..76ec67755 100644 --- a/pkg/commands/testdata/testcase-variable-ref/expected.diff +++ b/pkg/commands/testdata/testcase-variable-ref/expected.diff @@ -53,12 +53,14 @@ diff -u -N /tmp/noop/batch_v1beta1_CronJob_cronjob-example.yaml /tmp/transformed spec: concurrencyPolicy: Forbid jobTemplate: -@@ -11,10 +11,10 @@ +@@ -11,11 +11,11 @@ containers: - command: - echo - - base-cockroachdb +- - base-test-config-map-259876d7fg + - dev-base-cockroachdb ++ - dev-base-test-config-map-b2g2dmd64b env: - name: CDB_PUBLIC_SVC - value: base-cockroachdb-public @@ -140,6 +142,15 @@ diff -u -N /tmp/noop/rbac.authorization.k8s.io_v1beta1_Role_cockroachdb.yaml /tm rules: - apiGroups: - "" +diff -u -N /tmp/noop/v1_ConfigMap_test-config-map.yaml /tmp/transformed/v1_ConfigMap_test-config-map.yaml +--- /tmp/noop/v1_ConfigMap_test-config-map.yaml YYYY-MM-DD HH:MM:SS ++++ /tmp/transformed/v1_ConfigMap_test-config-map.yaml YYYY-MM-DD HH:MM:SS +@@ -5,4 +5,4 @@ + kind: ConfigMap + metadata: + creationTimestamp: null +- name: base-test-config-map-259876d7fg ++ name: dev-base-test-config-map-b2g2dmd64b diff -u -N /tmp/noop/v1_ServiceAccount_cockroachdb.yaml /tmp/transformed/v1_ServiceAccount_cockroachdb.yaml --- /tmp/noop/v1_ServiceAccount_cockroachdb.yaml YYYY-MM-DD HH:MM:SS +++ /tmp/transformed/v1_ServiceAccount_cockroachdb.yaml YYYY-MM-DD HH:MM:SS diff --git a/pkg/commands/testdata/testcase-variable-ref/expected.yaml b/pkg/commands/testdata/testcase-variable-ref/expected.yaml index 9648d089a..43845e41d 100644 --- a/pkg/commands/testdata/testcase-variable-ref/expected.yaml +++ b/pkg/commands/testdata/testcase-variable-ref/expected.yaml @@ -67,6 +67,15 @@ subjects: namespace: default --- apiVersion: v1 +data: + baz: qux + foo: bar +kind: ConfigMap +metadata: + creationTimestamp: null + name: dev-base-test-config-map-b2g2dmd64b +--- +apiVersion: v1 kind: Service metadata: annotations: @@ -206,6 +215,7 @@ spec: - command: - echo - dev-base-cockroachdb + - dev-base-test-config-map-b2g2dmd64b env: - name: CDB_PUBLIC_SVC value: dev-base-cockroachdb-public diff --git a/pkg/commands/testdata/testcase-variable-ref/in/package/cronjob.yaml b/pkg/commands/testdata/testcase-variable-ref/in/package/cronjob.yaml index 05f09f872..64615c251 100644 --- a/pkg/commands/testdata/testcase-variable-ref/in/package/cronjob.yaml +++ b/pkg/commands/testdata/testcase-variable-ref/in/package/cronjob.yaml @@ -15,6 +15,7 @@ spec: command: - echo - "$(CDB_STATEFULSET_NAME)" + - "$(TEST_CONFIG_MAP)" env: - name: CDB_PUBLIC_SVC value: "$(CDB_PUBLIC_SVC)" diff --git a/pkg/commands/testdata/testcase-variable-ref/in/package/kustomization.yaml b/pkg/commands/testdata/testcase-variable-ref/in/package/kustomization.yaml index 808140a7a..68fcd77b0 100644 --- a/pkg/commands/testdata/testcase-variable-ref/in/package/kustomization.yaml +++ b/pkg/commands/testdata/testcase-variable-ref/in/package/kustomization.yaml @@ -2,6 +2,11 @@ namePrefix: base- resources: - cockroachdb-statefulset-secure.yaml - cronjob.yaml +configMapGenerator: +- name: test-config-map + literals: + - foo=bar + - baz=qux vars: - name: CDB_PUBLIC_SVC objref: @@ -25,3 +30,10 @@ vars: fieldref: fieldpath: metadata.name + - name: TEST_CONFIG_MAP + objref: + kind: ConfigMap + name: test-config-map + apiVersion: v1 + fieldref: + fieldpath: metadata.name