DevFW-CICD/ingress-nginx-helm
12
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change PemSHA to CASHA

Browse source
This commit is contained in:
Gabor Lekeny 2019-08-16 06:31:15 +02:00
parent 65b9e2c574
commit 4624b5bc77
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
internal/ingress/annotations/proxyssl/main_test.go
View file

@ -77,7 +77,7 @@ func (m mockSecret) GetAuthCertificate(name string) (*resolver.AuthSSLCert, erro
return &resolver.AuthSSLCert{ return &resolver.AuthSSLCert{
Secret: "default/demo-secret", Secret: "default/demo-secret",
CAFileName: "/ssl/ca.crt", CAFileName: "/ssl/ca.crt",
PemSHA: "abc", CASHA: "abc",
}, nil }, nil
} }
@ -206,12 +206,12 @@ func TestEquals(t *testing.T) {
sslCert1 := resolver.AuthSSLCert{ sslCert1 := resolver.AuthSSLCert{
Secret: "default/demo-secret", Secret: "default/demo-secret",
CAFileName: "/ssl/ca.crt", CAFileName: "/ssl/ca.crt",
PemSHA: "abc", CASHA: "abc",
} }
sslCert2 := resolver.AuthSSLCert{ sslCert2 := resolver.AuthSSLCert{
Secret: "default/other-demo-secret", Secret: "default/other-demo-secret",
CAFileName: "/ssl/ca.crt", CAFileName: "/ssl/ca.crt",
PemSHA: "abc", CASHA: "abc",
} }
cfg1.AuthSSLCert = sslCert1 cfg1.AuthSSLCert = sslCert1
cfg2.AuthSSLCert = sslCert2 cfg2.AuthSSLCert = sslCert2

2
rootfs/etc/nginx/template/nginx.tmpl
View file

@ -806,7 +806,7 @@ stream {
{{ end }} {{ end }}
{{ if not (empty $server.ProxySSL.CAFileName) }} {{ if not (empty $server.ProxySSL.CAFileName) }}
# PEM sha: {{ $server.ProxySSL.PemSHA }} # PEM sha: {{ $server.ProxySSL.CASHA }}
proxy_ssl_certificate {{ $server.ProxySSL.CAFileName }}; proxy_ssl_certificate {{ $server.ProxySSL.CAFileName }};
proxy_ssl_certificate_key {{ $server.ProxySSL.CAFileName }}; proxy_ssl_certificate_key {{ $server.ProxySSL.CAFileName }};
proxy_ssl_trusted_certificate {{ $server.ProxySSL.CAFileName }}; proxy_ssl_trusted_certificate {{ $server.ProxySSL.CAFileName }};