From f3a4325316c987c660602a400988cee386633ea2 Mon Sep 17 00:00:00 2001 From: Andrew McDermott Date: Thu, 2 May 2019 18:44:47 +0100 Subject: [PATCH] UPSTREAM: : openshift: bump cluster-api-actuator-pkg Pick up https://github.com/openshift/cluster-api-actuator-pkg/pull/78 --- test/openshift/Gopkg.lock | 4 ++-- .../cluster-api-actuator-pkg/pkg/e2e/autoscaler/autoscaler.go | 1 - .../openshift/cluster-api-actuator-pkg/pkg/e2e/infra/infra.go | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/test/openshift/Gopkg.lock b/test/openshift/Gopkg.lock index 82ea220746a7..969c8c676f4d 100644 --- a/test/openshift/Gopkg.lock +++ b/test/openshift/Gopkg.lock @@ -350,7 +350,7 @@ [[projects]] branch = "master" - digest = "1:7c4c0c9cdc44531d57899fdde7a07dd55bb60ed88fae137552f2ad51a52b49f1" + digest = "1:8ac51ce0543106c1f7ae943463db52e48e816420351886a14fcf799b5fd14be9" name = "github.com/openshift/cluster-api-actuator-pkg" packages = [ "pkg/e2e/autoscaler", @@ -362,7 +362,7 @@ "pkg/types", ] pruneopts = "" - revision = "7f0427a526ab924b8843b62a7fe868c6821c435d" + revision = "dc2d4c7f4e839792f76b43e4844a5f87a09300b2" [[projects]] branch = "master" diff --git a/test/openshift/vendor/github.com/openshift/cluster-api-actuator-pkg/pkg/e2e/autoscaler/autoscaler.go b/test/openshift/vendor/github.com/openshift/cluster-api-actuator-pkg/pkg/e2e/autoscaler/autoscaler.go index 99c83f010530..012cd89f71c1 100644 --- a/test/openshift/vendor/github.com/openshift/cluster-api-actuator-pkg/pkg/e2e/autoscaler/autoscaler.go +++ b/test/openshift/vendor/github.com/openshift/cluster-api-actuator-pkg/pkg/e2e/autoscaler/autoscaler.go @@ -316,7 +316,6 @@ var _ = g.Describe("[Feature:Machines] Autoscaler should", func() { initialNumberOfReplicas0 := pointer.Int32PtrDerefOr(targetMachineSet0.Spec.Replicas, e2e.DefaultMachineSetReplicas) initialNumberOfReplicas1 := pointer.Int32PtrDerefOr(targetMachineSet1.Spec.Replicas, e2e.DefaultMachineSetReplicas) glog.Infof("initialNumberOfReplicas0 %d, initialNumberOfReplicas1 %d", initialNumberOfReplicas0, initialNumberOfReplicas1) - o.Expect(initialNumberOfReplicas0).To(o.BeNumerically("==", initialNumberOfReplicas1)) g.By("Creating workload") err = client.Create(context.TODO(), newWorkLoad()) diff --git a/test/openshift/vendor/github.com/openshift/cluster-api-actuator-pkg/pkg/e2e/infra/infra.go b/test/openshift/vendor/github.com/openshift/cluster-api-actuator-pkg/pkg/e2e/infra/infra.go index 6bddb342a6d6..661120e9ae46 100644 --- a/test/openshift/vendor/github.com/openshift/cluster-api-actuator-pkg/pkg/e2e/infra/infra.go +++ b/test/openshift/vendor/github.com/openshift/cluster-api-actuator-pkg/pkg/e2e/infra/infra.go @@ -269,7 +269,7 @@ var _ = g.Describe("[Feature:Machines] Managed cluster should", func() { machineSets, err := e2e.GetMachineSets(context.TODO(), client) o.Expect(err).NotTo(o.HaveOccurred()) - o.Expect(len(machineSets)).To(o.BeNumerically(">", 2)) + o.Expect(len(machineSets)).To(o.BeNumerically(">=", 2)) machineSet := machineSets[0] initialReplicasMachineSet := int(pointer.Int32PtrDerefOr(machineSet.Spec.Replicas, e2e.DefaultMachineSetReplicas)) scaleOut := 3 @@ -309,7 +309,7 @@ var _ = g.Describe("[Feature:Machines] Managed cluster should", func() { g.By("getting worker machineSets") machineSets, err := e2e.GetMachineSets(context.TODO(), client) o.Expect(err).NotTo(o.HaveOccurred()) - o.Expect(len(machineSets)).To(o.BeNumerically(">", 2)) + o.Expect(len(machineSets)).To(o.BeNumerically(">=", 2)) machineSet0 := machineSets[0] initialReplicasMachineSet0 := int(pointer.Int32PtrDerefOr(machineSet0.Spec.Replicas, e2e.DefaultMachineSetReplicas)) machineSet1 := machineSets[1]