add namepreference for secret in ingress annotation

This commit is contained in:
Jingfang Liu
2018-08-07 13:26:39 -07:00
parent 8332a70d19
commit 31c6a55747
2 changed files with 11 additions and 2 deletions

View File

@@ -67,7 +67,8 @@ func TestNameReferenceRun(t *testing.T) {
"metadata": map[string]interface{}{
"name": "ingress1",
"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{}{
@@ -309,7 +310,8 @@ func TestNameReferenceRun(t *testing.T) {
"metadata": map[string]interface{}{
"name": "ingress1",
"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{}{

View File

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