Skip to content

Commit b490eb0

Browse files
authored
feat: show a spinner when OpenEBS is installing, before the Operator spinner (#407)
* show a spinner when OpenEBS is installing, before the Operator spinner * figure out deployment name * wait for correct deployment
1 parent 562aff1 commit b490eb0

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

e2e/scripts/single-node-install.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,6 @@ main() {
143143
fi
144144

145145
if ! embedded-cluster install --no-prompt --license /tmp/license.yaml 2>&1 | tee /tmp/log ; then
146-
cat /etc/os-release
147146
echo "Failed to install embedded-cluster"
148147
exit 1
149148
fi

pkg/addons/openebs/openebs.go

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,14 @@ import (
1010
"github.com/replicatedhq/troubleshoot/pkg/apis/troubleshoot/v1beta2"
1111
"gopkg.in/yaml.v2"
1212
"sigs.k8s.io/controller-runtime/pkg/client"
13+
14+
"github.com/replicatedhq/embedded-cluster/pkg/kubeutils"
15+
"github.com/replicatedhq/embedded-cluster/pkg/spinner"
1316
)
1417

1518
const (
1619
releaseName = "openebs"
20+
namespace = "openebs"
1721
)
1822

1923
// Overwritten by -ldflags in Makefile
@@ -71,7 +75,7 @@ func (o *OpenEBS) GenerateHelmConfig(onlyDefaults bool) ([]v1beta1.Chart, []v1be
7175
Name: releaseName,
7276
ChartName: ChartName,
7377
Version: Version,
74-
TargetNS: "openebs",
78+
TargetNS: namespace,
7579
Order: 1,
7680
}
7781

@@ -90,7 +94,14 @@ func (o *OpenEBS) GenerateHelmConfig(onlyDefaults bool) ([]v1beta1.Chart, []v1be
9094
}
9195

9296
// Outro is executed after the cluster deployment.
93-
func (o *OpenEBS) Outro(_ context.Context, _ client.Client) error {
97+
func (o *OpenEBS) Outro(ctx context.Context, cli client.Client) error {
98+
loading := spinner.Start()
99+
loading.Infof("Waiting for Storage to be ready")
100+
if err := kubeutils.WaitForDeployment(ctx, cli, namespace, "openebs-localpv-provisioner"); err != nil {
101+
loading.Close()
102+
return err
103+
}
104+
loading.Closef("Storage is ready!")
94105
return nil
95106
}
96107

0 commit comments

Comments
 (0)