Skip to content

Bug 1954177: Update mao dependency for webhook v1 changes #180

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

Merged
openshift-merge-robot merged 1 commit into from
May 11, 2021
Merged

Bug 1954177: Update mao dependency for webhook v1 changes #180

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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion cmd/manager/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import (
rTcontroller "sigs.k8s.io/controller-runtime/pkg/controller"
"sigs.k8s.io/controller-runtime/pkg/healthz"
"sigs.k8s.io/controller-runtime/pkg/manager"
"sigs.k8s.io/controller-runtime/pkg/runtime/signals"
"sigs.k8s.io/controller-runtime/pkg/manager/signals"
)

// The default durations for the leader election operations.
Expand Down
29 changes: 14 additions & 15 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,32 +5,31 @@ go 1.15
require (
github.com/ajeddeloh/go-json v0.0.0-20170920214419-6a2fe990e083 // indirect
github.com/ajeddeloh/yaml v0.0.0-20170912190910-6b94386aeefd // indirect
github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d // indirect
github.com/coreos/container-linux-config-transpiler v0.9.0
github.com/coreos/go-systemd v0.0.0-20190620071333-e64a0ec8b42a // indirect
github.com/coreos/ignition v0.33.0 // indirect
github.com/go-logr/logr v0.2.1
github.com/go-logr/logr v0.4.0
github.com/gophercloud/gophercloud v0.14.0
github.com/gophercloud/utils v0.0.0-20201221031838-d93cf4b3fa50
github.com/onsi/ginkgo v1.14.1
github.com/onsi/gomega v1.10.2
github.com/openshift/api v0.0.0-20201019163320-c6a5ec25f267
github.com/openshift/client-go v0.0.0-20201020074620-f8fd44879f7c
github.com/openshift/machine-api-operator v0.2.1-0.20201203125141-79567cb3368e
github.com/onsi/ginkgo v1.15.0
github.com/onsi/gomega v1.10.5
github.com/openshift/api v0.0.0-20210416115537-a60c0dc032fd
github.com/openshift/client-go v0.0.0-20210409155308-a8e62c60e930
github.com/openshift/machine-api-operator v0.2.1-0.20210505133115-b7ef098180db
github.com/vincent-petithory/dataurl v0.0.0-20160330182126-9a301d65acbb // indirect
go4.org v0.0.0-20191010144846-132d2879e1e9 // indirect
gopkg.in/yaml.v2 v2.3.0
k8s.io/api v0.19.2
k8s.io/apimachinery v0.19.2
k8s.io/client-go v0.19.2
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.21.0
k8s.io/apimachinery v0.21.0
k8s.io/client-go v0.21.0
k8s.io/cluster-bootstrap v0.0.0-20190202014938-c9acc0c1bea2
k8s.io/klog v1.0.0
k8s.io/klog/v2 v2.3.0
sigs.k8s.io/controller-runtime v0.6.2
k8s.io/klog/v2 v2.8.0
sigs.k8s.io/controller-runtime v0.9.0-beta.0.0.20210503121002-0c99fc7f46fb
sigs.k8s.io/yaml v1.2.0
)

