Skip to content

Commit e10bcfb

Browse files
Felix Hennigfhennig
Felix Hennig
and
fhennig
committed
Fix/docs test nightly to dev (#331)
# Description Test: https://ci.stackable.tech/view/05%20Documentation%20Tests/job/hdfs-operator-documentation-test/4/ Co-authored-by: Felix Hennig <fhennig@users.noreply.github.com>
1 parent 485de69 commit e10bcfb

File tree

3 files changed

+84
-28
lines changed

3 files changed

+84
-28
lines changed

‎docs/modules/hdfs/examples/getting_started/getting_started.sh‎

Lines changed: 44 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,24 @@ echo "Adding 'stackable-dev' Helm Chart repository"
2222
# tag::helm-add-repo[]
2323
helm repo add stackable-dev https://repo.stackable.tech/repository/helm-dev/
2424
# end::helm-add-repo[]
25+
echo "Updating Helm repo"
26+
helm repo update
2527
echo "Installing Operators with Helm"
2628
# tag::helm-install-operators[]
27-
helm install --wait zookeeper-operator stackable-dev/zookeeper-operator --version 0.13.0-nightly
28-
helm install --wait hdfs-operator stackable-dev/hdfs-operator --version 0.7.0-nightly
29-
helm install --wait commons-operator stackable-dev/commons-operator --version 0.5.0-nightly
30-
helm install --wait secret-operator stackable-dev/secret-operator --version 0.7.0-nightly
29+
helm install --wait zookeeper-operator stackable-dev/zookeeper-operator --version 0.0.0-dev
30+
helm install --wait hdfs-operator stackable-dev/hdfs-operator --version 0.0.0-dev
31+
helm install --wait commons-operator stackable-dev/commons-operator --version 0.0.0-dev
32+
helm install --wait secret-operator stackable-dev/secret-operator --version 0.0.0-dev
3133
# end::helm-install-operators[]
3234
;;
3335
"stackablectl")
3436
echo "installing Operators with stackablectl"
3537
# tag::stackablectl-install-operators[]
3638
stackablectl operator install \
37-
commons=0.5.0-nightly \
38-
secret=0.7.0-nightly \
39-
zookeeper=0.13.0-nightly \
40-
hdfs=0.7.0-nightly
39+
commons=0.0.0-dev \
40+
secret=0.0.0-dev \
41+
zookeeper=0.0.0-dev \
42+
hdfs=0.0.0-dev
4143
# end::stackablectl-install-operators[]
4244
;;
4345
*)
@@ -56,37 +58,63 @@ echo "Creating ZNode"
5658
kubectl apply -f znode.yaml
5759
# end::install-zk[]
5860

59-
sleep 5
61+
62+
63+
for (( i=1; i<=15; i++ ))
64+
do
65+
echo "Waiting for ZookeeperCluster to appear ..."
66+
if eval kubectl get statefulset simple-zk-server-default; then
67+
break
68+
fi
69+
70+
sleep 1
71+
done
6072

6173
echo "Awaiting Zookeeper rollout finish"
6274
# tag::watch-zk-rollout[]
63-
kubectl rollout status --watch statefulset/simple-zk-server-default
75+
kubectl rollout status --watch --timeout=5m statefulset/simple-zk-server-default
6476
# end::watch-zk-rollout[]
6577

6678
echo "Creating HDFS cluster"
6779
# tag::install-hdfs[]
6880
kubectl apply -f hdfs.yaml
6981
# end::install-hdfs[]
7082

71-
sleep 5
83+
for (( i=1; i<=15; i++ ))
84+
do
85+
echo "Waiting for HdfsCluster to appear ..."
86+
if eval kubectl get statefulset simple-hdfs-datanode-default; then
87+
break
88+
fi
89+
90+
sleep 1
91+
done
7292

7393
echo "Awaiting HDFS rollout finish"
7494
# tag::watch-hdfs-rollout[]
75-
kubectl rollout status --watch statefulset/simple-hdfs-datanode-default
76-
kubectl rollout status --watch statefulset/simple-hdfs-namenode-default
77-
kubectl rollout status --watch statefulset/simple-hdfs-journalnode-default
95+
kubectl rollout status --watch --timeout=5m statefulset/simple-hdfs-datanode-default
96+
kubectl rollout status --watch --timeout=5m statefulset/simple-hdfs-namenode-default
97+
kubectl rollout status --watch --timeout=5m statefulset/simple-hdfs-journalnode-default
7898
# end::watch-hdfs-rollout[]
7999

80100
echo "Creating Helper"
81101
# tag::install-webhdfs[]
82102
kubectl apply -f webhdfs.yaml
83103
# end::install-webhdfs[]
84104

