Doesn't fail if proxy-ssl-name annotation is not specified

kubernetes · Oct 16, 2019 · 8ff5fba · 8ff5fba
1 parent 62d0766
commit 8ff5fba
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/internal/ingress/annotations/proxyssl/main.go b/internal/ingress/annotations/proxyssl/main.go
@@ -45,11 +45,11 @@ var (
 // and the configured VerifyDepth
 type Config struct {
 	resolver.AuthSSLCert
-	Ciphers                   string `json:"ciphers"`
-	Protocols                 string `json:"protocols"`
-	ProxySSLName              string `json:"proxySSLName"`
-	Verify                    string `json:"verify"`
-	VerifyDepth               int    `json:"verifyDepth"`
+	Ciphers      string `json:"ciphers"`
+	Protocols    string `json:"protocols"`
+	ProxySSLName string `json:"proxySSLName"`
+	Verify       string `json:"verify"`
+	VerifyDepth  int    `json:"verifyDepth"`
 }
 
 // Equal tests for equality between two Config types
@@ -146,8 +146,7 @@ func (p proxySSL) Parse(ing *networking.Ingress) (interface{}, error) {
 
 	config.ProxySSLName, err = parser.GetStringAnnotation("proxy-ssl-name", ing)
 	if err != nil {
-		e := errors.Wrap(err, "error obtaining proxy-ssl-name")
-		return &Config{}, ing_errors.LocationDenied{Reason: e}
+		config.ProxySSLName = ""
 	}
 
 	config.Verify, err = parser.GetStringAnnotation("proxy-ssl-verify", ing)

diff --git a/internal/ingress/annotations/proxyssl/main_test.go b/internal/ingress/annotations/proxyssl/main_test.go
@@ -94,7 +94,6 @@ func TestAnnotations(t *testing.T) {
 	data[parser.GetAnnotationWithPrefix("proxy-ssl-session-reuse")] = "off"
 	data[parser.GetAnnotationWithPrefix("proxy-ssl-verify")] = "on"
 	data[parser.GetAnnotationWithPrefix("proxy-ssl-verify-depth")] = "3"
-	data[parser.GetAnnotationWithPrefix("proxy-ssl-name")] = "testname.namespace"
 
 	ing.SetAnnotations(data)
 
@@ -129,8 +128,8 @@ func TestAnnotations(t *testing.T) {
 	if u.VerifyDepth != 3 {
 		t.Errorf("expected %v but got %v", 3, u.VerifyDepth)
 	}
-	if u.ProxySSLName != "testname.namespace" {
-		t.Errorf("expected %v but got %v", "testname.namespace", u.ProxySSLName)
+	if u.ProxySSLName != "$host" {
+		t.Errorf("expected %v but got %v", "$host", u.ProxySSLName)
 	}
 
 }