replace (
sigs.k8s.io/cluster-api-provider-aws => github.com/openshift/cluster-api-provider-aws v0.2.1-0.20201125052318-b85a18cbf338
sigs.k8s.io/cluster-api-provider-azure => github.com/openshift/cluster-api-provider-azure v0.1.0-alpha.3.0.20201130182513-88b90230f2a4
sigs.k8s.io/cluster-api-provider-aws => github.com/openshift/cluster-api-provider-aws v0.2.1-0.20210505150511-f9cb840ae412
sigs.k8s.io/cluster-api-provider-azure => github.com/openshift/cluster-api-provider-azure v0.1.0-alpha.3.0.20210505133115-b2eda16dd665
)
398 changes: 365 additions & 33 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions pkg/cloud/openstack/machineset/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ package machineset
import (
"context"
"fmt"
"strconv"
"time"

Copy link

@adduarte adduarte May 11, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Gratuitous change? I get it, but the change does not change the binary output. and makes the patch longer. Not important

Copy link

@mdbooth mdbooth May 12, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My VSCode made an incredibly similar change to something recently. In general VSCode doesn't do its own code analysis but uses standard go tools. I suspect @elmiko didn't make this change, but either ran go imports or some tool ran it on his behalf?

Copy link
Author

@elmiko elmiko May 12, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah, i think my auto-linter did this when i saved the file

"github.com/go-logr/logr"
"github.com/gophercloud/gophercloud/openstack/compute/v2/flavors"
machinev1 "github.com/openshift/machine-api-operator/pkg/apis/machine/v1beta1"
Expand All @@ -16,8 +19,6 @@ import (
ctrlRuntime "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/controller"
"strconv"
"time"
)

const (
Expand All @@ -44,12 +45,11 @@ type Reconciler struct {
}

// Reconcile implements controller runtime Reconciler interface.
func (r *Reconciler) Reconcile(req ctrlRuntime.Request) (ctrlRuntime.Result, error) {
func (r *Reconciler) Reconcile(ctx context.Context, req ctrlRuntime.Request) (ctrlRuntime.Result, error) {

logger := r.Log.WithValues("machineset", req.Name, "namespace", req.Namespace)
logger.V(3).Info("Reconciling")

ctx := context.Background()
machineSet := &machinev1.MachineSet{}
if err := r.Client.Get(ctx, req.NamespacedName, machineSet); err != nil {
if apierrors.IsNotFound(err) {
Expand Down
6 changes: 2 additions & 4 deletions pkg/cloud/openstack/machineset/controller_suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,10 @@ var _ = AfterSuite(func() {
})

// StartTestManager adds recFn
func StartTestManager(mgr manager.Manager) chan struct{} {
stop := make(chan struct{})
func StartTestManager(mgr manager.Manager) {
go func() {
defer GinkgoRecover()

Expect(mgr.Start(stop)).To(Succeed())
Expect(mgr.Start(context.Background())).To(Succeed())
}()
return stop
}
13 changes: 6 additions & 7 deletions pkg/cloud/openstack/machineset/controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ package machineset
import (
"encoding/json"
"fmt"
"math/rand"
"strconv"
"testing"
"time"

"github.com/gophercloud/gophercloud/openstack/compute/v2/flavors"
. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/extensions/table"
Expand All @@ -13,14 +18,10 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/client-go/tools/record"
"math/rand"
machineproviderv1 "sigs.k8s.io/cluster-api-provider-openstack/pkg/apis/openstackproviderconfig/v1alpha1"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/controller"
"sigs.k8s.io/controller-runtime/pkg/manager"
"strconv"
"testing"
"time"
)

var emptyFlavorName = ""
Expand Down Expand Up @@ -70,7 +71,6 @@ func RandomString(prefix string, n int) string {

var _ = Describe("Reconciler", func() {
var c client.Client
var stopMgr chan struct{}
var fakeRecorder *record.FakeRecorder
var namespace *corev1.Namespace
var suiteFlavorCache = newMachineFlavorCache()
Expand All @@ -94,15 +94,14 @@ var _ = Describe("Reconciler", func() {
r.eventRecorder = fakeRecorder
r.flavorCache = suiteFlavorCache
c = mgr.GetClient()
stopMgr = StartTestManager(mgr)
StartTestManager(mgr)

Expect(c.Create(ctx, namespace)).To(Succeed())
})

AfterEach(func() {
Expect(deleteMachineSets(c, namespace.Name)).To(Succeed())
Expect(deleteNameSpace(c, namespace)).To(Succeed())
close(stopMgr)
})

type reconcileTestCase = struct {
Expand Down
2 changes: 1 addition & 1 deletion vendor/github.com/MakeNowJust/heredoc/LICENSE
View file
Open in desktop

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

13 changes: 6 additions & 7 deletions vendor/github.com/MakeNowJust/heredoc/README.md
View file
Open in desktop

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

3 changes: 3 additions & 0 deletions vendor/github.com/MakeNowJust/heredoc/go.mod
View file
Open in desktop

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

11 changes: 9 additions & 2 deletions vendor/github.com/MakeNowJust/heredoc/heredoc.go
View file
Open in desktop

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

Loading