Skip to content

Commit

Permalink
Merge pull request #1302 from mmb/nginx-auth-tls-secret
Browse files Browse the repository at this point in the history
Add support for nginx.ingress.kubernetes.io/auth-tls-secret
  • Loading branch information
monopole authored Jul 3, 2019
2 parents d841d1b + 0d87cd6 commit e0bac6a
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
2 changes: 2 additions & 0 deletions pkg/transformers/config/defaultconfig/namereference.go
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,8 @@ nameReference:
kind: Ingress
- path: metadata/annotations/nginx.ingress.kubernetes.io\/auth-secret
kind: Ingress
- path: metadata/annotations/nginx.ingress.kubernetes.io\/auth-tls-secret
kind: Ingress
- path: imagePullSecrets/name
kind: ServiceAccount
- path: parameters/secretName
Expand Down
10 changes: 6 additions & 4 deletions pkg/transformers/namereference_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,9 @@ func TestNameReferenceHappyRun(t *testing.T) {
"metadata": map[string]interface{}{
"name": "ingress1",
"annotations": map[string]interface{}{
"ingress.kubernetes.io/auth-secret": "secret1",
"nginx.ingress.kubernetes.io/auth-secret": "secret1",
"ingress.kubernetes.io/auth-secret": "secret1",
"nginx.ingress.kubernetes.io/auth-secret": "secret1",
"nginx.ingress.kubernetes.io/auth-tls-secret": "secret1",
},
},
"spec": map[string]interface{}{
Expand Down Expand Up @@ -378,8 +379,9 @@ func TestNameReferenceHappyRun(t *testing.T) {
"metadata": map[string]interface{}{
"name": "ingress1",
"annotations": map[string]interface{}{
"ingress.kubernetes.io/auth-secret": "someprefix-secret1-somehash",
"nginx.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",
"nginx.ingress.kubernetes.io/auth-tls-secret": "someprefix-secret1-somehash",
},
},
"spec": map[string]interface{}{
Expand Down

0 comments on commit e0bac6a

Please sign in to comment.