Skip to content

Commit 2e88b68

Browse files
committed
Use downstream ctx variable in Fleet update dev script
1 parent 95528cd commit 2e88b68

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

.github/scripts/upgrade-rancher-fleet-to-dev-fleet.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ else
1515
agentTag="dev"
1616
fi
1717

18+
downstream_ctx="${FLEET_E2E_CLUSTER_DOWNSTREAM-k3d-downstream}"
19+
1820
kubectl config use-context k3d-upstream
1921

2022
until helm -n cattle-fleet-system status fleet-crd | grep -q "STATUS: deployed"; do echo waiting for original fleet-crd chart to be deployed; sleep 1; done
@@ -45,7 +47,7 @@ helm list -A
4547
sleep 5
4648
{ grep -E -q -m 1 "fleet-agent-c.*1/1"; kill $!; } < <(kubectl get bundles -n fleet-default -w)
4749

48-
kubectl config use-context k3d-downstream
50+
kubectl config use-context "$downstream_ctx"
4951
kubectl -n cattle-fleet-system rollout status deployment/fleet-agent
5052

5153
helm list -A

dev/update-fleet-in-rancher-k3d

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@ if [ ! -d ./.github/scripts ]; then
77
exit 1
88
fi
99

10+
downstream_ctx="${FLEET_E2E_CLUSTER_DOWNSTREAM-k3d-downstream1}"
11+
1012
fleet_version="${1-0.7.0-rc.2}"
1113
if [ "$fleet_version" == "dev" ]; then
1214
echo "don't forget to run dev/build-fleet before running this script"
1315
dev/import-images-k3d
14-
./.github/scripts/upgrade-rancher-fleet-to-dev-fleet.sh
16+
FLEET_E2E_CLUSTER_DOWNSTREAM="$downstream_ctx" ./.github/scripts/upgrade-rancher-fleet-to-dev-fleet.sh
1517
exit 0
1618
fi
1719

0 commit comments

Comments
 (0)