Skip to content

Commit

Permalink
Merge pull request #58 from openshift/update-controller-runtime
Browse files Browse the repository at this point in the history
updates controller-runtime to v0.2.2
  • Loading branch information
openshift-merge-robot committed Mar 23, 2020
2 parents 218fe03 + cb4f53e commit b57ffcc
Show file tree
Hide file tree
Showing 57 changed files with 1,011 additions and 422 deletions.
6 changes: 4 additions & 2 deletions Gopkg.lock

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

2 changes: 1 addition & 1 deletion pkg/cloud/baremetal/actuators/machine/actuator.go
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ func (a *Actuator) chooseHost(ctx context.Context, machine *machinev1.Machine) (
Namespace: machine.Namespace,
}

err := a.client.List(ctx, &hosts, client.UseListOptions(opts))
err := a.client.List(ctx, &hosts, opts)
if err != nil {
return nil, err
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/machineset/machineset_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ func (r *ReconcileMachineSet) Reconcile(request reconcile.Request) (reconcile.Re
Namespace: instance.Namespace,
}

err = r.List(ctx, hosts, client.UseListOptions(opts))
err = r.List(ctx, hosts, opts)
if err != nil {
return reconcile.Result{}, err
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/machineset/mapper.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ func (m *msmapper) Map(obj handler.MapObject) []reconcile.Request {
requests := []reconcile.Request{}
if host, ok := obj.Object.(*bmh.BareMetalHost); ok {
msets := machinev1beta1.MachineSetList{}
err := m.client.List(context.TODO(), &msets, client.UseListOptions(&client.ListOptions{Namespace: host.Namespace}))
err := m.client.List(context.TODO(), &msets, &client.ListOptions{Namespace: host.Namespace})
if err != nil {
log.Error(err, "failed to list MachineSets")
return []reconcile.Request{}
Expand Down
31 changes: 0 additions & 31 deletions vendor/sigs.k8s.io/controller-runtime/.travis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion vendor/sigs.k8s.io/controller-runtime/FAQ.md

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

5 changes: 4 additions & 1 deletion vendor/sigs.k8s.io/controller-runtime/Gopkg.lock

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

12 changes: 6 additions & 6 deletions vendor/sigs.k8s.io/controller-runtime/TMP-LOGGING.md

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

10 changes: 5 additions & 5 deletions vendor/sigs.k8s.io/controller-runtime/VERSIONING.md

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

2 changes: 1 addition & 1 deletion vendor/sigs.k8s.io/controller-runtime/doc.go

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

36 changes: 36 additions & 0 deletions vendor/sigs.k8s.io/controller-runtime/examples/README.md

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

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

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

10 changes: 10 additions & 0 deletions vendor/sigs.k8s.io/controller-runtime/examples/crd/pkg/resource.go

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

4 changes: 2 additions & 2 deletions vendor/sigs.k8s.io/controller-runtime/go.mod

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

11 changes: 9 additions & 2 deletions vendor/sigs.k8s.io/controller-runtime/go.sum

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

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

0 comments on commit b57ffcc

Please sign in to comment.