Rebase on CAPI v1.6.0

Author: Fedosin

Makefile

@@ -70,7 +70,7 @@ CONTROLLER_GEN_VER := v0.11.4
 CONTROLLER_GEN_BIN := controller-gen
 CONTROLLER_GEN := $(TOOLS_BIN_DIR)/$(CONTROLLER_GEN_BIN)-$(CONTROLLER_GEN_VER)
 
-GOLANGCI_LINT_VER := v1.53.2
+GOLANGCI_LINT_VER := v1.55.2
 GOLANGCI_LINT_BIN := golangci-lint
 GOLANGCI_LINT := $(TOOLS_BIN_DIR)/$(GOLANGCI_LINT_BIN)-$(GOLANGCI_LINT_VER)
 

cmd/plugin/cmd/init.go

@@ -63,8 +63,8 @@ type initOptions struct {
 }
 
 const (
-	capiOperatorProviderName = "capi-operator"
-	capiOperatorManifestsURL = "https://github.com/kubernetes-sigs/cluster-api-operator/releases/latest/operator-components.yaml"
+	capiOperatorProviderName         = "capi-operator"
+	capiOperatorManifestsURLTemplate = "https://github.com/kubernetes-sigs/cluster-api-operator/releases/%s/operator-components.yaml"
 )
 
 var initOpts = &initOptions{}
@@ -127,7 +127,7 @@ func init() {
 		"Path to the kubeconfig for the management cluster. If unspecified, default discovery rules apply.")
 	initCmd.PersistentFlags().StringVar(&initOpts.kubeconfigContext, "kubeconfig-context", "",
 		"Context to be used within the kubeconfig file. If empty, current context will be used.")
