Skip to content

Commit b9232ad

Browse files
authored
Merge pull request #493 from akutz/feature/capi-0.1.9
CAPI 0.1.9
2 parents e11a978 + 0c03f3b commit b9232ad

File tree

10 files changed

+196
-24
lines changed

10 files changed

+196
-24
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ require (
3636
k8s.io/klog v0.3.2
3737
k8s.io/kube-openapi v0.0.0-20190306001800-15615b16d372 // indirect
3838
k8s.io/kubernetes v1.13.3
39-
sigs.k8s.io/cluster-api v0.1.8
39+
sigs.k8s.io/cluster-api v0.1.9
4040
sigs.k8s.io/controller-runtime v0.1.12
4141
sigs.k8s.io/controller-tools v0.1.11
4242
sigs.k8s.io/yaml v1.1.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -689,8 +689,8 @@ k8s.io/kubernetes v1.13.3 h1:46t44D87wKtdKFgr/lXM60K8xPrW0wO67Woof3Vsv6E=
689689
k8s.io/kubernetes v1.13.3/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk=
690690
k8s.io/utils v0.0.0-20190607212802-c55fbcfc754a h1:2jUDc9gJja832Ftp+QbDV0tVhQHMISFn01els+2ZAcw=
691691
k8s.io/utils v0.0.0-20190607212802-c55fbcfc754a/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
692-
sigs.k8s.io/cluster-api v0.1.8 h1:7cg5f+a5ubp4xUXR+76Y7bQe4OwOCMsDvIsrm6K7hJc=
693-
sigs.k8s.io/cluster-api v0.1.8/go.mod h1:MTxMmx3MSFZNi0RAjj64X+RurP9EEdhrRwLzdFZKTYw=
692+
sigs.k8s.io/cluster-api v0.1.9 h1:pSkEW8Ws46jtHM1KUsFFhf0phY36hljxd5O75EXy9wI=
693+
sigs.k8s.io/cluster-api v0.1.9/go.mod h1:MTxMmx3MSFZNi0RAjj64X+RurP9EEdhrRwLzdFZKTYw=
694694
sigs.k8s.io/controller-runtime v0.1.12 h1:ovDq28E64PeY1yR+6H7DthakIC09soiDCrKvfP2tPYo=
695695
sigs.k8s.io/controller-runtime v0.1.12/go.mod h1:HFAYoOh6XMV+jKF1UjFwrknPbowfyHEHHRdJMf2jMX8=
696696
sigs.k8s.io/controller-tools v0.1.11 h1:1ln8Ipmg2xosbeHmnlzG53kwO1f3yf9l6auvCHdbZpI=

vendor/modules.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -373,9 +373,9 @@ k8s.io/apimachinery/pkg/fields
373373
k8s.io/apimachinery/pkg/util/net
374374
k8s.io/apimachinery/pkg/watch
375375
k8s.io/apimachinery/pkg/api/meta
376+
k8s.io/apimachinery/pkg/util/errors
376377
k8s.io/apimachinery/pkg/conversion
377378
k8s.io/apimachinery/pkg/conversion/queryparams
378-
k8s.io/apimachinery/pkg/util/errors
379379
k8s.io/apimachinery/pkg/util/json
380380
k8s.io/apimachinery/pkg/util/naming
381381
k8s.io/apimachinery/pkg/util/runtime
@@ -398,6 +398,7 @@ k8s.io/apimachinery/pkg/util/strategicpatch
398398
k8s.io/apimachinery/pkg/runtime/serializer/streaming
399399
k8s.io/apimachinery/pkg/version
400400
k8s.io/apimachinery/pkg/apis/meta/v1beta1
401+
k8s.io/apimachinery/pkg/apis/meta/internalversion
401402
k8s.io/apimachinery/pkg/util/uuid
402403
k8s.io/apimachinery/third_party/forked/golang/reflect
403404
k8s.io/apimachinery/pkg/util/framer
@@ -406,7 +407,6 @@ k8s.io/apimachinery/third_party/forked/golang/json
406407
k8s.io/apimachinery/pkg/util/cache
407408
k8s.io/apimachinery/pkg/util/diff
408409
k8s.io/apimachinery/pkg/apis/config
409-
k8s.io/apimachinery/pkg/apis/meta/internalversion
410410
# k8s.io/client-go v10.0.0+incompatible
411411
k8s.io/client-go/kubernetes/typed/core/v1
412412
k8s.io/client-go/tools/clientcmd/api
@@ -417,6 +417,7 @@ k8s.io/client-go/rest
417417
k8s.io/client-go/tools/reference
418418
k8s.io/client-go/discovery
419419
k8s.io/client-go/util/flowcontrol
420+
k8s.io/client-go/tools/pager
420421
k8s.io/client-go/util/retry
421422
k8s.io/client-go/tools/leaderelection
422423
k8s.io/client-go/tools/leaderelection/resourcelock
@@ -476,7 +477,6 @@ k8s.io/client-go/pkg/apis/clientauthentication
476477
k8s.io/client-go/pkg/apis/clientauthentication/v1alpha1
477478
k8s.io/client-go/pkg/apis/clientauthentication/v1beta1
478479
k8s.io/client-go/util/connrotation
479-
k8s.io/client-go/tools/pager
480480
k8s.io/client-go/util/buffer
481481
k8s.io/client-go/util/jsonpath
482482
k8s.io/client-go/third_party/forked/golang/template
@@ -518,7 +518,7 @@ k8s.io/kubernetes/pkg/apis/core
518518
k8s.io/kubernetes/pkg/registry/core/service/allocator
519519
# k8s.io/utils v0.0.0-20190607212802-c55fbcfc754a
520520
k8s.io/utils/exec
521-
# sigs.k8s.io/cluster-api v0.1.8
521+
# sigs.k8s.io/cluster-api v0.1.9
522522
sigs.k8s.io/cluster-api/cmd/clusterctl/cmd
523523
sigs.k8s.io/cluster-api/pkg/apis/cluster/common
524524
sigs.k8s.io/cluster-api/pkg/apis

vendor/sigs.k8s.io/cluster-api/config/default/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/sigs.k8s.io/cluster-api/config/default/manager_image_patch.yaml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/sigs.k8s.io/cluster-api/pkg/controller/cluster/BUILD.bazel

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

vendor/sigs.k8s.io/cluster-api/pkg/controller/cluster/cluster_controller.go

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

vendor/sigs.k8s.io/cluster-api/pkg/controller/machine/machine_controller.go

Lines changed: 7 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/sigs.k8s.io/cluster-api/pkg/util/BUILD.bazel

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

0 commit comments

Comments
 (0)