mirror of
https://github.com/kubernetes-sigs/kustomize.git
synced 2026-06-12 01:14:22 +00:00
fix configmap/secret name references for cronjobs with projected volumes
This commit is contained in:
@@ -108,6 +108,8 @@ nameReference:
|
|||||||
kind: Job
|
kind: Job
|
||||||
- path: spec/jobTemplate/spec/template/spec/volumes/configMap/name
|
- path: spec/jobTemplate/spec/template/spec/volumes/configMap/name
|
||||||
kind: CronJob
|
kind: CronJob
|
||||||
|
- path: spec/jobTemplate/spec/template/spec/volumes/projected/sources/configMap/name
|
||||||
|
kind: CronJob
|
||||||
- path: spec/jobTemplate/spec/template/spec/containers/env/valueFrom/configMapKeyRef/name
|
- path: spec/jobTemplate/spec/template/spec/containers/env/valueFrom/configMapKeyRef/name
|
||||||
kind: CronJob
|
kind: CronJob
|
||||||
- path: spec/jobTemplate/spec/template/spec/initContainers/env/valueFrom/configMapKeyRef/name
|
- path: spec/jobTemplate/spec/template/spec/initContainers/env/valueFrom/configMapKeyRef/name
|
||||||
@@ -204,6 +206,8 @@ nameReference:
|
|||||||
kind: Job
|
kind: Job
|
||||||
- path: spec/jobTemplate/spec/template/spec/volumes/secret/secretName
|
- path: spec/jobTemplate/spec/template/spec/volumes/secret/secretName
|
||||||
kind: CronJob
|
kind: CronJob
|
||||||
|
- path: spec/jobTemplate/spec/template/spec/volumes/projected/sources/secret/name
|
||||||
|
kind: CronJob
|
||||||
- path: spec/jobTemplate/spec/template/spec/containers/env/valueFrom/secretKeyRef/name
|
- path: spec/jobTemplate/spec/template/spec/containers/env/valueFrom/secretKeyRef/name
|
||||||
kind: CronJob
|
kind: CronJob
|
||||||
- path: spec/jobTemplate/spec/template/spec/initContainers/env/valueFrom/secretKeyRef/name
|
- path: spec/jobTemplate/spec/template/spec/initContainers/env/valueFrom/secretKeyRef/name
|
||||||
|
|||||||
@@ -241,6 +241,43 @@ func TestNameReferenceHappyRun(t *testing.T) {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
}),
|
}),
|
||||||
|
resid.NewResId(cronjob, "cronjob1"): rf.FromMap(
|
||||||
|
map[string]interface{}{
|
||||||
|
"apiVersion": "batch/v1beta1",
|
||||||
|
"kind": "CronJob",
|
||||||
|
"metadata": map[string]interface{}{
|
||||||
|
"name": "cronjob1",
|
||||||
|
},
|
||||||
|
"spec": map[string]interface{}{
|
||||||
|
"schedule": "0 14 * * *",
|
||||||
|
"jobTemplate": map[string]interface{}{
|
||||||
|
"spec": map[string]interface{}{
|
||||||
|
"template": map[string]interface{}{
|
||||||
|
"spec": map[string]interface{}{
|
||||||
|
"containers": []interface{}{
|
||||||
|
map[string]interface{}{
|
||||||
|
"name": "main",
|
||||||
|
"image": "myimage",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
"volumes": map[string]interface{}{
|
||||||
|
"projected": map[string]interface{}{
|
||||||
|
"sources": map[string]interface{}{
|
||||||
|
"configMap": map[string]interface{}{
|
||||||
|
"name": "cm2",
|
||||||
|
},
|
||||||
|
"secret": map[string]interface{}{
|
||||||
|
"name": "secret1",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}),
|
||||||
}
|
}
|
||||||
|
|
||||||
expected := resmap.ResMap{}
|
expected := resmap.ResMap{}
|
||||||
@@ -417,6 +454,43 @@ func TestNameReferenceHappyRun(t *testing.T) {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
expected[resid.NewResId(cronjob, "cronjob1")] = rf.FromMap(
|
||||||
|
map[string]interface{}{
|
||||||
|
"apiVersion": "batch/v1beta1",
|
||||||
|
"kind": "CronJob",
|
||||||
|
"metadata": map[string]interface{}{
|
||||||
|
"name": "cronjob1",
|
||||||
|
},
|
||||||
|
"spec": map[string]interface{}{
|
||||||
|
"schedule": "0 14 * * *",
|
||||||
|
"jobTemplate": map[string]interface{}{
|
||||||
|
"spec": map[string]interface{}{
|
||||||
|
"template": map[string]interface{}{
|
||||||
|
"spec": map[string]interface{}{
|
||||||
|
"containers": []interface{}{
|
||||||
|
map[string]interface{}{
|
||||||
|
"name": "main",
|
||||||
|
"image": "myimage",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
"volumes": map[string]interface{}{
|
||||||
|
"projected": map[string]interface{}{
|
||||||
|
"sources": map[string]interface{}{
|
||||||
|
"configMap": map[string]interface{}{
|
||||||
|
"name": "someprefix-cm2-somehash",
|
||||||
|
},
|
||||||
|
"secret": map[string]interface{}{
|
||||||
|
"name": "someprefix-secret1-somehash",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
nrt := NewNameReferenceTransformer(defaultTransformerConfig.NameReference)
|
nrt := NewNameReferenceTransformer(defaultTransformerConfig.NameReference)
|
||||||
err := nrt.Transform(m)
|
err := nrt.Transform(m)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
Reference in New Issue
Block a user