Merge pull request #194 from prashanth26/update-k8s-to-1.12

Update k8s to 1.12

Gopkg.toml

@@ -26,23 +26,23 @@ required = [
 
 [[constraint]]
   name = "k8s.io/api"
-  version = "kubernetes-1.10.8"
+  version = "kubernetes-1.12.1"
 
 [[constraint]]
   name = "k8s.io/apimachinery"
-  version = "kubernetes-1.10.4"
+  version = "kubernetes-1.12.1"
 
 [[constraint]]
   name = "k8s.io/apiserver"
-  version = "kubernetes-1.10.8"
+  version = "kubernetes-1.12.1"
 
 [[constraint]]
-  branch = "release-7.0"
   name = "k8s.io/client-go"
+  version = "kubernetes-1.12.1"
 
 [[constraint]]
   name = "k8s.io/code-generator"
-  version = "kubernetes-1.10.8"
+  version = "kubernetes-1.12.1"
 
 # [[override]]
 #   name = "k8s.io/gengo"

cmd/machine-controller-manager/app/controllermanager.go

@@ -22,6 +22,7 @@ Modifications Copyright (c) 2017 SAP SE or an SAP affiliate company. All rights
 package app
 
 import (
+	"context"
 	"fmt"
 	"net"
 	"net/http"
@@ -121,7 +122,8 @@ func Run(s *options.MCMServer) error {
 
 	recorder := createRecorder(kubeClientControl)
 
-	run := func(stop <-chan struct{}) {
+	run := func(ctx context.Context) {
+		var stop <-chan struct{}
 		// Control plane client used to interact with machine APIs
 		controlMachineClientBuilder := machinecontroller.SimpleClientBuilder{
 			ClientConfig: controlkubeconfig,
@@ -173,7 +175,8 @@ func Run(s *options.MCMServer) error {
 		glog.Fatalf("error creating lock: %v", err)
 	}
 
-	leaderelection.RunOrDie(leaderelection.LeaderElectionConfig{
+	ctx := context.TODO()
+	leaderelection.RunOrDie(ctx, leaderelection.LeaderElectionConfig{
 		Lock:          rl,
 		LeaseDuration: s.LeaderElection.LeaseDuration.Duration,
 		RenewDeadline: s.LeaderElection.RenewDeadline.Duration,