From 300ce8646d00050073c9669b46f5080bc98efcb4 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Mon, 20 Nov 2023 11:52:42 +0100 Subject: [PATCH] Apply suggestions from code review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Kai Lüke --- cmd/ore/brightbox/gc.go | 2 +- kola/tests/kubeadm/kubeadm.go | 2 +- platform/api/brightbox/api.go | 2 +- platform/machine/brightbox/flight.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/ore/brightbox/gc.go b/cmd/ore/brightbox/gc.go index 3ab98e345..c681006ba 100644 --- a/cmd/ore/brightbox/gc.go +++ b/cmd/ore/brightbox/gc.go @@ -13,7 +13,7 @@ var ( cmdGC = &cobra.Command{ Use: "gc", Short: "GC resources in Brightbox", - Long: `Delete instances created over the given duration ago`, + Long: `Delete instances and images created over the given duration ago`, RunE: runGC, } diff --git a/kola/tests/kubeadm/kubeadm.go b/kola/tests/kubeadm/kubeadm.go index 016e2fa46..0198d15c1 100644 --- a/kola/tests/kubeadm/kubeadm.go +++ b/kola/tests/kubeadm/kubeadm.go @@ -243,7 +243,7 @@ func init() { // Let's skip this test for < 3034 on ESX // * For Cilium Calico/CNI on Brightbox: // unprocessable_entity: User data is too long (maximum is 16384 characters) - // Should be reenable once we switch to Butane provisioning. + // Should be reenabled once we switch to Butane provisioning because of internal compression. return (version.LessThan(semver.Version{Major: 3034}) && platform == "esx") || (platform == "brightbox" && (cni == "cilium" || cni == "calico")) }, diff --git a/platform/api/brightbox/api.go b/platform/api/brightbox/api.go index 4ca9e2dc1..2212e293c 100644 --- a/platform/api/brightbox/api.go +++ b/platform/api/brightbox/api.go @@ -218,7 +218,7 @@ func (a *API) UploadImage(name, URL string) (string, error) { } // It usually takes around 20 seconds to extract the image. - if err := util.WaitUntilReady(1*time.Minute, 5*time.Second, func() (bool, error) { + if err := util.WaitUntilReady(2*time.Minute, 5*time.Second, func() (bool, error) { image, err := a.client.Image(context.TODO(), img.ID) if err != nil { return false, fmt.Errorf("getting image status: %w", err) diff --git a/platform/machine/brightbox/flight.go b/platform/machine/brightbox/flight.go index 46976963b..5b3e13e01 100644 --- a/platform/machine/brightbox/flight.go +++ b/platform/machine/brightbox/flight.go @@ -42,7 +42,7 @@ func NewFlight(opts *brightbox.Options) (platform.Flight, error) { BaseFlight: base, api: api, // Current CloudIPs limit is 5. - cloudIPs: make(chan string, 5), + cloudIPs: make(chan string, 999), } return bf, nil