Skip to content

Commit

Permalink
fix: use best effort mode to extract exposure, ignore None ClusterIP (#3
Browse files Browse the repository at this point in the history
)

Signed-off-by: STRRL <im@strrl.dev>
  • Loading branch information
STRRL committed Jun 17, 2023
1 parent 25d49db commit 21925db
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
6 changes: 5 additions & 1 deletion pkg/controller/ingress-controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ package controller

import (
"context"
"fmt"

cloudflarecontroller "github.com/STRRL/cloudflare-tunnel-ingress-controller/pkg/cloudflare-controller"
"github.com/STRRL/cloudflare-tunnel-ingress-controller/pkg/exposure"
"github.com/go-logr/logr"
Expand Down Expand Up @@ -73,11 +75,13 @@ func (i *IngressController) Reconcile(ctx context.Context, request reconcile.Req
if err != nil {
return reconcile.Result{}, errors.Wrap(err, "list controlled ingresses")
}

var allExposures []exposure.Exposure
for _, ingress := range ingresses {
// best effort to extract exposures from all ingresses
exposures, err := i.fromIngressToExposure(ctx, ingress)
if err != nil {
return reconcile.Result{}, errors.Wrapf(err, "extract exposures from ingress %s", ingress.Name)
i.logger.Info("extract exposures from ingress, skipped", "triggered-by", request.NamespacedName, "ingress", fmt.Sprintf("%s/%s", ingress.Namespace, ingress.Name), "error", err)
}
allExposures = append(allExposures, exposures...)
}
Expand Down
5 changes: 5 additions & 0 deletions pkg/controller/transform.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package controller
import (
"context"
"fmt"

"github.com/STRRL/cloudflare-tunnel-ingress-controller/pkg/exposure"
"github.com/pkg/errors"
v1 "k8s.io/api/core/v1"
Expand Down Expand Up @@ -50,6 +51,10 @@ func (i *IngressController) fromIngressToExposure(ctx context.Context, ingress n
return nil, errors.Errorf("service %s has no cluster ip", namespacedName)
}

if service.Spec.ClusterIP == "None" {
return nil, errors.Errorf("service %s has None for cluster ip, headless service is not supported", namespacedName)
}

host := service.Spec.ClusterIP

var port int32
Expand Down

0 comments on commit 21925db

Please sign in to comment.