Merge pull request #1393 from ibuildthecloud/main

If cert-manager annotations are set always use that tls

Author: ibuildthecloud

pkg/publish/ingress.go

@@ -243,9 +243,8 @@ func Ingress(req router.Request, svc *v1.ServiceInstance) (result []kclient.Obje
 }
 
 func setupCertManager(serviceName string, annotations map[string]string, rules []networkingv1.IngressRule, tls []networkingv1.IngressTLS) []networkingv1.IngressTLS {
-	if (annotations["cert-manager.io/cluster-issuer"] == "" && annotations["cert-manager.io/issuer"] == "") ||
-		len(tls) != 0 {
-		// cert-manager is not being used, or we have TLS for this
+	if annotations["cert-manager.io/cluster-issuer"] == "" && annotations["cert-manager.io/issuer"] == "" {
+		// cert-manager override is not being used
 		return tls
 	}
 

pkg/publish/ingress_test.go

@@ -286,7 +286,7 @@ func Test_setupCertManager(t *testing.T) {
 			want: []networkingv1.IngressTLS{{Hosts: []string{"host"}}},
 		},
 		{
-			name: "annotation but tls found",
+			name: "annotation and tls found, prefer annotation",
 			args: args{
 				serviceName: "foo",
 				annotations: map[string]string{
@@ -295,7 +295,7 @@ func Test_setupCertManager(t *testing.T) {
 				rules: []networkingv1.IngressRule{{Host: "host1"}},
 				tls:   []networkingv1.IngressTLS{{Hosts: []string{"host"}}},
 			},
-			want: []networkingv1.IngressTLS{{Hosts: []string{"host"}}},
+			want: []networkingv1.IngressTLS{{Hosts: []string{"host1"}, SecretName: "foo-cm-cert-1"}},
 		},
 		{
 			name: "cluster-issuer annotation found",