Merge pull request #1130 from monopole/envToEnvs

Fix yaml in generator examples.

pkg/target/configmaps_test.go

@@ -31,24 +31,26 @@ namePrefix: blah-
 configMapGenerator:
 - name: bob
   literals:
-    - fruit=apple
+  - fruit=apple
-    - vegetable=broccoli
+  - vegetable=broccoli
-  env: foo.env
+  envs:
+  - foo.env
   files:
-    - passphrase=phrase.dat
+  - passphrase=phrase.dat
-    - forces.txt
+  - forces.txt
 - name: json
   literals:
-    - 'v2=[{"path": "var/druid/segment-cache"}]'
+  - 'v2=[{"path": "var/druid/segment-cache"}]'
 secretGenerator:
 - name: bob
   literals:
-    - fruit=apple
+  - fruit=apple
-    - vegetable=broccoli
+  - vegetable=broccoli
-  env: foo.env
+  envs:
+  - foo.env
   files:
-    - passphrase=phrase.dat
+  - passphrase=phrase.dat
-    - forces.txt
+  - forces.txt
 `)
 	th.WriteF("/app/foo.env", `
 MOUNTAIN=everest
@@ -122,15 +124,15 @@ configMapGenerator:
 - name: bob
   behavior: create
   literals:
-    - bean=pinto
+  - bean=pinto
-    - star=wolf-rayet
+  - star=wolf-rayet
   literals:
-    - fruit=apple
+  - fruit=apple
-    - vegetable=broccoli
+  - vegetable=broccoli
   files:
-    - forces.txt
+  - forces.txt
   files:
-    - nobles=nobility.txt
+  - nobles=nobility.txt
 `)
 	th.WriteF("/app/forces.txt", `
 gravitational
@@ -177,7 +179,7 @@ configMapGenerator:
 - name: com1
   behavior: create
   literals:
-    - from=base
+  - from=base
 `)
 	th.WriteK("/app/base2", `
 namePrefix: p2-
@@ -185,7 +187,7 @@ configMapGenerator:
 - name: com2
   behavior: create
   literals:
-    - from=base
+  - from=base
 `)
 	th.WriteK("/app/overlay/o1", `
 bases:
@@ -194,7 +196,7 @@ configMapGenerator:
 - name: com1
   behavior: merge
   literals:
-    - from=overlay
+  - from=overlay
 `)
 	th.WriteK("/app/overlay/o2", `
 bases:
@@ -203,7 +205,7 @@ configMapGenerator:
 - name: com2
   behavior: merge
   literals:
-    - from=overlay
+  - from=overlay
 `)
 	th.WriteK("/app/overlay", `
 bases:
@@ -213,8 +215,8 @@ configMapGenerator:
 - name: com1
   behavior: merge
   literals:
-    - foo=bar
+  - foo=bar
-    - baz=qux
+  - baz=qux
 `)
 	m, err := th.MakeKustTarget().MakeCustomizedResMap()
 	if err != nil {

pkg/target/generatormergeandreplace_test.go

@@ -178,14 +178,14 @@ resources:
   - deployment.yaml
   - service.yaml
 configMapGenerator:
-  - name: configmap-in-base
+- name: configmap-in-base
-    literals:
+  literals:
-      - foo=bar
+  - foo=bar
 secretGenerator:
 - name: secret-in-base
   literals:
-    - username=admin
+  - username=admin
-    - password=somepw
+  - password=somepw
 `)
 	th.WriteF("/app/deployment.yaml", `
 apiVersion: apps/v1beta2
@@ -354,18 +354,18 @@ patchesStrategicMerge:
 bases:
   - ../app
 configMapGenerator:
-  - name: configmap-in-overlay
+- name: configmap-in-overlay
-    literals:
+  literals:
-      - hello=world
+  - hello=world
-  - name: configmap-in-base
+- name: configmap-in-base
-    behavior: replace
+  behavior: replace
-    literals:
+  literals:
-      - foo=override-bar
+  - foo=override-bar
 secretGenerator:
 - name: secret-in-base
   behavior: merge
   literals:
-   - proxy=haproxy
+  - proxy=haproxy
 `)
 	m, err := th.MakeKustTarget().MakeCustomizedResMap()
 	if err != nil {

pkg/target/multiplepatch_test.go

@@ -38,9 +38,9 @@ resources:
   - deployment.yaml
   - service.yaml
 configMapGenerator:
-  - name: configmap-in-base
+- name: configmap-in-base
-    literals:
+  literals:
-      - foo=bar
+  - foo=bar
 `)
 	th.WriteF("/app/base/deployment.yaml", `
 apiVersion: apps/v1beta2
@@ -93,9 +93,9 @@ patchesStrategicMerge:
 bases:
   - ../../base
 configMapGenerator:
-  - name: configmap-in-overlay
+- name: configmap-in-overlay
-    literals:
+  literals:
-      - hello=world
+  - hello=world
 `)
 }
 

pkg/target/namespacedgenerators_test.go

@@ -42,10 +42,10 @@ secretGenerator:
 - name: the-non-default-namespace-secret
   namespace: non-default
   literals:
-    - password.txt=verySecret
+  - password.txt=verySecret
 - name: the-secret
   literals:
-    - password.txt=anotherSecret
+  - password.txt=anotherSecret
 `)
 	m, err := th.MakeKustTarget().MakeCustomizedResMap()
 	if err != nil {

pkg/target/variableref_test.go

@@ -32,8 +32,8 @@ resources:
 configMapGenerator:
 - name: test-config-map
   literals:
-    - foo=bar
+  - foo=bar
-    - baz=qux
+  - baz=qux
 vars:
  - name: CDB_PUBLIC_SVC
    objref: