CARRY: openshift: CAPO v0.11.0 (v1beta1) adjustments

Co-Authored-By: Martin André <[email protected]>

Author: EmilienM

openshift/cmd/manager.go

@@ -42,8 +42,9 @@ import (
 )
 
 var (
-	scheme   = caposcheme.DefaultScheme()
-	setupLog = ctrl.Log.WithName("setup")
+	scheme            = caposcheme.DefaultScheme()
+	setupLog          = ctrl.Log.WithName("setup")
+	scopeCacheMaxSize int
 )
 
 func main() {
@@ -63,6 +64,8 @@ func main() {
 
 	ctrl.SetLogger(zap.New(zap.UseFlagOptions(&opts)))
 
+	scopeFactory := scope.NewFactory(scopeCacheMaxSize)
+
 	mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
 		Scheme:                  scheme,
 		Metrics:                 metricsserver.Options{BindAddress: metricsAddr},
@@ -130,7 +133,7 @@ func main() {
 	if err := (&infraclustercontroller.OpenShiftClusterReconciler{
 		Client:       mgr.GetClient(),
 		Recorder:     mgr.GetEventRecorderFor("openshiftcluster-controller"),
-		ScopeFactory: scope.NewFactory(1),
+		ScopeFactory: scopeFactory,
 	}).SetupWithManager(mgr, controller.Options{}); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "OpenStackCluster")
 		os.Exit(1)

openshift/e2e/e2e_test.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"testing"
 
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
+	. "github.com/onsi/ginkgo/v2" //nolint:revive
+	. "github.com/onsi/gomega"    //nolint:revive
 	configv1 "github.com/openshift/api/config/v1"
 	mapiv1 "github.com/openshift/api/machine/v1beta1"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"

openshift/e2e/openstack_test.go

@@ -1,8 +1,8 @@
 package e2e
 
 import (
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
+	. "github.com/onsi/ginkgo/v2" //nolint:revive
+	. "github.com/onsi/gomega"    //nolint:revive
 	"github.com/onsi/gomega/format"
 	configv1 "github.com/openshift/api/config/v1"
 	mapiv1alpha1 "github.com/openshift/api/machine/v1alpha1"
@@ -123,7 +123,7 @@ func createOpenStackMachineTemplate(cl client.Client, mapiProviderSpec *mapiv1al
 	// We intentionally omit ports so the machine will default its network
 	// from the OpenStackCluster created by the infracluster controller.
 	openStackMachineSpec := infrav1.OpenStackMachineSpec{
-		Flavor: mapiProviderSpec.Flavor,
+		Flavor: ptr.To(mapiProviderSpec.Flavor),
 		IdentityRef: &infrav1.OpenStackIdentityReference{
 			CloudName: infraclustercontroller.CloudName,
 			Name:      infraclustercontroller.CredentialsSecretName,

openshift/kustomize/infrastructure-components/kustomization.yaml

@@ -81,10 +81,9 @@ replacements:
       version: v1
       kind: CustomResourceDefinition
     reject:
-    # openstackfloatingippools.infrastructure.cluster.x-k8s.io doesn't have any
-    # of these versions
+    # The following types don't have any of these versions
     - name: openstackfloatingippools.infrastructure.cluster.x-k8s.io
+    - name: openstackservers.infrastructure.cluster.x-k8s.io
     fieldPaths:
-    - spec.versions.[name=v1alpha5].served
     - spec.versions.[name=v1alpha6].served
     - spec.versions.[name=v1alpha7].served