bootstrap: use retry to wait for soft serve to come up
diff --git a/core/installer/cmd/bootstrap.go b/core/installer/cmd/bootstrap.go
index 805a5a0..9cd0a4c 100644
--- a/core/installer/cmd/bootstrap.go
+++ b/core/installer/cmd/bootstrap.go
@@ -9,6 +9,7 @@
"path/filepath"
"time"
+ "github.com/cenkalti/backoff/v4"
"github.com/spf13/cobra"
"helm.sh/helm/v3/pkg/action"
"helm.sh/helm/v3/pkg/chart/loader"
@@ -90,8 +91,12 @@
if err := installSoftServe(bootstrapJobKeys.Public); err != nil {
return err
}
- time.Sleep(1 * time.Minute) // TODO(giolekva): implement proper wait
- ss, err := soft.NewClient(bootstrapFlags.softServeIP, 22, []byte(bootstrapJobKeys.Private), log.Default())
+ var ss *soft.Client
+ err = backoff.Retry(func() error {
+ var err error
+ ss, err = soft.NewClient(bootstrapFlags.softServeIP, 22, []byte(bootstrapJobKeys.Private), log.Default())
+ return err
+ }, backoff.NewConstantBackOff(5*time.Second))
if err != nil {
return err
}
@@ -357,7 +362,12 @@
if err != nil {
return err
}
- values := map[string]interface{}{
+ values := map[string]any{
+ "image": map[string]any{
+ "repository": "giolekva/flux",
+ "tag": "2.0.0",
+ "pullPolicy": "IfNotPresent",
+ },
"repositoryAddress": repoAddr,
"repositoryHost": repoHost,
"repositoryHostPublicKey": repoHostPubKey,
diff --git a/core/installer/go.mod b/core/installer/go.mod
index f61dffd..1721cf0 100644
--- a/core/installer/go.mod
+++ b/core/installer/go.mod
@@ -4,6 +4,7 @@
require (
github.com/Masterminds/sprig/v3 v3.2.2
+ github.com/cenkalti/backoff/v4 v4.1.2
github.com/go-git/go-billy/v5 v5.4.1
github.com/go-git/go-git/v5 v5.7.0
github.com/labstack/echo/v4 v4.10.2
@@ -11,6 +12,9 @@
golang.org/x/crypto v0.9.0
golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1
helm.sh/helm/v3 v3.9.0
+ k8s.io/api v0.24.0
+ k8s.io/apimachinery v0.24.0
+ k8s.io/client-go v0.24.0
sigs.k8s.io/yaml v1.3.0
)
@@ -138,12 +142,9 @@
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
- k8s.io/api v0.24.0 // indirect
k8s.io/apiextensions-apiserver v0.24.0 // indirect
- k8s.io/apimachinery v0.24.0 // indirect
k8s.io/apiserver v0.24.0 // indirect
k8s.io/cli-runtime v0.24.0 // indirect
- k8s.io/client-go v0.24.0 // indirect
k8s.io/component-base v0.24.0 // indirect
k8s.io/klog/v2 v2.60.1 // indirect
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
diff --git a/core/installer/go.sum b/core/installer/go.sum
index 65ec121..f3a698c 100644
--- a/core/installer/go.sum
+++ b/core/installer/go.sum
@@ -110,6 +110,8 @@
github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b h1:otBG+dV+YK+Soembjv71DPz3uX/V/6MMlSyD9JBQ6kQ=
github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0 h1:nvj0OLI3YqYXer/kZD8Ri1aaunCxIEsOst1BVJswV0o=
github.com/bwesterb/go-ristretto v1.2.0/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0=
+github.com/cenkalti/backoff/v4 v4.1.2 h1:6Yo7N8UP2K6LWZnW94DLVSSrbobcWdVzAYOisuDPIFo=
+github.com/cenkalti/backoff/v4 v4.1.2/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw=
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
github.com/certifi/gocertifi v0.0.0-20191021191039-0944d244cd40/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA=
github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA=