Bump CAPI to v1.6.0-beta.0

Signed-off-by: Furkat Gofurov <[email protected]>

Author: furkatgofurov7

api/v1alpha2/addonprovider_types.go

@@ -53,3 +53,7 @@ type AddonProviderList struct {
 	metav1.ListMeta `json:"metadata,omitempty"`
 	Items           []AddonProvider `json:"items"`
 }
+
+func init() {
+	objectTypes = append(objectTypes, &AddonProvider{}, &AddonProviderList{})
+}

api/v1alpha2/bootstrapprovider_types.go

@@ -53,3 +53,7 @@ type BootstrapProviderList struct {
 	metav1.ListMeta `json:"metadata,omitempty"`
 	Items           []BootstrapProvider `json:"items"`
 }
+
+func init() {
+	objectTypes = append(objectTypes, &BootstrapProvider{}, &BootstrapProviderList{})
+}

api/v1alpha2/controlplaneprovider_types.go

@@ -53,3 +53,7 @@ type ControlPlaneProviderList struct {
 	metav1.ListMeta `json:"metadata,omitempty"`
 	Items           []ControlPlaneProvider `json:"items"`
 }
+
+func init() {
+	objectTypes = append(objectTypes, &ControlPlaneProvider{}, &ControlPlaneProviderList{})
+}

api/v1alpha2/coreprovider_types.go

@@ -53,3 +53,7 @@ type CoreProviderList struct {
 	metav1.ListMeta `json:"metadata,omitempty"`
 	Items           []CoreProvider `json:"items"`
 }
+
+func init() {
+	objectTypes = append(objectTypes, &CoreProvider{}, &CoreProviderList{})
+}

api/v1alpha2/groupversion_info.go

@@ -34,19 +34,13 @@ var (
 
 	// AddToScheme adds the types in this group-version to the given scheme.
 	AddToScheme = SchemeBuilder.AddToScheme
+
+	objectTypes = []runtime.Object{}
 )
 
 // Adds the list of known types to api.Scheme.
 func addKnownTypes(scheme *runtime.Scheme) error {
-	scheme.AddKnownTypes(GroupVersion,
-		&CoreProvider{}, &CoreProviderList{},
-		&BootstrapProvider{}, &BootstrapProviderList{},
-		&ControlPlaneProvider{}, &ControlPlaneProviderList{},
-		&InfrastructureProvider{}, &InfrastructureProviderList{},
-		&AddonProvider{}, &AddonProviderList{},
-	)
-
+	scheme.AddKnownTypes(GroupVersion, objectTypes...)
 	metav1.AddToGroupVersion(scheme, GroupVersion)
-
 	return nil
 }

api/v1alpha2/infrastructureprovider_types.go

@@ -53,3 +53,7 @@ type InfrastructureProviderList struct {
 	metav1.ListMeta `json:"metadata,omitempty"`
 	Items           []InfrastructureProvider `json:"items"`
 }
+
+func init() {
+	objectTypes = append(objectTypes, &InfrastructureProvider{}, &InfrastructureProviderList{})
+}

cmd/main.go

