From 2f5f9ce5eca4238e5f3889860c9fbb01b99d5e3b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 Oct 2023 15:21:55 +0000 Subject: [PATCH 1/2] fix(deps): bump github.com/onsi/ginkgo/v2 in /tools Bumps [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo) from 2.12.1 to 2.13.0. - [Release notes](https://github.com/onsi/ginkgo/releases) - [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md) - [Commits](https://github.com/onsi/ginkgo/compare/v2.12.1...v2.13.0) --- updated-dependencies: - dependency-name: github.com/onsi/ginkgo/v2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- tools/go.mod | 2 +- tools/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/go.mod b/tools/go.mod index 15c24b64..cf9c3820 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -5,7 +5,7 @@ go 1.20 require ( github.com/golangci/golangci-lint v1.54.2 github.com/mikefarah/yq/v4 v4.35.2 - github.com/onsi/ginkgo/v2 v2.12.1 + github.com/onsi/ginkgo/v2 v2.13.0 sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20220927155351-7399a3a595bf sigs.k8s.io/controller-tools v0.13.0 sigs.k8s.io/kustomize/kustomize/v5 v5.1.1 diff --git a/tools/go.sum b/tools/go.sum index b0e91b47..4e5bb122 100644 --- a/tools/go.sum +++ b/tools/go.sum @@ -451,8 +451,8 @@ github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= -github.com/onsi/ginkgo/v2 v2.12.1 h1:uHNEO1RP2SpuZApSkel9nEh1/Mu+hmQe7Q+Pepg5OYA= -github.com/onsi/ginkgo/v2 v2.12.1/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o= +github.com/onsi/ginkgo/v2 v2.13.0 h1:0jY9lJquiL8fcf3M4LAXN5aMlS/b2BV86HFFPCPMgE4= +github.com/onsi/ginkgo/v2 v2.13.0/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o= github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI= github.com/otiai10/copy v1.2.0 h1:HvG945u96iNadPoG2/Ja2+AUJeW5YuFQMixq9yirC+k= github.com/otiai10/copy v1.2.0/go.mod h1:rrF5dJ5F0t/EWSYODDu4j9/vEeYHMkc8jt0zJChqQWw= From 338824bbe4e0441a297255261ff4aac8f4f076af Mon Sep 17 00:00:00 2001 From: Andrew Pantuso Date: Tue, 10 Oct 2023 11:24:47 -0400 Subject: [PATCH 2/2] tests(integration): increase timeouts --- integration/apply_network_policies_test.go | 2 +- integration/status_controller_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/integration/apply_network_policies_test.go b/integration/apply_network_policies_test.go index edcadf2d..1abc46ac 100644 --- a/integration/apply_network_policies_test.go +++ b/integration/apply_network_policies_test.go @@ -133,7 +133,7 @@ var _ = Describe("Apply Network Policies Phase", func() { _client.Update(ctx, &secret) np := addonNetworkPolicy(fmt.Sprintf("%s-ingress", operatorName), namespace) - _client.EventuallyObjectExists(ctx, &np, internaltesting.WithTimeout(10*time.Second)) + _client.EventuallyObjectExists(ctx, &np, internaltesting.WithTimeout(30*time.Second)) }) }) }) diff --git a/integration/status_controller_test.go b/integration/status_controller_test.go index 4547322b..3eac19da 100644 --- a/integration/status_controller_test.go +++ b/integration/status_controller_test.go @@ -102,7 +102,7 @@ var _ = Describe("Status Controller", func() { _client.Get(ctx, &addonInstance) return addonInstance.Status.Conditions - }, 10*time.Second).Should(ContainElements(EqualCondition(expectedCondition))) + }, 30*time.Second).Should(ContainElements(EqualCondition(expectedCondition))) fmt.Printf("%+v\n", addonInstance)