Remove openshift and k8s pins

Author: fahlmant

cmd/aro/operator.go

@@ -75,8 +75,6 @@ func operator(ctx context.Context, log *logrus.Entry) error {
 
 	mgr, err := ctrl.NewManager(restConfig, ctrl.Options{
 		HealthProbeBindAddress: ":8080",
-		MetricsBindAddress:     "0", // disabled
-		Port:                   8443,
 	})
 	if err != nil {
 		return err

go.mod

@@ -332,13 +332,13 @@ func (m *manager) deleteGatewayAndWait(ctx context.Context) error {
 	}
 
 	m.log.Info("waiting for gateway record deletion")
-	return wait.PollImmediateUntil(15*time.Second, func() (bool, error) {
+	return wait.PollUntilContextCancel(timeoutCtx, 15*time.Second, true, func(ctx context.Context) (bool, error) {
 		_, err := m.dbGateway.Get(ctx, m.doc.OpenShiftCluster.Properties.NetworkProfile.GatewayPrivateLinkID)
-		if err != nil && cosmosdb.IsErrorStatusCode(err, http.StatusNotFound) /* already gone */ {
-			return true, nil
+		if err != nil && cosmosdb.IsErrorStatusCode(err, http.StatusNotFound) {
+			return true, err
 		}
 		return false, nil
-	}, timeoutCtx.Done())
+	})
 }
 
 func (m *manager) deleteGateway(ctx context.Context) error {

go.sum

@@ -357,7 +357,7 @@ func (m *manager) _attachNSGs(ctx context.Context, timeout time.Duration, pollIn
 	// NSG since the inner loop is tolerant of that, and since we are attaching
 	// the same NSG the only allowed failure case is when the NSG cannot be
 	// attached to begin with, so it shouldn't happen in practice.
-	_ = wait.PollImmediateUntil(pollInterval, func() (bool, error) {
+	_ = wait.PollUntilContextCancel(timeoutCtx, pollInterval, true, func(ctx context.Context) (bool, error) {
 		var c bool
 		c, innerErr = func() (bool, error) {
 			for _, subnetID := range []string{
@@ -414,9 +414,8 @@ func (m *manager) _attachNSGs(ctx context.Context, timeout time.Duration, pollIn
 			}
 			return true, nil
 		}()
-
 		return c, innerErr
-	}, timeoutCtx.Done())
+	})
 
 	return innerErr
 }

pkg/cluster/delete.go

@@ -15,6 +15,7 @@ import (
 	kruntime "k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/dynamic"
 	"k8s.io/client-go/kubernetes"
+	"k8s.io/client-go/rest"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
 
@@ -632,7 +633,12 @@ func (m *manager) initializeKubernetesClients(ctx context.Context) error {
 		return err
 	}
 
-	mapper, err := apiutil.NewDynamicRESTMapper(restConfig, apiutil.WithLazyDiscovery)
+	httpClient, err := rest.HTTPClientFor(restConfig)
+	if err != nil {
+		return err
+	}
+
+	mapper, err := apiutil.NewDynamicRESTMapper(restConfig, httpClient)
 	if err != nil {
 		return err
 	}

pkg/cluster/deploybaseresources.go

@@ -553,9 +553,9 @@ func (d *deployer) restartOldScaleset(ctx context.Context, vmssName string, lbHe
 }
 
 func (d *deployer) waitForReadiness(ctx context.Context, vmssName string, vmInstanceID string) error {
-	return wait.PollImmediateUntil(10*time.Second, func() (bool, error) {
+	return wait.PollUntilContextCancel(ctx, 10*time.Second, true, func(ctx context.Context) (bool, error) {
 		return d.isVMInstanceHealthy(ctx, d.config.RPResourceGroupName, vmssName, vmInstanceID), nil
-	}, ctx.Done())
+	})
 }
 
 func (d *deployer) isVMInstanceHealthy(ctx context.Context, resourceGroupName string, vmssName string, vmInstanceID string) bool {

pkg/cluster/install.go

@@ -1647,7 +1647,7 @@ func TestWaitForReadiness(t *testing.T) {
 				cancel:        cancelFastTimeout,
 			},
 			mocks:   []mock{getInstanceViewMock(unhealthyVMSS)},
-			wantErr: "timed out waiting for the condition",
+			wantErr: "context deadline exceeded",
 		},
 		{
 			name: "run successfully after confirming healthy status",

pkg/deploy/predeploy.go

@@ -39,15 +39,15 @@ func (d *deployer) gatewayWaitForReadiness(ctx context.Context, vmssName string)
 	}
 
 	d.log.Printf("waiting for %s instances to be healthy", vmssName)
-	return wait.PollImmediateUntil(10*time.Second, func() (bool, error) {
+	return wait.PollUntilContextCancel(ctx, 10*time.Second, true, func(ctx context.Context) (bool, error) {
 		for _, vm := range scalesetVMs {
 			if !d.isVMInstanceHealthy(ctx, d.config.GatewayResourceGroupName, vmssName, *vm.InstanceID) {
 				return false, nil
 			}
 		}
 
 		return true, nil
-	}, ctx.Done())
+	})
 }
 
 func (d *deployer) gatewayRemoveOldScalesets(ctx context.Context) error {

pkg/deploy/predeploy_test.go

@@ -39,15 +39,15 @@ func (d *deployer) rpWaitForReadiness(ctx context.Context, vmssName string) erro
 	}
 
 	d.log.Printf("waiting for %s instances to be healthy", vmssName)
-	return wait.PollImmediateUntil(10*time.Second, func() (bool, error) {
+	return wait.PollUntilContextCancel(ctx, 10*time.Second, true, func(ctx context.Context) (bool, error) {
 		for _, vm := range scalesetVMs {
 			if !d.isVMInstanceHealthy(ctx, d.config.RPResourceGroupName, vmssName, *vm.InstanceID) {
 				return false, nil
 			}
 		}
 
 		return true, nil
-	}, ctx.Done())
+	})
 }
 
 func (d *deployer) rpRemoveOldScalesets(ctx context.Context) error {

pkg/deploy/upgrade_gateway.go

@@ -19,6 +19,7 @@ import (
 	"k8s.io/apimachinery/pkg/watch"
 	"k8s.io/client-go/dynamic"
 	"k8s.io/client-go/kubernetes"
+	"k8s.io/client-go/rest"
 	"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
 
 	"github.com/Azure/ARO-RP/pkg/api"
@@ -59,7 +60,12 @@ func NewKubeActions(log *logrus.Entry, env env.Interface, oc *api.OpenShiftClust
 		return nil, err
 	}
 
-	mapper, err := apiutil.NewDynamicRESTMapper(restConfig, apiutil.WithLazyDiscovery)
+	httpClient, err := rest.HTTPClientFor(restConfig)
+	if err != nil {
+		return nil, err
+	}
+
+	mapper, err := apiutil.NewDynamicRESTMapper(restConfig, httpClient)
 	if err != nil {
 		return nil, err
 	}

pkg/deploy/upgrade_rp.go

@@ -661,7 +661,7 @@ func TestListSyncSet(t *testing.T) {
 				t.Fatal(err)
 			}
 
-			if result != nil && reflect.DeepEqual(result, syncsetTest) {
+			if result != nil && !reflect.DeepEqual(result, syncsetTest) {
 				t.Fatal("Unexpected syncset list returned", result)
 			}
 		})
@@ -702,7 +702,7 @@ func TestGetSyncSet(t *testing.T) {
 				t.Fatal(err)
 			}
 
-			if result != nil && reflect.DeepEqual(result, syncsetTest) {
+			if result != nil && !reflect.DeepEqual(result, syncsetTest) {
 				t.Fatal("Unexpected syncset is returned", result)
 			}
 		})

pkg/frontend/adminactions/kubeactions.go

@@ -10,6 +10,7 @@ import (
 	"github.com/Azure/go-autorest/autorest"
 	"github.com/sirupsen/logrus"
 
+	"k8s.io/client-go/rest"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
 
@@ -89,7 +90,12 @@ func (t *th) ClientHelper() (clienthelper.Interface, error) {
 		return nil, err
 	}
 
-	mapper, err := apiutil.NewDynamicRESTMapper(restConfig, apiutil.WithLazyDiscovery)
+	httpClient, err := rest.HTTPClientFor(restConfig)
+	if err != nil {
+		return nil, err
+	}
+
+	mapper, err := apiutil.NewDynamicRESTMapper(restConfig, httpClient)
 	if err != nil {
 		return nil, err
 	}

pkg/hive/manager_test.go

@@ -115,8 +115,13 @@ func NewMonitor(log *logrus.Entry, restConfig *rest.Config, oc *api.OpenShiftClu
 		return nil, err
 	}
 
+	httpClient, err := rest.HTTPClientFor(restConfig)
+	if err != nil {
+		return nil, err
+	}
+
 	// lazy discovery will not attempt to reach out to the apiserver immediately
-	mapper, err := apiutil.NewDynamicRESTMapper(restConfig, apiutil.WithLazyDiscovery)
+	mapper, err := apiutil.NewDynamicRESTMapper(restConfig, httpClient)
 	if err != nil {
 		return nil, err
 	}
@@ -163,8 +168,13 @@ func getHiveClientSet(hiveRestConfig *rest.Config) (client.Client, error) {
 		return nil, nil
 	}
 
+	httpClient, err := rest.HTTPClientFor(hiveRestConfig)
+	if err != nil {
+		return nil, err
+	}
+
 	// lazy discovery will not attempt to reach out to the apiserver immediately
-	mapper, err := apiutil.NewDynamicRESTMapper(hiveRestConfig, apiutil.WithLazyDiscovery)
+	mapper, err := apiutil.NewDynamicRESTMapper(hiveRestConfig, httpClient)
 	if err != nil {
 		return nil, err
 	}

pkg/mimo/actuator/task.go

@@ -15,7 +15,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/handler"
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
-	"sigs.k8s.io/controller-runtime/pkg/source"
 
 	consolev1 "github.com/openshift/api/console/v1"
 
@@ -69,7 +68,7 @@ func (r *Reconciler) SetupWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewControllerManagedBy(mgr).
 		For(&arov1alpha1.Cluster{}, builder.WithPredicates(predicate.And(predicates.AROCluster, predicate.GenerationChangedPredicate{}))).
 		// watching ConsoleNotifications in case a user edits it
-		Watches(&source.Kind{Type: &consolev1.ConsoleNotification{}}, &handler.EnqueueRequestForObject{}, builder.WithPredicates(aroBannerPredicate)).
+		Watches(&consolev1.ConsoleNotification{}, &handler.EnqueueRequestForObject{}, builder.WithPredicates(aroBannerPredicate)).
 		Named(ControllerName).
 		Complete(r)
 }

pkg/monitor/cluster/cluster.go

@@ -119,18 +119,17 @@ func TestConditions(t *testing.T) {
 		},
 	} {
 		t.Run(tt.name, func(t *testing.T) {
-			client := ctrlfake.NewClientBuilder().
-				WithObjects(
-					&arov1alpha1.Cluster{
-						ObjectMeta: metav1.ObjectMeta{
-							Name: arov1alpha1.SingletonClusterName,
-						},
-						Status: arov1alpha1.ClusterStatus{
-							Conditions:      tt.start,
-							OperatorVersion: "unknown",
-						},
-					},
-				).Build()
+
+			cluster := &arov1alpha1.Cluster{
+				ObjectMeta: metav1.ObjectMeta{
+					Name: arov1alpha1.SingletonClusterName,
+				},
+				Status: arov1alpha1.ClusterStatus{
+					Conditions:      tt.start,
+					OperatorVersion: "unknown",
+				},
+			}
+			client := ctrlfake.NewClientBuilder().WithObjects(cluster).WithStatusSubresource(cluster).Build()
 
 			controller := AROController{
 				Log:    logrus.NewEntry(logrus.StandardLogger()),

pkg/operator/controllers/banner/banner_controller.go

@@ -16,7 +16,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/handler"
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
-	"sigs.k8s.io/controller-runtime/pkg/source"
 
 	operatorv1 "github.com/openshift/api/operator/v1"
 
@@ -127,7 +126,7 @@ func (r *Reconciler) SetupWithManager(mgr ctrl.Manager) error {
 	builder := ctrl.NewControllerManagedBy(mgr).
 		For(&arov1alpha1.Cluster{}, builder.WithPredicates(predicate.And(predicates.AROCluster, predicate.GenerationChangedPredicate{}))).
 		Watches(
-			&source.Kind{Type: &operatorv1.DNS{}},
+			&operatorv1.DNS{},
 			&handler.EnqueueRequestForObject{},
 			builder.WithPredicates(defaultClusterDNSPredicate),
 		)

pkg/operator/controllers/base/aro_controller_test.go

@@ -103,7 +103,7 @@ func TestReconcile(t *testing.T) {
 				instance.Spec.OperatorFlags[operator.CheckerEnabled] = operator.FlagFalse
 			}
 
-			clientFake := fake.NewClientBuilder().WithObjects(instance).Build()
+			clientFake := fake.NewClientBuilder().WithObjects(instance).WithStatusSubresource(instance).Build()
 
 			r := &Reconciler{
 				log:  utillog.GetLogger(),

pkg/operator/controllers/checkers/clusterdnschecker/controller.go

@@ -17,7 +17,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/handler"
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
-	"sigs.k8s.io/controller-runtime/pkg/source"
 
 	configv1 "github.com/openshift/api/config/v1"
 	operatorv1 "github.com/openshift/api/operator/v1"
@@ -128,12 +127,12 @@ func (r *Reconciler) SetupWithManager(mgr ctrl.Manager) error {
 	builder := ctrl.NewControllerManagedBy(mgr).
 		For(&arov1alpha1.Cluster{}, builder.WithPredicates(predicate.And(predicates.AROCluster, predicate.GenerationChangedPredicate{}))).
 		Watches(
-			&source.Kind{Type: &operatorv1.IngressController{}},
+			&operatorv1.IngressController{},
 			&handler.EnqueueRequestForObject{},
 			builder.WithPredicates(defaultIngressControllerPredicate),
 		).
 		Watches(
-			&source.Kind{Type: &configv1.ClusterVersion{}},
+			&configv1.ClusterVersion{},
 			&handler.EnqueueRequestForObject{},
 			builder.WithPredicates(predicates.ClusterVersion),
 		)

pkg/operator/controllers/checkers/clusterdnschecker/controller_test.go

@@ -84,7 +84,7 @@ func TestReconcile(t *testing.T) {
 				instance.Spec.OperatorFlags[operator.CheckerEnabled] = operator.FlagFalse
 			}
 
-			clientFake := fake.NewClientBuilder().WithObjects(instance).Build()
+			clientFake := fake.NewClientBuilder().WithObjects(instance).WithStatusSubresource(instance).Build()
 
 			r := &Reconciler{
 				log:     utillog.GetLogger(),

pkg/operator/controllers/checkers/ingresscertificatechecker/controller.go

@@ -90,7 +90,7 @@ func TestReconcile(t *testing.T) {
 						instance.Spec.OperatorFlags[operator.CheckerEnabled] = operator.FlagFalse
 					}
 
-					clientFake := fake.NewClientBuilder().WithObjects(instance).Build()
+					clientFake := fake.NewClientBuilder().WithObjects(instance).WithStatusSubresource(instance).Build()
 
 					r := &Reconciler{
 						log:  utillog.GetLogger(),

pkg/operator/controllers/checkers/ingresscertificatechecker/controller_test.go

@@ -17,7 +17,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/handler"
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
-	"sigs.k8s.io/controller-runtime/pkg/source"
 
 	operatorv1 "github.com/openshift/api/operator/v1"
 
@@ -124,7 +123,7 @@ func (r *Reconciler) SetupWithManager(mgr ctrl.Manager) error {
 	builder := ctrl.NewControllerManagedBy(mgr).
 		For(&arov1alpha1.Cluster{}, builder.WithPredicates(predicate.And(predicates.AROCluster, predicate.GenerationChangedPredicate{}))).
 		Watches(
-			&source.Kind{Type: &corev1.Secret{}},
+			&corev1.Secret{},
 			&handler.EnqueueRequestForObject{},
 			builder.WithPredicates(clusterSPPredicate),
 		)

pkg/operator/controllers/checkers/internetchecker/controller_test.go

@@ -84,7 +84,7 @@ func TestReconcile(t *testing.T) {
 				instance.Spec.OperatorFlags[operator.CheckerEnabled] = operator.FlagFalse
 			}
 
-			clientFake := fake.NewClientBuilder().WithObjects(instance).Build()
+			clientFake := fake.NewClientBuilder().WithObjects(instance).WithStatusSubresource(instance).Build()
 
 			r := &Reconciler{
 				log:  utillog.GetLogger(),

pkg/operator/controllers/checkers/serviceprincipalchecker/controller.go

@@ -19,7 +19,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/handler"
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
-	"sigs.k8s.io/controller-runtime/pkg/source"
 
 	"github.com/Azure/ARO-RP/pkg/operator"
 	arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1"
@@ -173,7 +172,7 @@ func (r *CloudProviderConfigReconciler) SetupWithManager(mgr ctrl.Manager) error
 	return ctrl.NewControllerManagedBy(mgr).
 		For(&arov1alpha1.Cluster{}, builder.WithPredicates(predicate.And(predicates.AROCluster, predicate.GenerationChangedPredicate{}))).
 		Watches(
-			&source.Kind{Type: &corev1.ConfigMap{}},
+			&corev1.ConfigMap{},
 			&handler.EnqueueRequestForObject{},
 			builder.WithPredicates(cloudProviderConfigPredicate),
 		).