Merge pull request #180 from elmiko/mao-update-a132ec00

Bug 1954177: Update mao dependency for webhook v1 changes

cmd/manager/main.go

@@ -35,7 +35,7 @@ import (
 	rTcontroller "sigs.k8s.io/controller-runtime/pkg/controller"
 	"sigs.k8s.io/controller-runtime/pkg/healthz"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
-	"sigs.k8s.io/controller-runtime/pkg/runtime/signals"
+	"sigs.k8s.io/controller-runtime/pkg/manager/signals"
 )
 
 // The default durations for the leader election operations.

go.mod

@@ -5,32 +5,31 @@ go 1.15
 require (
 	github.com/ajeddeloh/go-json v0.0.0-20170920214419-6a2fe990e083 // indirect
 	github.com/ajeddeloh/yaml v0.0.0-20170912190910-6b94386aeefd // indirect
-	github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d // indirect
 	github.com/coreos/container-linux-config-transpiler v0.9.0
 	github.com/coreos/go-systemd v0.0.0-20190620071333-e64a0ec8b42a // indirect
 	github.com/coreos/ignition v0.33.0 // indirect
-	github.com/go-logr/logr v0.2.1
+	github.com/go-logr/logr v0.4.0
 	github.com/gophercloud/gophercloud v0.14.0
 	github.com/gophercloud/utils v0.0.0-20201221031838-d93cf4b3fa50
-	github.com/onsi/ginkgo v1.14.1
-	github.com/onsi/gomega v1.10.2
-	github.com/openshift/api v0.0.0-20201019163320-c6a5ec25f267
-	github.com/openshift/client-go v0.0.0-20201020074620-f8fd44879f7c
-	github.com/openshift/machine-api-operator v0.2.1-0.20201203125141-79567cb3368e
+	github.com/onsi/ginkgo v1.15.0
+	github.com/onsi/gomega v1.10.5
+	github.com/openshift/api v0.0.0-20210416115537-a60c0dc032fd
+	github.com/openshift/client-go v0.0.0-20210409155308-a8e62c60e930
+	github.com/openshift/machine-api-operator v0.2.1-0.20210505133115-b7ef098180db
 	github.com/vincent-petithory/dataurl v0.0.0-20160330182126-9a301d65acbb // indirect
 	go4.org v0.0.0-20191010144846-132d2879e1e9 // indirect
-	gopkg.in/yaml.v2 v2.3.0
-	k8s.io/api v0.19.2
-	k8s.io/apimachinery v0.19.2
-	k8s.io/client-go v0.19.2
+	gopkg.in/yaml.v2 v2.4.0
+	k8s.io/api v0.21.0
+	k8s.io/apimachinery v0.21.0
+	k8s.io/client-go v0.21.0
 	k8s.io/cluster-bootstrap v0.0.0-20190202014938-c9acc0c1bea2
 	k8s.io/klog v1.0.0
-	k8s.io/klog/v2 v2.3.0
-	sigs.k8s.io/controller-runtime v0.6.2
+	k8s.io/klog/v2 v2.8.0
+	sigs.k8s.io/controller-runtime v0.9.0-beta.0.0.20210503121002-0c99fc7f46fb
 	sigs.k8s.io/yaml v1.2.0
 )
 
 replace (
-	sigs.k8s.io/cluster-api-provider-aws => github.com/openshift/cluster-api-provider-aws v0.2.1-0.20201125052318-b85a18cbf338
-	sigs.k8s.io/cluster-api-provider-azure => github.com/openshift/cluster-api-provider-azure v0.1.0-alpha.3.0.20201130182513-88b90230f2a4
+	sigs.k8s.io/cluster-api-provider-aws => github.com/openshift/cluster-api-provider-aws v0.2.1-0.20210505150511-f9cb840ae412
+	sigs.k8s.io/cluster-api-provider-azure => github.com/openshift/cluster-api-provider-azure v0.1.0-alpha.3.0.20210505133115-b2eda16dd665
 )

pkg/cloud/openstack/machineset/controller.go

@@ -3,6 +3,9 @@ package machineset
 import (
 	"context"
 	"fmt"
+	"strconv"
+	"time"
+
 	"github.com/go-logr/logr"
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/flavors"
 	machinev1 "github.com/openshift/machine-api-operator/pkg/apis/machine/v1beta1"
@@ -16,8 +19,6 @@ import (
 	ctrlRuntime "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
-	"strconv"
-	"time"
 )
 
 const (
@@ -44,12 +45,11 @@ type Reconciler struct {
 }
 
 // Reconcile implements controller runtime Reconciler interface.
-func (r *Reconciler) Reconcile(req ctrlRuntime.Request) (ctrlRuntime.Result, error) {
+func (r *Reconciler) Reconcile(ctx context.Context, req ctrlRuntime.Request) (ctrlRuntime.Result, error) {
 
 	logger := r.Log.WithValues("machineset", req.Name, "namespace", req.Namespace)
 	logger.V(3).Info("Reconciling")
 
-	ctx := context.Background()
 	machineSet := &machinev1.MachineSet{}
 	if err := r.Client.Get(ctx, req.NamespacedName, machineSet); err != nil {
 		if apierrors.IsNotFound(err) {

pkg/cloud/openstack/machineset/controller_suite_test.go

@@ -52,12 +52,10 @@ var _ = AfterSuite(func() {
 })
 
 // StartTestManager adds recFn
-func StartTestManager(mgr manager.Manager) chan struct{} {
-	stop := make(chan struct{})
+func StartTestManager(mgr manager.Manager) {
 	go func() {
 		defer GinkgoRecover()
 
-		Expect(mgr.Start(stop)).To(Succeed())
+		Expect(mgr.Start(context.Background())).To(Succeed())
 	}()
-	return stop
 }

pkg/cloud/openstack/machineset/controller_test.go

@@ -3,6 +3,11 @@ package machineset
 import (
 	"encoding/json"
 	"fmt"
+	"math/rand"
+	"strconv"
+	"testing"
+	"time"
+
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/flavors"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/ginkgo/extensions/table"
@@ -13,14 +18,10 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/tools/record"
-	"math/rand"
 	machineproviderv1 "sigs.k8s.io/cluster-api-provider-openstack/pkg/apis/openstackproviderconfig/v1alpha1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
-	"strconv"
-	"testing"
-	"time"
 )
 
 var emptyFlavorName = ""
@@ -70,7 +71,6 @@ func RandomString(prefix string, n int) string {
 
 var _ = Describe("Reconciler", func() {
 	var c client.Client
-	var stopMgr chan struct{}
 	var fakeRecorder *record.FakeRecorder
 	var namespace *corev1.Namespace
 	var suiteFlavorCache = newMachineFlavorCache()
@@ -94,15 +94,14 @@ var _ = Describe("Reconciler", func() {
 		r.eventRecorder = fakeRecorder
 		r.flavorCache = suiteFlavorCache
 		c = mgr.GetClient()
-		stopMgr = StartTestManager(mgr)
+		StartTestManager(mgr)
 
 		Expect(c.Create(ctx, namespace)).To(Succeed())
 	})
 
 	AfterEach(func() {
 		Expect(deleteMachineSets(c, namespace.Name)).To(Succeed())
 		Expect(deleteNameSpace(c, namespace)).To(Succeed())
-		close(stopMgr)
 	})
 
 	type reconcileTestCase = struct {