kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-06-14 02:20:53 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #150 from ryane/fix-pvc-claimname

Browse Source 
add PersistentVolumeClaim to name reference transformer
This commit is contained in:
Jingfang Liu
2018-07-09 13:51:52 -07:00
committed by GitHub
parent 6f82073d4b 36772aac89
commit 3305be9589
3 changed files with 80 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/transformers/labelsandannotations_test.go
View File

@@ -34,6 +34,7 @@ var foo = schema.GroupVersionKind{Group: "example.com", Version: "v1", Kind: "Fo
var crd = schema.GroupVersionKind{Group: "apiwctensions.k8s.io", Version: "v1beta1", Kind: "CustomResourceDefinition"} var crd = schema.GroupVersionKind{Group: "apiwctensions.k8s.io", Version: "v1beta1", Kind: "CustomResourceDefinition"}
var job = schema.GroupVersionKind{Group: "batch", Version: "v1", Kind: "Job"} var job = schema.GroupVersionKind{Group: "batch", Version: "v1", Kind: "Job"}
var cronjob = schema.GroupVersionKind{Group: "batch", Version: "v1beta1", Kind: "CronJob"} var cronjob = schema.GroupVersionKind{Group: "batch", Version: "v1beta1", Kind: "CronJob"}
var pvc = schema.GroupVersionKind{Version: "v1", Kind: "PersistentVolumeClaim"}
func TestLabelsRun(t *testing.T) { func TestLabelsRun(t *testing.T) {
m := resmap.ResMap{ m := resmap.ResMap{

22
pkg/transformers/namereference_test.go
View File

@@ -43,6 +43,14 @@ func TestNameReferenceRun(t *testing.T) {
"name": "someprefix-secret1-somehash", "name": "someprefix-secret1-somehash",
}, },
}), }),
resource.NewResId(pvc, "claim1"): resource.NewResourceFromMap(
map[string]interface{}{
"apiVersion": "v1",
"kind": "PersistentVolumeClaim",
"metadata": map[string]interface{}{
"name": "someprefix-claim1",
},
}),
resource.NewResId(deploy, "deploy1"): resource.NewResourceFromMap( resource.NewResId(deploy, "deploy1"): resource.NewResourceFromMap(
map[string]interface{}{ map[string]interface{}{
"group": "apps", "group": "apps",
@@ -106,6 +114,9 @@ func TestNameReferenceRun(t *testing.T) {
"secret": map[string]interface{}{ "secret": map[string]interface{}{
"secretName": "secret1", "secretName": "secret1",
}, },
"persistentVolumeClaim": map[string]interface{}{
"claimName": "claim1",
},
}, },
}, },
}, },
@@ -130,6 +141,14 @@ func TestNameReferenceRun(t *testing.T) {
"name": "someprefix-secret1-somehash", "name": "someprefix-secret1-somehash",
}, },
}), }),
resource.NewResId(pvc, "claim1"): resource.NewResourceFromMap(
map[string]interface{}{
"apiVersion": "v1",
"kind": "PersistentVolumeClaim",
"metadata": map[string]interface{}{
"name": "someprefix-claim1",
},
}),
resource.NewResId(deploy, "deploy1"): resource.NewResourceFromMap( resource.NewResId(deploy, "deploy1"): resource.NewResourceFromMap(
map[string]interface{}{ map[string]interface{}{
"group": "apps", "group": "apps",
@@ -193,6 +212,9 @@ func TestNameReferenceRun(t *testing.T) {
"secret": map[string]interface{}{ "secret": map[string]interface{}{
"secretName": "someprefix-secret1-somehash", "secretName": "someprefix-secret1-somehash",
}, },
"persistentVolumeClaim": map[string]interface{}{
"claimName": "someprefix-claim1",
},
}, },
}, },
}, },

57
pkg/transformers/namereferenceconfig.go
View File

@@ -789,6 +789,63 @@ var defaultNameReferencePathConfigs = []ReferencePathConfig{
}, },
}, },
}, },
{
referencedGVK: schema.GroupVersionKind{
Version: "v1",
Kind: "PersistentVolumeClaim",
},
pathConfigs: []PathConfig{
{
GroupVersionKind: &schema.GroupVersionKind{
Kind: "Pod",
},
Path: []string{"spec", "volumes", "persistentVolumeClaim", "claimName"},
CreateIfNotPresent: false,
},
{
GroupVersionKind: &schema.GroupVersionKind{
Kind: "StatefulSet",
},
Path: []string{"spec", "template", "spec", "volumes", "persistentVolumeClaim", "claimName"},
CreateIfNotPresent: false,
},
{
GroupVersionKind: &schema.GroupVersionKind{
Kind: "Deployment",
},
Path: []string{"spec", "template", "spec", "volumes", "persistentVolumeClaim", "claimName"},
CreateIfNotPresent: false,
},
{
GroupVersionKind: &schema.GroupVersionKind{
Kind: "ReplicationController",
},
Path: []string{"spec", "template", "spec", "volumes", "persistentVolumeClaim", "claimName"},
CreateIfNotPresent: false,
},
{
GroupVersionKind: &schema.GroupVersionKind{
Kind: "CronJob",
},
Path: []string{"spec", "jobTemplate", "spec", "template", "spec", "volumes", "persistentVolumeClaim", "claimName"},
CreateIfNotPresent: false,
},
{
GroupVersionKind: &schema.GroupVersionKind{
Kind: "Job",
},
Path: []string{"spec", "template", "spec", "volumes", "persistentVolumeClaim", "claimName"},
CreateIfNotPresent: false,
},
{
GroupVersionKind: &schema.GroupVersionKind{
Kind: "DaemonSet",
},
Path: []string{"spec", "template", "spec", "volumes", "persistentVolumeClaim", "claimName"},
CreateIfNotPresent: false,
},
},
},
} }
// AddNameReferencePathConfigs adds extra reference path configs to the default one // AddNameReferencePathConfigs adds extra reference path configs to the default one