Skip to content

Commit 184b4f6

Browse files
alvaroalemankubermatic-bot
authored andcommitted
Update client-go and cluster api (#464)
* Update client-go to 1.13 * Update clientset * Fix annotation * vendor: update gengo * vendor: update gengo * regenerate clientset
1 parent cc24b29 commit 184b4f6

File tree

741 files changed

+39417
-15638
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

741 files changed

+39417
-15638
lines changed

Gopkg.lock

Lines changed: 70 additions & 25 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Gopkg.toml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ required = [
1414
non-go = false
1515
unused-packages = false
1616

17+
[[override]]
18+
name = "github.com/prometheus/client_golang"
19+
version = "^0.9.0"
20+
1721
[[constraint]]
1822
name = "kubevirt.io/kubevirt"
1923
branch = "release-0.10"
@@ -42,27 +46,27 @@ required = [
4246

4347
[[override]]
4448
name = "k8s.io/apimachinery"
45-
branch = "release-1.11"
49+
branch = "release-1.13"
4650

4751
[[override]]
4852
name = "k8s.io/api"
49-
branch = "release-1.11"
53+
branch = "release-1.13"
5054

5155
[[override]]
5256
name = "k8s.io/client-go"
53-
branch = "release-8.0"
57+
version = "kubernetes-1.13.1"
5458

5559
[[override]]
5660
name = "k8s.io/apiserver"
57-
branch = "release-1.11"
61+
branch = "release-1.13"
5862

5963
[[override]]
6064
name = "k8s.io/code-generator"
61-
branch = "release-1.11"
65+
branch = "release-1.13"
6266

6367
[[override]]
6468
name = "k8s.io/gengo"
65-
revision = "01a732e01d00cb9a81bb0ca050d3e6d2b947927b"
69+
revision = "0689ccc1d7d65d9dd1bedcc3b0b1ed7df91ba266"
6670

6771
[[constraint]]
6872
name = "github.com/digitalocean/godo"
@@ -74,7 +78,7 @@ required = [
7478

7579
[[constraint]]
7680
name = "k8s.io/apiextensions-apiserver"
77-
branch = "release-1.11"
81+
branch = "release-1.13"
7882

7983
[[constraint]]
8084
name = "github.com/aws/aws-sdk-go"
@@ -110,7 +114,7 @@ required = [
110114

111115
[[constraint]]
112116
name = "sigs.k8s.io/cluster-api"
113-
revision = "45f1c93260140936c610e56575d7505ba3d52444"
117+
revision = "813b1fec840d79b37fe86778237b6db6d1cb959d"
114118

115119
[[constraint]]
116120
name = "gopkg.in/gcfg.v1"

cmd/controller/main.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ func startControllerViaLeaderElection(runOptions controllerRunOptions) error {
360360
// to stop the leader election library might cause synchronization issues.
361361
// imagine that a user wants to shutdown the app but since there is no way of telling the library to stop it will eventually run `runController` method
362362
// and bad things can happen - the fact it works at the moment doesn't mean it will in the future
363-
runController := func(stopChannel <-chan struct{}) {
363+
runController := func(_ context.Context) {
364364

365365
//Migrate MachinesV1Alpha1Machine to ClusterV1Alpha1Machine
366366
clusterv1Alpha1Client := clusterv1alpha1clientset.NewForConfigOrDie(runOptions.cfg)
@@ -405,7 +405,7 @@ func startControllerViaLeaderElection(runOptions controllerRunOptions) error {
405405
return
406406
}
407407
go func() {
408-
if err := mgr.Start(stopChannel); err != nil {
408+
if err := mgr.Start(runOptions.parentCtx.Done()); err != nil {
409409
glog.Errorf("failed to start kubebuilder manager: %v", err)
410410
runOptions.parentCtxDone()
411411
return
@@ -457,7 +457,7 @@ func startControllerViaLeaderElection(runOptions controllerRunOptions) error {
457457
if err != nil {
458458
return err
459459
}
460-
go le.Run()
460+
go le.Run(runOptions.parentCtx)
461461

462462
<-runOptions.parentCtx.Done()
463463
return nil

pkg/apis/cluster/v1alpha1/conversions/conversions.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
const (
1616
TypeRevisionAnnotationName = "machine-controller/machine-type-revision"
1717

18-
TypeRevisionCurrentVersion = "45f1c93260140936c610e56575d7505ba3d52444"
18+
TypeRevisionCurrentVersion = "813b1fec840d79b37fe86778237b6db6d1cb959d"
1919
)
2020

2121
func Convert_MachinesV1alpha1Machine_To_ClusterV1alpha1Machine(in *machinesv1alpha1.Machine, out *clusterv1alpha1.Machine) error {

0 commit comments

Comments
 (0)