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

Merge pull request #237 from Liujingfang1/ingress

Browse Source 
add namepreference for secret in ingress annotation
This commit is contained in:
k8s-ci-robot
2018-08-08 09:49:06 -07:00
committed by GitHub
parent 8332a70d19 31c6a55747
commit e0a09f4755
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/transformers/namereference_test.go
View File

@@ -67,7 +67,8 @@ func TestNameReferenceRun(t *testing.T) {
"metadata": map[string]interface{}{ "metadata": map[string]interface{}{
"name": "ingress1", "name": "ingress1",
"annotations": map[string]interface{}{ "annotations": map[string]interface{}{
"ingress.kubernetes.io/auth-secret": "secret1", "ingress.kubernetes.io/auth-secret": "secret1",
"nginx.ingress.kubernetes.io/auth-secret": "secret1",
}, },
}, },
"spec": map[string]interface{}{ "spec": map[string]interface{}{
@@ -309,7 +310,8 @@ func TestNameReferenceRun(t *testing.T) {
"metadata": map[string]interface{}{ "metadata": map[string]interface{}{
"name": "ingress1", "name": "ingress1",
"annotations": map[string]interface{}{ "annotations": map[string]interface{}{
"ingress.kubernetes.io/auth-secret": "someprefix-secret1-somehash", "ingress.kubernetes.io/auth-secret": "someprefix-secret1-somehash",
"nginx.ingress.kubernetes.io/auth-secret": "someprefix-secret1-somehash",
}, },
}, },
"spec": map[string]interface{}{ "spec": map[string]interface{}{

7
pkg/transformers/namereferenceconfig.go
View File

@@ -657,6 +657,13 @@ var defaultNameReferencePathConfigs = []ReferencePathConfig{
Path: []string{"metadata", "annotations", "ingress.kubernetes.io/auth-secret"}, Path: []string{"metadata", "annotations", "ingress.kubernetes.io/auth-secret"},
CreateIfNotPresent: false, CreateIfNotPresent: false,
}, },
{
GroupVersionKind: &schema.GroupVersionKind{
Kind: "Ingress",
},
Path: []string{"metadata", "annotations", "nginx.ingress.kubernetes.io/auth-secret"},
CreateIfNotPresent: false,
},
{ {
GroupVersionKind: &schema.GroupVersionKind{ GroupVersionKind: &schema.GroupVersionKind{
Kind: "ServiceAccount", Kind: "ServiceAccount",