BUG/MINOR: fix client-ca annotation removal

ivanmatmati · Mo3m3n · commit c954b4383865 · 2022-05-04T11:45:06.000Z
diff --git a/controller/handler/https.go b/controller/handler/https.go
@@ -88,13 +88,12 @@ func (h HTTPS) handleClientTLSAuth(k store.K8s, cfg *config.ControllerCfg, api a
 			return
 		}
 	}
-	if secret == nil {
-		return
-	}
-	caFile, err = cfg.Certificates.HandleTLSSecret(secret, certs.CA_CERT)
-	if err != nil {
-		err = fmt.Errorf("client TLS Auth: %w", err)
-		return
+	if secret != nil {
+		caFile, err = cfg.Certificates.HandleTLSSecret(secret, certs.CA_CERT)
+		if err != nil {
+			err = fmt.Errorf("client TLS Auth: %w", err)
+			return
+		}
 	}
 
 	binds, bindsErr := api.FrontendBindsGet(cfg.FrontHTTPS)

Original file line number	Diff line number	Diff line change
`@@ -88,13 +88,12 @@ func (h HTTPS) handleClientTLSAuth(k store.K8s, cfg *config.ControllerCfg, api a`
`88`	`88`	`return`
`89`	`89`	`}`
`90`	`90`	`}`
`91`		`- if secret == nil {`
`92`		`- return`
`93`		`- }`
`94`		`- caFile, err = cfg.Certificates.HandleTLSSecret(secret, certs.CA_CERT)`
`95`		`- if err != nil {`
`96`		`- err = fmt.Errorf("client TLS Auth: %w", err)`
`97`		`- return`
	`91`	`+ if secret != nil {`
	`92`	`+ caFile, err = cfg.Certificates.HandleTLSSecret(secret, certs.CA_CERT)`
	`93`	`+ if err != nil {`
	`94`	`+ err = fmt.Errorf("client TLS Auth: %w", err)`
	`95`	`+ return`
	`96`	`+ }`
`98`	`97`	`}`
`99`	`98`
`100`	`99`	`binds, bindsErr := api.FrontendBindsGet(cfg.FrontHTTPS)`