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 controller-runtime to v0.2.0-beta.4 #1107

Merged
merged 1 commit into from
Jul 3, 2019
Merged

Update controller-runtime to v0.2.0-beta.4 #1107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions cmd/clusterctl/validation/validate_cluster_api_objects_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ func getNodeWithReadyStatus(nodeName string, nodeReadyStatus v1.ConditionStatus)

func TestGetClusterObjectWithNoCluster(t *testing.T) {
// Setup the Manager and Controller.
mgr, err := manager.New(cfg, manager.Options{})
mgr, err := manager.New(cfg, manager.Options{MetricsBindAddress: "0"})
if err != nil {
t.Fatalf("error creating new manager: %v", err)
}
Expand All @@ -97,7 +97,7 @@ func TestGetClusterObjectWithNoCluster(t *testing.T) {

func TestGetClusterObjectWithOneCluster(t *testing.T) {
// Setup the Manager and Controller.
mgr, err := manager.New(cfg, manager.Options{})
mgr, err := manager.New(cfg, manager.Options{MetricsBindAddress: "0"})
if err != nil {
t.Fatalf("error creating new manager: %v", err)
}
Expand Down Expand Up @@ -163,7 +163,7 @@ func TestGetClusterObjectWithOneCluster(t *testing.T) {

func TestGetClusterObjectWithMoreThanOneCluster(t *testing.T) {
// Setup the Manager and Controller.
mgr, err := manager.New(cfg, manager.Options{})
mgr, err := manager.New(cfg, manager.Options{MetricsBindAddress: "0"})
if err != nil {
t.Fatalf("error creating new manager: %v", err)
}
Expand Down Expand Up @@ -274,7 +274,7 @@ func TestValidateClusterObject(t *testing.T) {

func TestValidateMachineObjects(t *testing.T) {
// Setup the Manager and Controller.
mgr, err := manager.New(cfg, manager.Options{})
mgr, err := manager.New(cfg, manager.Options{MetricsBindAddress: "0"})
if err != nil {
t.Fatalf("error creating new manager: %v", err)
}
Expand Down Expand Up @@ -356,7 +356,7 @@ func TestValidateMachineObjects(t *testing.T) {

func TestValidateMachineObjectWithReferredNode(t *testing.T) {
// Setup the Manager and Controller.
mgr, err := manager.New(cfg, manager.Options{})
mgr, err := manager.New(cfg, manager.Options{MetricsBindAddress: "0"})
if err != nil {
t.Fatalf("error creating new manager: %v", err)
}
Expand Down Expand Up @@ -421,7 +421,7 @@ func TestValidateMachineObjectWithReferredNode(t *testing.T) {

func TestValidateClusterAPIObjectsOutput(t *testing.T) {
// Setup the Manager and Controller.
mgr, err := manager.New(cfg, manager.Options{})
mgr, err := manager.New(cfg, manager.Options{MetricsBindAddress: "0"})
if err != nil {
t.Fatalf("error creating new manager: %v", err)
}
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ require (
k8s.io/gengo v0.0.0-20190327210449-e17681d19d3a // indirect
k8s.io/klog v0.3.1
k8s.io/utils v0.0.0-20190506122338-8fab8cb257d5
sigs.k8s.io/controller-runtime v0.2.0-beta.3
sigs.k8s.io/controller-runtime v0.2.0-beta.4
sigs.k8s.io/controller-tools v0.2.0-beta.2.0.20190610175510-203d8e8ab133
sigs.k8s.io/testing_frameworks v0.1.2-0.20190130140139-57f07443c2d4
)
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,8 +275,8 @@ k8s.io/kube-openapi v0.0.0-20180731170545-e3762e86a74c h1:3KSCztE7gPitlZmWbNwue/
k8s.io/kube-openapi v0.0.0-20180731170545-e3762e86a74c/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc=
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/controller-runtime v0.2.0-beta.3 h1:K3dddu6/pOVORH2dBOnEbXif6R80oSDa4y/t1jhoh8s=
sigs.k8s.io/controller-runtime v0.2.0-beta.3/go.mod h1:HweyYKQ8fBuzdu2bdaeBJvsFgAi/OqBBnrVGXcqKhME=
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.2.0.20190610175510-203d8e8ab133 h1:snHWE0FBZKrXqKguv+fz6SrtTtXTc5iYxWzhycBAygE=
sigs.k8s.io/controller-tools v0.2.0-beta.2.0.20190610175510-203d8e8ab133/go.mod h1:gC5UAnK1jbxWnDaqTi0yxKIsRsRwshzeRtTUGbM9vos=
sigs.k8s.io/testing_frameworks v0.1.1 h1:cP2l8fkA3O9vekpy5Ks8mmA0NW/F7yBdXf8brkWhVrs=
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/cluster/cluster_reconciler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ func TestReconcile(t *testing.T) {

// Setup the Manager and Controller. Wrap the Controller Reconcile function so it writes each request to a
// channel when it is finished.
mgr, err := manager.New(cfg, manager.Options{})
mgr, err := manager.New(cfg, manager.Options{MetricsBindAddress: "0"})
if err != nil {
t.Fatalf("error creating new manager: %v", err)
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/machine/machine_reconciler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ func TestReconcile(t *testing.T) {

// Setup the Manager and Controller. Wrap the Controller Reconcile function so it writes each request to a
// channel when it is finished.
mgr, err := manager.New(cfg, manager.Options{})
mgr, err := manager.New(cfg, manager.Options{MetricsBindAddress: "0"})
if err != nil {
t.Fatalf("error creating new manager: %v", err)
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/machinedeployment/machinedeployment_reconciler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ func TestReconcile(t *testing.T) {

// Setup the Manager and Controller. Wrap the Controller Reconcile function so it writes each request to a
// channel when it is finished.
mgr, err := manager.New(cfg, manager.Options{})
mgr, err := manager.New(cfg, manager.Options{MetricsBindAddress: "0"})
if err != nil {
t.Errorf("error creating new manager: %v", err)
}
Expand Down
1 change: 1 addition & 0 deletions pkg/controller/machineset/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ go_library(
"//vendor/k8s.io/api/core/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/labels:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
"//vendor/k8s.io/client-go/tools/record:go_default_library",
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/machineset/machineset_reconciler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ func TestReconcile(t *testing.T) {

// Setup the Manager and Controller. Wrap the Controller Reconcile function so it writes each request to a
// channel when it is finished.
mgr, err := manager.New(cfg, manager.Options{})
mgr, err := manager.New(cfg, manager.Options{MetricsBindAddress: "0"})
g.Expect(err).To(gomega.BeNil())

c = mgr.GetClient()
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/noderef/noderef_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ func TestReconcile(t *testing.T) {

// Setup the Manager and Controller. Wrap the Controller Reconcile function so it writes each request to a
// channel when it is finished.
mgr, err := manager.New(cfg, manager.Options{})
mgr, err := manager.New(cfg, manager.Options{MetricsBindAddress: "0"})
g.Expect(err).NotTo(gomega.HaveOccurred())
c = mgr.GetClient()

Expand Down
2 changes: 1 addition & 1 deletion vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -648,7 +648,7 @@ k8s.io/utils/pointer
k8s.io/utils/integer
k8s.io/utils/buffer
k8s.io/utils/trace
# sigs.k8s.io/controller-runtime v0.2.0-beta.3
# sigs.k8s.io/controller-runtime v0.2.0-beta.4
sigs.k8s.io/controller-runtime/pkg/client
sigs.k8s.io/controller-runtime/pkg/client/config
sigs.k8s.io/controller-runtime/pkg/manager
Expand Down
1 change: 1 addition & 0 deletions vendor/sigs.k8s.io/controller-runtime/pkg/client/config/BUILD.bazel
View file
Open in desktop

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

47 changes: 40 additions & 7 deletions vendor/sigs.k8s.io/controller-runtime/pkg/client/config/config.go
View file
Open in desktop

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

19 changes: 14 additions & 5 deletions vendor/sigs.k8s.io/controller-runtime/pkg/manager/internal.go
View file
Open in desktop

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

3 changes: 2 additions & 1 deletion vendor/sigs.k8s.io/controller-runtime/pkg/manager/manager.go
View file
Open in desktop

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

13 changes: 7 additions & 6 deletions vendor/sigs.k8s.io/controller-runtime/pkg/metrics/listener.go
View file
Open in desktop

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