From 31c6a55747a5ec04b338ae63772b9d0f058ae16d Mon Sep 17 00:00:00 2001 From: Jingfang Liu Date: Tue, 7 Aug 2018 13:26:39 -0700 Subject: [PATCH] add namepreference for secret in ingress annotation --- pkg/transformers/namereference_test.go | 6 ++++-- pkg/transformers/namereferenceconfig.go | 7 +++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/pkg/transformers/namereference_test.go b/pkg/transformers/namereference_test.go index 3415e6db2..569e48926 100644 --- a/pkg/transformers/namereference_test.go +++ b/pkg/transformers/namereference_test.go @@ -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{}{ diff --git a/pkg/transformers/namereferenceconfig.go b/pkg/transformers/namereferenceconfig.go index 6eb8f5603..5f3688bdf 100644 --- a/pkg/transformers/namereferenceconfig.go +++ b/pkg/transformers/namereferenceconfig.go @@ -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",