kubernetes
/
kubectl
mirror of https://github.com/kubernetes/kubectl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix wrong paths of name reference transformer config

This commit is contained in:
ymqytw 2018-02-06 17:01:47 -08:00
parent 087c096eff
commit 021e6bd569
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kinflate/commands/testdata/simple/out/expected.yaml vendored
View File

@ -135,4 +135,4 @@ spec:
name: app-env name: app-env
- name: app-tls - name: app-tls
secret: secret:
name: test-infra-app-tls-4d47hbbh9m secretName: test-infra-app-tls-4d47hbbh9m

2
pkg/kinflate/examples/simple/instances/exampleinstance/deployment/deployment.yaml
View File

@ -39,5 +39,5 @@ spec:
name: app-env name: app-env
name: app-env name: app-env
- secret: - secret:
name: app-tls secretName: app-tls
name: app-tls name: app-tls

2
pkg/kinflate/transformers/namereference_test.go
View File

@ -106,7 +106,7 @@ func makeNameRefDeployment(cmName, secretName string) *unstructured.Unstructured
"name": cmName, "name": cmName,
}, },
"secret": map[string]interface{}{ "secret": map[string]interface{}{
"name": secretName, "secretName": secretName,
}, },
}, },
}, },

14
pkg/kinflate/transformers/namereferenceconfig.go
View File

@ -192,7 +192,7 @@ var defaultNameReferencePathConfigs = []referencePathConfig{
Version: "v1", Version: "v1",
Kind: "Pod", Kind: "Pod",
}, },
Path: []string{"spec", "volumes", "secret", "name"}, Path: []string{"spec", "volumes", "secret", "secretName"},
CreateIfNotPresent: false, CreateIfNotPresent: false,
}, },
{ {
@ -215,7 +215,7 @@ var defaultNameReferencePathConfigs = []referencePathConfig{
GroupVersionKind: &schema.GroupVersionKind{ GroupVersionKind: &schema.GroupVersionKind{
Kind: "Deployment", Kind: "Deployment",
}, },
Path: []string{"spec", "template", "spec", "volumes", "secret", "name"}, Path: []string{"spec", "template", "spec", "volumes", "secret", "secretName"},
CreateIfNotPresent: false, CreateIfNotPresent: false,
}, },
{ {
@ -236,7 +236,7 @@ var defaultNameReferencePathConfigs = []referencePathConfig{
GroupVersionKind: &schema.GroupVersionKind{ GroupVersionKind: &schema.GroupVersionKind{
Kind: "ReplicaSet", Kind: "ReplicaSet",
}, },
Path: []string{"spec", "template", "spec", "volumes", "secret", "name"}, Path: []string{"spec", "template", "spec", "volumes", "secret", "secretName"},
CreateIfNotPresent: false, CreateIfNotPresent: false,
}, },
{ {
@ -257,7 +257,7 @@ var defaultNameReferencePathConfigs = []referencePathConfig{
GroupVersionKind: &schema.GroupVersionKind{ GroupVersionKind: &schema.GroupVersionKind{
Kind: "DaemonSet", Kind: "DaemonSet",
}, },
Path: []string{"spec", "template", "spec", "volumes", "secret", "name"}, Path: []string{"spec", "template", "spec", "volumes", "secret", "secretName"},
CreateIfNotPresent: false, CreateIfNotPresent: false,
}, },
{ {
@ -278,7 +278,7 @@ var defaultNameReferencePathConfigs = []referencePathConfig{
GroupVersionKind: &schema.GroupVersionKind{ GroupVersionKind: &schema.GroupVersionKind{
Kind: "StatefulSet", Kind: "StatefulSet",
}, },
Path: []string{"spec", "template", "spec", "volumes", "secret", "name"}, Path: []string{"spec", "template", "spec", "volumes", "secret", "secretName"},
CreateIfNotPresent: false, CreateIfNotPresent: false,
}, },
{ {
@ -299,7 +299,7 @@ var defaultNameReferencePathConfigs = []referencePathConfig{
GroupVersionKind: &schema.GroupVersionKind{ GroupVersionKind: &schema.GroupVersionKind{
Kind: "Job", Kind: "Job",
}, },
Path: []string{"spec", "template", "spec", "volumes", "secret", "name"}, Path: []string{"spec", "template", "spec", "volumes", "secret", "secretName"},
CreateIfNotPresent: false, CreateIfNotPresent: false,
}, },
{ {
@ -320,7 +320,7 @@ var defaultNameReferencePathConfigs = []referencePathConfig{
GroupVersionKind: &schema.GroupVersionKind{ GroupVersionKind: &schema.GroupVersionKind{
Kind: "CronJob", Kind: "CronJob",
}, },
Path: []string{"spec", "jobTemplate", "spec", "template", "spec", "volumes", "secret", "name"}, Path: []string{"spec", "jobTemplate", "spec", "template", "spec", "volumes", "secret", "secretName"},
CreateIfNotPresent: false, CreateIfNotPresent: false,
}, },
{ {