cert-manager: rename EnsureWebhook -> EnsureCertManager

kubernetes-sigs · Jul 9, 2020 · 4336293 · 4336293
1 parent e67670b
commit 4336293
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/cmd/clusterctl/client/client_test.go b/cmd/clusterctl/client/client_test.go
@@ -200,7 +200,7 @@ type fakeCertManagerClient struct {
 
 var _ cluster.CertManagerClient = &fakeCertManagerClient{}
 
-func (p *fakeCertManagerClient) EnsureWebhook() error {
+func (p *fakeCertManagerClient) EnsureCertManager() error {
 	return nil
 }
 

diff --git a/cmd/clusterctl/client/cluster/cert_manager.go b/cmd/clusterctl/client/cluster/cert_manager.go
@@ -22,6 +22,7 @@ import (
 	"github.com/pkg/errors"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+
 	clusterctlv1 "sigs.k8s.io/cluster-api/cmd/clusterctl/api/v1alpha3"
 	"sigs.k8s.io/cluster-api/cmd/clusterctl/client/config"
 	manifests "sigs.k8s.io/cluster-api/cmd/clusterctl/config"
@@ -44,9 +45,9 @@ const (
 
 // CertManagerClient has methods to work with cert-manager components in the cluster.
 type CertManagerClient interface {
-	// EnsureWebhook makes sure the cert-manager Webhook is Available in a cluster:
+	// EnsureCertManager makes sure the cert-manager Webhook is Available in a cluster:
 	// this is a requirement to install a new provider
-	EnsureWebhook() error
+	EnsureCertManager() error
 
 	// Images return the list of images required for installing the cert-manager.
 	Images() ([]string, error)
@@ -86,11 +87,11 @@ func (cm *certManagerClient) Images() ([]string, error) {
 	return images, nil
 }
 
-// EnsureWebhook makes sure the cert-manager Web-hook is Available in a cluster:
+// EnsureCertManager makes sure the cert-manager Web-hook is Available in a cluster:
 // this is a requirement to install a new provider
 // Nb. In order to provide a simpler out-of-the box experience, the cert-manager manifest
 // is embedded in the clusterctl binary.
-func (cm *certManagerClient) EnsureWebhook() error {
+func (cm *certManagerClient) EnsureCertManager() error {
 	log := logf.Log
 
 	// Otherwise install cert-manager

diff --git a/cmd/clusterctl/client/init.go b/cmd/clusterctl/client/init.go
@@ -105,7 +105,7 @@ func (c *clusterctlClient) Init(options InitOptions) ([]Components, error) {
 	}
 
 	// Before installing the providers, ensure the cert-manager Webhook is in place.
-	if err := cluster.CertManager().EnsureWebhook(); err != nil {
+	if err := cluster.CertManager().EnsureCertManager(); err != nil {
 		return nil, err
 	}