Skip to content

k8s-ingress
k8s-ingress
Commit 4cc092c4 authored by Geoff Simmons's avatar Geoff Simmons
Browse files
Options

Bugfix: TLS Secret invalid (status Fatal) if tls.crt or .key is empty.

parent 611199e1
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 5 deletions
pkg/controller/secret.go
View file @ 4cc092c4
...@@ -107,16 +107,18 @@ func (worker *NamespaceWorker) updateCertSecret( ...@@ -107,16 +107,18 @@ func (worker *NamespaceWorker) updateCertSecret(
string(api_v1.SecretTypeTLS)) string(api_v1.SecretTypeTLS))
} }
crt, ok := tlsSecret.Data["tls.crt"] crt, ok := tlsSecret.Data["tls.crt"]
if !ok { if !ok || len(crt) == 0 {
return update.MakeFatal( return update.MakeFatal(
"Ingress TLS Secret %s/%s: key tls.crt not found", "Ingress TLS Secret %s/%s: key tls.crt not found "+
"or empty",
tlsSecret.ObjectMeta.Namespace, tlsSecret.ObjectMeta.Namespace,
tlsSecret.ObjectMeta.Name) tlsSecret.ObjectMeta.Name)
} }
key, ok := tlsSecret.Data["tls.key"] key, ok := tlsSecret.Data["tls.key"]
if !ok { if !ok || len(key) == 0 {
return update.MakeFatal( return update.MakeFatal(
"Ingress TLS Secret %s/%s: key tls.key not found", "Ingress TLS Secret %s/%s: key tls.key not found "+
"or empty",
tlsSecret.ObjectMeta.Namespace, tlsSecret.ObjectMeta.Namespace,
tlsSecret.ObjectMeta.Name) tlsSecret.ObjectMeta.Name)
} }
...@@ -127,7 +129,7 @@ func (worker *NamespaceWorker) updateCertSecret( ...@@ -127,7 +129,7 @@ func (worker *NamespaceWorker) updateCertSecret(
return update.MakeIncomplete("%v", err) return update.MakeIncomplete("%v", err)
} }
pem := string(crt) pem := string(crt)
if crt[len(crt)-1] != byte('\n') { if len(crt) > 1 && crt[len(crt)-1] != byte('\n') {
pem += "\n" pem += "\n"
} }
pem += string(key) pem += string(key)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment