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

@@ -330,13 +330,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

@@ -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.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

@@ -299,7 +299,6 @@ func TestAdminEtcdCertificateRenew(t *testing.T) {
 								},
 							},
 						},
-						LatestAvailableRevision: 1,
 						NodeStatuses: []operatorv1.NodeStatus{
 							{
 								NodeName:        "master-0",
@@ -320,7 +319,6 @@ func TestAdminEtcdCertificateRenew(t *testing.T) {
 								},
 							},
 						},
-						LatestAvailableRevision: 2,
 						NodeStatuses: []operatorv1.NodeStatus{
 							{
 								NodeName:        "master-0",
@@ -450,7 +448,6 @@ func TestAdminEtcdCertificateRenew(t *testing.T) {
 								},
 							},
 						},
-						LatestAvailableRevision: 1,
 						NodeStatuses: []operatorv1.NodeStatus{
 							{
 								NodeName:        "master-0",
@@ -471,7 +468,6 @@ func TestAdminEtcdCertificateRenew(t *testing.T) {
 								},
 							},
 						},
-						LatestAvailableRevision: 2,
 						NodeStatuses: []operatorv1.NodeStatus{
 							{
 								NodeName:        "master-0",
@@ -646,7 +642,6 @@ func TestAdminEtcdCertificateRecovery(t *testing.T) {
 								},
 							},
 						},
-						LatestAvailableRevision: 1,
 						NodeStatuses: []operatorv1.NodeStatus{
 							{
 								NodeName:        "master-0",
@@ -667,7 +662,6 @@ func TestAdminEtcdCertificateRecovery(t *testing.T) {
 								},
 							},
 						},
-						LatestAvailableRevision: 2,
 						NodeStatuses: []operatorv1.NodeStatus{
 							{
 								NodeName:        "master-0",
@@ -688,7 +682,6 @@ func TestAdminEtcdCertificateRecovery(t *testing.T) {
 								},
 							},
 						},
-						LatestAvailableRevision: 3,
 						NodeStatuses: []operatorv1.NodeStatus{
 							{
 								NodeName:        "master-0",