85-
sleep 5
105+
for (( i=1; i<=15; i++ ))
106+
do
107+
echo "Waiting for Webhdfs helper to appear ..."
108+
if eval kubectl get statefulset webhdfs; then
109+
break
110+
fi
111+
112+
sleep 1
113+
done
86114

87115
echo "Awaiting helper rollout finish"
88116
# tag::watch-helper-rollout[]
89-
kubectl rollout status --watch statefulset/webhdfs
117+
kubectl rollout status --watch --timeout=5m statefulset/webhdfs
90118
# end::watch-helper-rollout[]
91119

92120
file_status() {

‎docs/modules/hdfs/examples/getting_started/getting_started.sh.j2‎

Lines changed: 36 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ echo "Adding '{{ helm.repo_name }}' Helm Chart repository"
2222
# tag::helm-add-repo[]
2323
helm repo add {{ helm.repo_name }} {{ helm.repo_url }}
2424
# end::helm-add-repo[]
25+
echo "Updating Helm repo"
26+
helm repo update
2527
echo "Installing Operators with Helm"
2628
# tag::helm-install-operators[]
2729
helm install --wait zookeeper-operator {{ helm.repo_name }}/zookeeper-operator --version {{ versions.zookeeper }}
@@ -56,37 +58,63 @@ echo "Creating ZNode"
5658
kubectl apply -f znode.yaml
5759
# end::install-zk[]
5860

59-
sleep 5
61+
62+
63+
for (( i=1; i<=15; i++ ))
64+
do
65+
echo "Waiting for ZookeeperCluster to appear ..."
66+
if eval kubectl get statefulset simple-zk-server-default; then
67+
break
68+
fi
69+
70+
sleep 1
71+
done
6072

6173
echo "Awaiting Zookeeper rollout finish"
6274
# tag::watch-zk-rollout[]
63-
kubectl rollout status --watch statefulset/simple-zk-server-default
75+
kubectl rollout status --watch --timeout=5m statefulset/simple-zk-server-default
6476
# end::watch-zk-rollout[]
6577

6678
echo "Creating HDFS cluster"
6779
# tag::install-hdfs[]
6880
kubectl apply -f hdfs.yaml
6981
# end::install-hdfs[]
7082

71-
sleep 5
83+
for (( i=1; i<=15; i++ ))
84+
do
85+
echo "Waiting for HdfsCluster to appear ..."
86+
if eval kubectl get statefulset simple-hdfs-datanode-default; then
87+
break
88+
fi
89+
90+
sleep 1
91+
done
7292

7393
echo "Awaiting HDFS rollout finish"
7494
# tag::watch-hdfs-rollout[]
75-
kubectl rollout status --watch statefulset/simple-hdfs-datanode-default
76-
kubectl rollout status --watch statefulset/simple-hdfs-namenode-default
77-
kubectl rollout status --watch statefulset/simple-hdfs-journalnode-default
95+
kubectl rollout status --watch --timeout=5m statefulset/simple-hdfs-datanode-default
96+
kubectl rollout status --watch --timeout=5m statefulset/simple-hdfs-namenode-default
97+
kubectl rollout status --watch --timeout=5m statefulset/simple-hdfs-journalnode-default
7898
# end::watch-hdfs-rollout[]
7999

80100
echo "Creating Helper"
81101
# tag::install-webhdfs[]
82102
kubectl apply -f webhdfs.yaml
83103
# end::install-webhdfs[]
84104

85-
sleep 5
105+
for (( i=1; i<=15; i++ ))
106+
do
107+
echo "Waiting for Webhdfs helper to appear ..."
108+
if eval kubectl get statefulset webhdfs; then
109+
break
110+
fi
111+
112+
sleep 1
113+
done
86114

87115
echo "Awaiting helper rollout finish"
88116
# tag::watch-helper-rollout[]
89-
kubectl rollout status --watch statefulset/webhdfs
117+
kubectl rollout status --watch --timeout=5m statefulset/webhdfs
90118
# end::watch-helper-rollout[]
91119

92120
file_status() {

‎docs/templating_vars.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ helm:
33
repo_name: stackable-dev
44
repo_url: https://repo.stackable.tech/repository/helm-dev/
55
versions:
6-
commons: 0.5.0-nightly
7-
secret: 0.7.0-nightly
8-
zookeeper: 0.13.0-nightly
9-
hdfs: 0.7.0-nightly
6+
commons: 0.0.0-dev
7+
secret: 0.0.0-dev
8+
zookeeper: 0.0.0-dev
9+
hdfs: 0.0.0-dev

0 commit comments

Comments
 (0)