@@ -19,8 +19,8 @@ package main
 import (
 	"flag"
 	"fmt"
-	"net/http"
 	"os"
+	goruntime "runtime"
 	"time"
 
 	"github.com/spf13/pflag"
@@ -34,6 +34,7 @@ import (
 	"sigs.k8s.io/cluster-api-operator/internal/webhook"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	clusterctlv1 "sigs.k8s.io/cluster-api/cmd/clusterctl/api/v1alpha3"
+	"sigs.k8s.io/cluster-api/util/flags"
 	"sigs.k8s.io/cluster-api/version"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -50,18 +51,20 @@ var (
 	setupLog = ctrl.Log.WithName("setup")
 
 	// flags.
-	metricsBindAddr             string
 	enableLeaderElection        bool
 	leaderElectionLeaseDuration time.Duration
 	leaderElectionRenewDeadline time.Duration
 	leaderElectionRetryPeriod   time.Duration
 	watchFilterValue            string
+	watchNamespace              string
 	profilerAddress             string
+	enableContentionProfiling   bool
 	concurrencyNumber           int
 	syncPeriod                  time.Duration
 	webhookPort                 int
 	webhookCertDir              string
 	healthAddr                  string
+	diagnosticsOptions          = flags.DiagnosticsOptions{}
 )
 
 func init() {
@@ -77,8 +80,6 @@ func init() {
 
 // InitFlags initializes the flags.
 func InitFlags(fs *pflag.FlagSet) {
-	fs.StringVar(&metricsBindAddr, "metrics-bind-addr", ":8080",
-		"The address the metric endpoint binds to.")
 
 	fs.BoolVar(&enableLeaderElection, "leader-elect", false,
 		"Enable leader election for controller manager. Enabling this will ensure there is only one active controller manager.")
@@ -95,9 +96,15 @@ func InitFlags(fs *pflag.FlagSet) {
 	fs.StringVar(&watchFilterValue, "watch-filter", "",
 		fmt.Sprintf("Label value that the controller watches to reconcile cluster-api objects. Label key is always %s. If unspecified, the controller watches for all cluster-api objects.", clusterv1.WatchLabel))
 
+	fs.StringVar(&watchNamespace, "namespace", "",
+		"Namespace that the controller watches to reconcile cluster-api objects. If unspecified, the controller watches for cluster-api objects across all namespaces.")
+
 	fs.StringVar(&profilerAddress, "profiler-address", "",
 		"Bind address to expose the pprof profiler (e.g. localhost:6060)")
 
+	fs.BoolVar(&enableContentionProfiling, "contention-profiling", false,
+		"Enable block profiling")
+
 	fs.IntVar(&concurrencyNumber, "concurrency", 1,
 		"Number of core resources to process simultaneously")
 
@@ -111,45 +118,102 @@ func InitFlags(fs *pflag.FlagSet) {
 
 	fs.StringVar(&healthAddr, "health-addr", ":9440",
 		"The address the health endpoint binds to.")
+
+	flags.AddDiagnosticsOptions(fs, &diagnosticsOptions)
 }
 
+// Add RBAC for the authorized diagnostics endpoint.
+// +kubebuilder:rbac:groups=authentication.k8s.io,resources=tokenreviews,verbs=create
+// +kubebuilder:rbac:groups=authorization.k8s.io,resources=subjectaccessreviews,verbs=create
+
 func main() {
 	InitFlags(pflag.CommandLine)
 	pflag.CommandLine.AddGoFlagSet(flag.CommandLine)
 	pflag.Parse()
 
 	ctrl.SetLogger(klogr.New())
+	restConfig := ctrl.GetConfigOrDie()
 
-	if profilerAddress != "" {
-		klog.Infof("Profiler listening for requests at %s", profilerAddress)
+	diagnosticsOpts := flags.GetDiagnosticsOptions(diagnosticsOptions)
 
-		go func() {
-			server := &http.Server{
-				Addr:              profilerAddress,
-				ReadHeaderTimeout: 3 * time.Second,
-			}
+	// var watchNamespaces map[string]cache.Config
+	// if watchNamespace != "" {
+	// 	watchNamespaces = map[string]cache.Config{
+	// 		watchNamespace: {},
+	// 	}
+	// }
 
-			klog.Info(server.ListenAndServe())
-		}()
+	if enableContentionProfiling {
+		goruntime.SetBlockProfileRate(1)
 	}
 
-	mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
-		Scheme:             scheme,
-		MetricsBindAddress: metricsBindAddr,
-		LeaderElection:     enableLeaderElection,
-		LeaderElectionID:   "controller-leader-election-capi-operator",
-		LeaseDuration:      &leaderElectionLeaseDuration,
-		RenewDeadline:      &leaderElectionRenewDeadline,
-		RetryPeriod:        &leaderElectionRetryPeriod,
-		SyncPeriod:         &syncPeriod,
-		ClientDisableCacheFor: []client.Object{
-			&corev1.ConfigMap{},
-			&corev1.Secret{},
+	// req, _ := labels.NewRequirement(clusterv1.ClusterNameLabel, selection.Exists, nil)
+	// clusterSecretCacheSelector := labels.NewSelector().Add(*req)
+
+	ctrlOptions := ctrl.Options{
+		Scheme:           scheme,
+		LeaderElection:   enableLeaderElection,
+		LeaderElectionID: "controller-leader-election-capi-operator",
+		LeaseDuration:    &leaderElectionLeaseDuration,
+		RenewDeadline:    &leaderElectionRenewDeadline,
+		RetryPeriod:      &leaderElectionRetryPeriod,
+		Client: client.Options{
+			Cache: &client.CacheOptions{
+				DisableFor: []client.Object{
+					&corev1.ConfigMap{},
+					&corev1.Secret{},
+				},
+			},
 		},
-		Port:                   webhookPort,
-		CertDir:                webhookCertDir,
+		// WebhookServer: webhook.NewServer(
+		// 	webhook.Options{
+		// 		Port:    webhookPort,
+		// 		CertDir: webhookCertDir,
+		// 	},
+		// ),
 		HealthProbeBindAddress: healthAddr,
-	})
+		PprofBindAddress:       profilerAddress,
+		Metrics:                diagnosticsOpts,
+		// Cache: cache.Options{
+		// 	DefaultNamespaces: watchNamespaces,
+		// 	SyncPeriod:        &syncPeriod,
+		// 	ByObject: map[client.Object]cache.ByObject{
+		// 		// Note: Only Secrets with the cluster name label are cached.
+		// 		// The default client of the manager won't use the cache for secrets at all (see Client.Cache.DisableFor).
+		// 		// The cached secrets will only be used by the secretCachingClient we create below.
+		// 		&corev1.Secret{}: {
+		// 			Label: clusterSecretCacheSelector,
+		// 		},
+		// 	},
+		// },
+	}
+
+	// mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
+	// 	Scheme:             scheme,
+	// 	MetricsBindAddress: metricsBindAddr,
+	// 	LeaderElection:     enableLeaderElection,
+	// 	LeaderElectionID:   "controller-leader-election-capi-operator",
+	// 	LeaseDuration:      &leaderElectionLeaseDuration,
+	// 	RenewDeadline:      &leaderElectionRenewDeadline,
+	// 	RetryPeriod:        &leaderElectionRetryPeriod,
+	// 	Client: client.Options{
+	// 		Cache: &client.CacheOptions{
+	// 			DisableFor: []client.Object{
+	// 				&corev1.ConfigMap{},
+	// 				&corev1.Secret{},
+	// 			},
+	// 		},
+	// 	},
+	// 	WebhookServer: webhook.NewServer(
+	// 		webhook.Options{
+	// 			Port:    webhookPort,
+	// 			CertDir: webhookCertDir,
+	// 		},
+	// 	),
+	// 	HealthProbeBindAddress: healthAddr,
+	// })
+
+	mgr, err := ctrl.NewManager(restConfig, ctrlOptions)
 	if err != nil {
 		setupLog.Error(err, "unable to start manager")
 		os.Exit(1)

cmd/plugin/cmd/root.go

@@ -17,6 +17,7 @@ limitations under the License.
 package cmd
 
 import (
+	"context"
 	"flag"
 	"fmt"
 	"os"
@@ -78,7 +79,7 @@ func init() {
 func initConfig() {
 	// check if the CLUSTERCTL_LOG_LEVEL was set via env var or in the config file
 	if *verbosity == 0 { //nolint:nestif
-		configClient, err := configclient.New(cfgFile)
+		configClient, err := configclient.New(context.Background(), cfgFile)
 		if err == nil {
 			v, err := configClient.Variables().Get("CLUSTERCTL_LOG_LEVEL")
 			if err == nil && v != "" {