Merge pull request kubernetes-sigs#440 from akutz/feature/capi-0.1.7

CAPI 0.1.7
jayunit100 · Jul 18, 2019 · 88f9b5c · 88f9b5c
2 parents 28645fa + 92badad
commit 88f9b5c
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/go.mod b/go.mod
@@ -36,7 +36,7 @@ require (
 	k8s.io/klog v0.3.2
 	k8s.io/kube-openapi v0.0.0-20190306001800-15615b16d372 // indirect
 	k8s.io/kubernetes v1.13.3
-	sigs.k8s.io/cluster-api v0.1.6
+	sigs.k8s.io/cluster-api v0.1.7
 	sigs.k8s.io/controller-runtime v0.1.12
 	sigs.k8s.io/controller-tools v0.1.11
 	sigs.k8s.io/yaml v1.1.0

diff --git a/go.sum b/go.sum
@@ -689,8 +689,8 @@ k8s.io/kubernetes v1.13.3 h1:46t44D87wKtdKFgr/lXM60K8xPrW0wO67Woof3Vsv6E=
 k8s.io/kubernetes v1.13.3/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk=
 k8s.io/utils v0.0.0-20190607212802-c55fbcfc754a h1:2jUDc9gJja832Ftp+QbDV0tVhQHMISFn01els+2ZAcw=
 k8s.io/utils v0.0.0-20190607212802-c55fbcfc754a/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
-sigs.k8s.io/cluster-api v0.1.6 h1:gyLHAEWpoFU4/1OudOJPeoRL579skOhWWYKnK+i5coY=
-sigs.k8s.io/cluster-api v0.1.6/go.mod h1:MTxMmx3MSFZNi0RAjj64X+RurP9EEdhrRwLzdFZKTYw=
+sigs.k8s.io/cluster-api v0.1.7 h1:NkHm9cUtyYa71VpKowNVfH+ldGv3HPczpAmyExbCqOA=
+sigs.k8s.io/cluster-api v0.1.7/go.mod h1:MTxMmx3MSFZNi0RAjj64X+RurP9EEdhrRwLzdFZKTYw=
 sigs.k8s.io/controller-runtime v0.1.12 h1:ovDq28E64PeY1yR+6H7DthakIC09soiDCrKvfP2tPYo=
 sigs.k8s.io/controller-runtime v0.1.12/go.mod h1:HFAYoOh6XMV+jKF1UjFwrknPbowfyHEHHRdJMf2jMX8=
 sigs.k8s.io/controller-tools v0.1.11 h1:1ln8Ipmg2xosbeHmnlzG53kwO1f3yf9l6auvCHdbZpI=

diff --git a/scripts/e2e/bootstrap_job/spec/provider-components.template b/scripts/e2e/bootstrap_job/spec/provider-components.template
@@ -2333,7 +2333,7 @@ spec:
       containers:
       - command:
         - /manager
-        image: us.gcr.io/k8s-artifacts-prod/cluster-api/cluster-api-controller:v0.1.6
+        image: us.gcr.io/k8s-artifacts-prod/cluster-api/cluster-api-controller:v0.1.7
         name: manager
         resources:
           limits:

diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -518,7 +518,7 @@ k8s.io/kubernetes/pkg/apis/core
 k8s.io/kubernetes/pkg/registry/core/service/allocator
 # k8s.io/utils v0.0.0-20190607212802-c55fbcfc754a
 k8s.io/utils/exec
-# sigs.k8s.io/cluster-api v0.1.6
+# sigs.k8s.io/cluster-api v0.1.7
 sigs.k8s.io/cluster-api/cmd/clusterctl/cmd
 sigs.k8s.io/cluster-api/pkg/apis/cluster/common
 sigs.k8s.io/cluster-api/pkg/apis

diff --git a/vendor/sigs.k8s.io/cluster-api/config/default/manager_image_patch.yaml b/vendor/sigs.k8s.io/cluster-api/config/default/manager_image_patch.yaml