-	initCmd.PersistentFlags().StringVar(&initOpts.operatorVersion, "operator-version", "",
+	initCmd.PersistentFlags().StringVar(&initOpts.operatorVersion, "operator-version", GetLatestPluginVersion(),
 		"CAPI Operator version (e.g. v0.7.0) to install on the management cluster. If unspecified, the latest release is used.")
 	initCmd.PersistentFlags().StringVar(&initOpts.coreProvider, "core", "",
 		"Core provider version (e.g. cluster-api:v1.1.5) to add to the management cluster. If unspecified, Cluster API's latest release is used.")
@@ -168,7 +168,7 @@ func runInit() error {
 	log.Info("Checking that Cert Manager is installed and running.")
 
 	// Ensure that cert manager is installed.
-	if err := ensureCertManager(initOpts); err != nil {
+	if err := ensureCertManager(ctx, initOpts); err != nil {
 		return fmt.Errorf("cannot ensure that cert manager is installed: %w", err)
 	}
 
@@ -187,7 +187,7 @@ func runInit() error {
 	if !deploymentExists {
 		log.Info("Installing CAPI operator", "Version", initOpts.operatorVersion)
 
-		if err := deployCAPIOperator(initOpts); err != nil {
+		if err := deployCAPIOperator(ctx, initOpts); err != nil {
 			return fmt.Errorf("cannot deploy CAPI operator: %w", err)
 		}
 
@@ -340,8 +340,8 @@ func checkProviderReadiness(ctx context.Context, client ctrlclient.Client, gener
 	}
 }
 
-func ensureCertManager(opts *initOptions) error {
-	configClient, err := configclient.New("")
+func ensureCertManager(ctx context.Context, opts *initOptions) error {
+	configClient, err := configclient.New(ctx, "")
 	if err != nil {
 		return fmt.Errorf("cannot create config client: %w", err)
 	}
@@ -355,23 +355,29 @@ func ensureCertManager(opts *initOptions) error {
 
 	// Before installing the operator, ensure the cert-manager Webhook is in place.
 	certManager := clusterClient.CertManager()
-	if err := certManager.EnsureInstalled(); err != nil {
+	if err := certManager.EnsureInstalled(ctx); err != nil {
 		return fmt.Errorf("cannot install cert-manager Webhook: %w", err)
 	}
 
 	return nil
 }
 
 // deployCAPIOperator deploys the CAPI operator on the management cluster.
-func deployCAPIOperator(opts *initOptions) error {
-	configClient, err := configclient.New("")
+func deployCAPIOperator(ctx context.Context, opts *initOptions) error {
+	configClient, err := configclient.New(ctx, "")
 	if err != nil {
 		return fmt.Errorf("cannot create config client: %w", err)
 	}
 
+	if opts.operatorVersion == "" {
+		return fmt.Errorf("cannot deploy CAPI operator without specifying an operator version")
+	}
+
+	capiOperatorManifestsURL := fmt.Sprintf(capiOperatorManifestsURLTemplate, opts.operatorVersion)
+
 	providerConfig := configclient.NewProvider(capiOperatorProviderName, capiOperatorManifestsURL, clusterctlv1.ProviderTypeUnknown)
 
-	repo, err := util.RepositoryFactory(providerConfig, configClient.Variables())
+	repo, err := util.RepositoryFactory(ctx, providerConfig, configClient.Variables())
 	if err != nil {
 		return fmt.Errorf("cannot create repository: %w", err)
 	}
@@ -380,7 +386,7 @@ func deployCAPIOperator(opts *initOptions) error {
 		opts.operatorVersion = repo.DefaultVersion()
 	}
 
-	componentsFile, err := repo.GetFile(opts.operatorVersion, repo.ComponentsPath())
+	componentsFile, err := repo.GetFile(ctx, opts.operatorVersion, repo.ComponentsPath())
 	if err != nil {
 		return fmt.Errorf("cannot get components file: %w", err)
 	}
@@ -409,10 +415,7 @@ func deployCAPIOperator(opts *initOptions) error {
 
 	clusterClient := cluster.New(clusterKubeconfig, configClient)
 
-	// TODO(mfedosin): we have to ignore wait-providers and wait-providers-timeout options until we upgrade
-	// to CAPI v1.6.0 where clusterctl functions have Context support.
-
-	if err := clusterClient.ProviderComponents().Create(components.Objs()); err != nil {
+	if err := clusterClient.ProviderComponents().Create(ctx, components.Objs()); err != nil {
 		return fmt.Errorf("cannot create CAPI operator components: %w", err)
 	}
 

cmd/plugin/cmd/init_test.go

@@ -405,22 +405,22 @@ func TestDeployCAPIOperator(t *testing.T) {
 		wantErr       bool
 	}{
 		{
-			name:          "no version",
-			wantedVersion: "",
+			name:          "with version",
+			wantedVersion: "v0.7.0",
 			wantErr:       false,
 			opts: &initOptions{
 				kubeconfig:        kubeconfigFile.Name(),
 				kubeconfigContext: "@test-cluster",
+				operatorVersion:   "v0.7.0",
 			},
 		},
 		{
-			name:          "old version",
-			wantedVersion: "v0.6.0",
-			wantErr:       false,
+			name:    "without version",
+			wantErr: true,
 			opts: &initOptions{
 				kubeconfig:        kubeconfigFile.Name(),
 				kubeconfigContext: "@test-cluster",
-				operatorVersion:   "v0.6.0",
+				operatorVersion:   "",
 			},
 		},
 		{
@@ -429,19 +429,23 @@ func TestDeployCAPIOperator(t *testing.T) {
 			opts: &initOptions{
 				kubeconfig:        kubeconfigFile.Name(),
 				kubeconfigContext: "@test-cluster",
-				operatorVersion:   "v666.6.6",
+				operatorVersion:   "v1000000",
 			},
 		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			g := NewWithT(t)
 
+			ctx, cancel := context.WithTimeout(context.Background(), waitShort)
+
+			defer cancel()
+
 			resources := []ctrlclient.Object{}
 
 			deployment := generateCAPIOperatorDeployment("capi-operator-controller-manager", "capi-operator-system")
 
-			err := deployCAPIOperator(tt.opts)
+			err := deployCAPIOperator(ctx, tt.opts)
 
 			if tt.wantErr {
 				g.Expect(err).To(HaveOccurred())

cmd/plugin/cmd/utils.go

@@ -19,6 +19,7 @@ package cmd
 import (
 	"context"
 	"fmt"
+	"strings"
 
 	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -30,6 +31,7 @@ import (
 	ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
 
 	operatorv1 "sigs.k8s.io/cluster-api-operator/api/v1alpha2"
+	"sigs.k8s.io/cluster-api-operator/version"
 )
 
 // CreateKubeClient creates a kubernetes client from provided kubeconfig and kubecontext.
@@ -82,3 +84,15 @@ func EnsureNamespaceExists(ctx context.Context, client ctrlclient.Client, namesp
 
 	return nil
 }
+
+// GetLatestPluginVersion returns the latest released plugin version.
+// If git version is v0.7.0-44-b68cd3410df54f-dirty, the function returns v0.7.0
+func GetLatestPluginVersion() string {
+	gitVersion := version.Get().GitVersion
+
+	if gitVersion == "" {
+		return ""
+	}
+
+	return strings.Split(gitVersion, "-")[0]
+}