From 01716e2907a11681bbdcca9d0341e7765992739b Mon Sep 17 00:00:00 2001 From: joshvanl Date: Thu, 29 Apr 2021 11:42:21 +0100 Subject: [PATCH] Fixes stutter: istio.IsIstioInstalled -> istio.IsInstalled Signed-off-by: joshvanl --- cmd/controller/app/controller.go | 2 +- pkg/issuer/acme/http/istio_test.go | 2 +- pkg/util/istio/istio.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/controller/app/controller.go b/cmd/controller/app/controller.go index 668c9c85b..b5e681dcd 100644 --- a/cmd/controller/app/controller.go +++ b/cmd/controller/app/controller.go @@ -71,7 +71,7 @@ func Run(opts *options.ControllerOptions, stopCh <-chan struct{}) { os.Exit(1) } - ctx.IstioEnabled, err = istio.IsIstioInstalled(ctx) + ctx.IstioEnabled, err = istio.IsInstalled(ctx) if err != nil { log.Error(err, "failed to discover if Istio is available") os.Exit(1) diff --git a/pkg/issuer/acme/http/istio_test.go b/pkg/issuer/acme/http/istio_test.go index d8077e146..276a2daac 100644 --- a/pkg/issuer/acme/http/istio_test.go +++ b/pkg/issuer/acme/http/istio_test.go @@ -26,7 +26,7 @@ import ( "k8s.io/apimachinery/pkg/labels" cmacme "github.com/jetstack/cert-manager/pkg/apis/acme/v1" - "github.com/jetstack/cert-manager/pkg/issuer/acme/http/internal/istio" + "github.com/jetstack/cert-manager/pkg/internal/apis/istio" ) func TestEnsureIstio(t *testing.T) { diff --git a/pkg/util/istio/istio.go b/pkg/util/istio/istio.go index 05843af3d..0e8322e87 100644 --- a/pkg/util/istio/istio.go +++ b/pkg/util/istio/istio.go @@ -24,7 +24,7 @@ import ( "github.com/jetstack/cert-manager/pkg/internal/apis/istio" ) -func IsIstioInstalled(ctx *controller.Context) (bool, error) { +func IsInstalled(ctx *controller.Context) (bool, error) { groups, err := ctx.Client.Discovery().ServerGroups() if err != nil { return false, err