Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .github/scripts/upgrade-rancher-fleet-to-dev-fleet.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ else
agentTag="dev"
fi

downstream_ctx="${FLEET_E2E_CLUSTER_DOWNSTREAM-k3d-downstream}"

kubectl config use-context k3d-upstream

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
Expand Down Expand Up @@ -45,7 +47,7 @@ helm list -A
sleep 5
{ grep -E -q -m 1 "fleet-agent-c.*1/1"; kill $!; } < <(kubectl get bundles -n fleet-default -w)

kubectl config use-context k3d-downstream
kubectl config use-context "$downstream_ctx"
kubectl -n cattle-fleet-system rollout status deployment/fleet-agent

helm list -A
4 changes: 3 additions & 1 deletion dev/update-fleet-in-rancher-k3d
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,13 @@ if [ ! -d ./.github/scripts ]; then
exit 1
fi

downstream_ctx="${FLEET_E2E_CLUSTER_DOWNSTREAM-k3d-downstream1}"

fleet_version="${1-0.7.0-rc.2}"
if [ "$fleet_version" == "dev" ]; then
echo "don't forget to run dev/build-fleet before running this script"
dev/import-images-k3d
./.github/scripts/upgrade-rancher-fleet-to-dev-fleet.sh
FLEET_E2E_CLUSTER_DOWNSTREAM="$downstream_ctx" ./.github/scripts/upgrade-rancher-fleet-to-dev-fleet.sh
exit 0
fi

Expand Down