Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update k8s to 1.12 #194

Merged
merged 5 commits into from
Dec 4, 2018
Merged

Update k8s to 1.12 #194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8c86bbb
Updated dep to new K8s 1.12 version
prashanth26 Nov 22, 2018
7d1a11c
Updated vendors to use K8s 1.12
prashanth26 Nov 22, 2018
1ff3c6b
Autogeneration files updated
prashanth26 Nov 22, 2018
db09844
Adapted MCM to K8s version 1.12.1
prashanth26 Nov 22, 2018
93e2349
Fixed minor lint issues
prashanth26 Dec 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
115 changes: 91 additions & 24 deletions Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
7 changes: 5 additions & 2 deletions cmd/machine-controller-manager/app/controllermanager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
Loading