update vendored version of capi

Signed-off-by: Vince Prignano <[email protected]>
kubernetes-sigs · Jul 16, 2019 · d0e1047 · d0e1047
1 parent ec7fb9b
commit d0e1047
Show file tree

Hide file tree

Showing 13 changed files with 176 additions and 73 deletions.
diff --git a/go.mod b/go.mod
@@ -21,7 +21,7 @@ require (
 	k8s.io/klog v0.3.2
 	k8s.io/kubernetes v1.14.2
 	k8s.io/utils v0.0.0-20190506122338-8fab8cb257d5
-	sigs.k8s.io/cluster-api v0.0.0-20190711203908-5ffab93802d7
+	sigs.k8s.io/cluster-api v0.0.0-20190716164525-f1af714c4c2e
 	sigs.k8s.io/controller-runtime v0.2.0-beta.4
 	sigs.k8s.io/controller-tools v0.2.0-beta.3
 	sigs.k8s.io/testing_frameworks v0.1.2-0.20190130140139-57f07443c2d4
@@ -31,5 +31,5 @@ require (
 replace (
 	k8s.io/api => k8s.io/api v0.0.0-20190704095032-f4ca3d3bdf1d
 	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190704094733-8f6ac2502e51
-	sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v0.0.0-20190711203908-5ffab93802d7
+	sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v0.0.0-20190716164525-f1af714c4c2e
 )
diff --git a/go.sum b/go.sum
@@ -304,8 +304,10 @@ k8s.io/kubernetes v1.14.2 h1:Gdq2hPpttbaJBoClIanCE6WSu4IZReA54yhkZtvPUOo=
 k8s.io/kubernetes v1.14.2/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk=
 k8s.io/utils v0.0.0-20190506122338-8fab8cb257d5 h1:VBM/0P5TWxwk+Nw6Z+lAw3DKgO76g90ETOiA6rfLV1Y=
 k8s.io/utils v0.0.0-20190506122338-8fab8cb257d5/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
-sigs.k8s.io/cluster-api v0.0.0-20190711203908-5ffab93802d7 h1:rX9YZe/JrhGzJ1GDgEPHTS/R2kP3UwKkYOv06sp0Gco=
-sigs.k8s.io/cluster-api v0.0.0-20190711203908-5ffab93802d7/go.mod h1:Ahokj7Sz+yCFXObi1j1UwZ0vU0AsWFAxln74L4BWxv8=
+sigs.k8s.io/cluster-api v0.0.0-20190716012324-61aab24dde2e h1:ZYxOiQ01y/sVjeOX4m0bX+caw7Gt2g6NNUYwC7+BFbA=
+sigs.k8s.io/cluster-api v0.0.0-20190716012324-61aab24dde2e/go.mod h1:Ahokj7Sz+yCFXObi1j1UwZ0vU0AsWFAxln74L4BWxv8=
+sigs.k8s.io/cluster-api v0.0.0-20190716164525-f1af714c4c2e h1:mLSmNvByFSFEWsyqoqK32CYG+HWC42h33NvtIhm/3u0=
+sigs.k8s.io/cluster-api v0.0.0-20190716164525-f1af714c4c2e/go.mod h1:Ahokj7Sz+yCFXObi1j1UwZ0vU0AsWFAxln74L4BWxv8=
 sigs.k8s.io/controller-runtime v0.2.0-beta.4 h1:S1XVfRWR1MuIXZdkYx3jN8JDw+bbQxmWZroy0i87z/A=
 sigs.k8s.io/controller-runtime v0.2.0-beta.4/go.mod h1:HweyYKQ8fBuzdu2bdaeBJvsFgAi/OqBBnrVGXcqKhME=
 sigs.k8s.io/controller-tools v0.2.0-beta.3 h1:7h1Hx+vpg79dktBILuQq/aDed4GZcdxeUwuEb59G1bw=

diff --git a/pkg/cloud/aws/services/ec2/BUILD.bazel b/pkg/cloud/aws/services/ec2/BUILD.bazel
@@ -62,6 +62,7 @@ go_test(
         "//vendor/github.com/golang/mock/gomock:go_default_library",
         "//vendor/github.com/pkg/errors:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
+        "//vendor/k8s.io/utils/pointer:go_default_library",
         "//vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha2:go_default_library",
     ],
 )
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -587,7 +587,7 @@ k8s.io/utils/exec
 k8s.io/utils/integer
 k8s.io/utils/buffer
 k8s.io/utils/trace
-# sigs.k8s.io/cluster-api v0.0.0-20190711203908-5ffab93802d7 => sigs.k8s.io/cluster-api v0.0.0-20190711203908-5ffab93802d7
+# sigs.k8s.io/cluster-api v0.0.0-20190716012324-61aab24dde2e => sigs.k8s.io/cluster-api v0.0.0-20190716012324-61aab24dde2e
 sigs.k8s.io/cluster-api/pkg/client/clientset_generated/clientset
 sigs.k8s.io/cluster-api/cmd/clusterctl/cmd
 sigs.k8s.io/cluster-api/pkg/apis/cluster/common

diff --git a/vendor/sigs.k8s.io/cluster-api/README.md b/vendor/sigs.k8s.io/cluster-api/README.md
diff --git a/vendor/sigs.k8s.io/cluster-api/config/rbac/role.yaml b/vendor/sigs.k8s.io/cluster-api/config/rbac/role.yaml
diff --git a/vendor/sigs.k8s.io/cluster-api/docs/how-to-use-clusterctl.md b/vendor/sigs.k8s.io/cluster-api/docs/how-to-use-clusterctl.md
diff --git a/vendor/sigs.k8s.io/cluster-api/pkg/controller/cluster/cluster_controller.go b/vendor/sigs.k8s.io/cluster-api/pkg/controller/cluster/cluster_controller.go
diff --git a/vendor/sigs.k8s.io/cluster-api/pkg/controller/machine/machine_controller.go b/vendor/sigs.k8s.io/cluster-api/pkg/controller/machine/machine_controller.go
diff --git a/.../sigs.k8s.io/cluster-api/pkg/controller/machinedeployment/machinedeployment_controller.go b/.../sigs.k8s.io/cluster-api/pkg/controller/machinedeployment/machinedeployment_controller.go
diff --git a/vendor/sigs.k8s.io/cluster-api/pkg/controller/machineset/machineset_controller.go b/vendor/sigs.k8s.io/cluster-api/pkg/controller/machineset/machineset_controller.go
diff --git a/vendor/sigs.k8s.io/cluster-api/pkg/util/BUILD.bazel b/vendor/sigs.k8s.io/cluster-api/pkg/util/BUILD.bazel