Merge pull request #381 from JoelSpeed/mao-update-8e6ae0ac

Bug 1909108: Bump K8s dependencies to 1.20

cmd/termination-handler/main.go

@@ -66,7 +66,7 @@ func main() {
 	}
 
 	// Start the termination handler
-	if err := handler.Run(ctrl.SetupSignalHandler()); err != nil {
+	if err := handler.Run(ctrl.SetupSignalHandler().Done()); err != nil {
 		logger.Error(err, "Error starting termination handler")
 		return
 	}

go.mod

@@ -5,25 +5,25 @@ go 1.15
 require (
 	github.com/aws/aws-sdk-go v1.35.20
 	github.com/blang/semver v3.5.1+incompatible
-	github.com/go-logr/logr v0.2.1
+	github.com/go-logr/logr v0.3.0
 	github.com/golang/mock v1.4.4
-	github.com/onsi/ginkgo v1.12.1
-	github.com/onsi/gomega v1.10.1
-	github.com/openshift/api v0.0.0-20201019163320-c6a5ec25f267
-	github.com/openshift/machine-api-operator v0.2.1-0.20201203125141-79567cb3368e
+	github.com/onsi/ginkgo v1.14.1
+	github.com/onsi/gomega v1.10.2
+	github.com/openshift/api v0.0.0-20201216151826-78a19e96f9eb
+	github.com/openshift/machine-api-operator v0.2.1-0.20210104142355-8e6ae0acdfcf
 
 	// kube 1.18
-	k8s.io/api v0.19.2
-	k8s.io/apimachinery v0.19.2
-	k8s.io/client-go v0.19.2
-	k8s.io/klog/v2 v2.3.0
-	k8s.io/utils v0.0.0-20200729134348-d5654de09c73
-	sigs.k8s.io/controller-runtime v0.6.2
+	k8s.io/api v0.20.0
+	k8s.io/apimachinery v0.20.0
+	k8s.io/client-go v0.20.0
+	k8s.io/klog/v2 v2.4.0
+	k8s.io/utils v0.0.0-20201110183641-67b214c5f920
+	sigs.k8s.io/controller-runtime v0.7.0
 	sigs.k8s.io/controller-tools v0.3.0
 	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.20200618031251-e16dd65fdd85
-	sigs.k8s.io/cluster-api-provider-azure => github.com/openshift/cluster-api-provider-azure v0.1.0-alpha.3.0.20200618001858-af08a66b92de
+	sigs.k8s.io/cluster-api-provider-aws => github.com/openshift/cluster-api-provider-aws v0.2.1-0.20201216171336-0b00fb8d96ac
+	sigs.k8s.io/cluster-api-provider-azure => github.com/openshift/cluster-api-provider-azure v0.1.0-alpha.3.0.20201209184807-075372e2ed03
 )

pkg/actuators/machine/suite_test.go

@@ -1,6 +1,7 @@
 package machine
 
 import (
+	"context"
 	"log"
 	"os"
 	"path/filepath"
@@ -47,13 +48,13 @@ func TestMain(m *testing.M) {
 		log.Fatal(err)
 	}
 
-	doneMgr := make(chan struct{})
+	mgrCtx, cancel := context.WithCancel(context.Background())
 	go func() {
-		if err := mgr.Start(doneMgr); err != nil {
+		if err := mgr.Start(mgrCtx); err != nil {
 			log.Fatal(err)
 		}
 	}()
-	defer close(doneMgr)
+	defer cancel()
 
 	k8sClient = mgr.GetClient()
 	eventRecorder = mgr.GetEventRecorderFor("awscontroller")

pkg/actuators/machineset/controller.go

@@ -53,11 +53,10 @@ func (r *Reconciler) SetupWithManager(mgr ctrl.Manager, options controller.Optio
 }
 
 // Reconcile implements controller runtime Reconciler interface.
-func (r *Reconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
+func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.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/actuators/machineset/controller_suite_test.go

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

pkg/actuators/machineset/controller_test.go

@@ -14,6 +14,7 @@ limitations under the License.
 package machineset
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"testing"
@@ -36,7 +37,7 @@ import (
 
 var _ = Describe("MachineSetReconciler", func() {
 	var c client.Client
-	var stopMgr chan struct{}
+	var stopMgr context.CancelFunc
 	var fakeRecorder *record.FakeRecorder
 	var namespace *corev1.Namespace
 
@@ -62,7 +63,7 @@ var _ = Describe("MachineSetReconciler", func() {
 
 	AfterEach(func() {
 		Expect(deleteMachineSets(c, namespace.Name)).To(Succeed())
-		close(stopMgr)
+		stopMgr()
 	})
 
 	type reconcileTestCase = struct {