Skip to content
This repository was archived by the owner on Apr 25, 2023. It is now read-only.

Commit 14c62f2

Browse files
hectorj2fHector Fernandez
authored and
Hector Fernandez
committed
chore: extract the previous stable version for upgrade
Signed-off-by: Hector Fernandez <[email protected]> Signed-off-by: Hector Fernandez <[email protected]>
1 parent 8a435bc commit 14c62f2

File tree

1 file changed

+23
-6
lines changed

1 file changed

+23
-6
lines changed

scripts/pre-commit.sh

+23-6
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ E2E_TEST_CMD="${TEMP_DIR}/e2e-${PLATFORM} ${COMMON_TEST_ARGS}"
3939
IN_MEMORY_E2E_TEST_CMD="go test -v -timeout 900s -race ./test/e2e -args ${COMMON_TEST_ARGS} -in-memory-controllers=true -limited-scope-in-memory-controllers=false"
4040

4141
KUBEFED_UPGRADE_TEST_NS="upgrade-test"
42-
KUBEFED_UPGRADE_TEST_VERSION="v0.5.0"
4342

4443
function build-binaries() {
4544
${MAKE_CMD} hyperfed
@@ -73,15 +72,33 @@ function run-e2e-upgrade-test() {
7372

7473
echo "Adding a repo to install an older kubefed version"
7574
helm repo add kubefed-charts https://raw.githubusercontent.com/kubernetes-sigs/kubefed/master/charts
75+
helm repo update
7676

77-
echo "Installing an older kubefed version ${KUBEFED_UPGRADE_TEST_VERSION}"
78-
helm install kubefed kubefed-charts/kubefed --namespace ${KUBEFED_UPGRADE_TEST_NS} --version=${KUBEFED_UPGRADE_TEST_VERSION} --create-namespace
77+
# Get the previous version prior to our latest stable version
78+
KUBEFED_UPGRADE_TEST_VERSION=$(helm search repo kubefed-charts/kubefed --versions | awk '{print $2}' | head -3 | tail -1)
7979

80-
deployment-image-as-expected "${KUBEFED_UPGRADE_TEST_NS}" kubefed-admission-webhook admission-webhook "quay.io/kubernetes-multicluster/kubefed:${KUBEFED_UPGRADE_TEST_VERSION}"
81-
deployment-image-as-expected "${KUBEFED_UPGRADE_TEST_NS}" kubefed-controller-manager controller-manager "quay.io/kubernetes-multicluster/kubefed:${KUBEFED_UPGRADE_TEST_VERSION}"
80+
echo "Installing an older kubefed version v${KUBEFED_UPGRADE_TEST_VERSION}"
81+
helm install kubefed kubefed-charts/kubefed --namespace ${KUBEFED_UPGRADE_TEST_NS} --version=v${KUBEFED_UPGRADE_TEST_VERSION} --create-namespace
82+
83+
deployment-image-as-expected "${KUBEFED_UPGRADE_TEST_NS}" kubefed-admission-webhook admission-webhook "quay.io/kubernetes-multicluster/kubefed:v${KUBEFED_UPGRADE_TEST_VERSION}"
84+
deployment-image-as-expected "${KUBEFED_UPGRADE_TEST_NS}" kubefed-controller-manager controller-manager "quay.io/kubernetes-multicluster/kubefed:v${KUBEFED_UPGRADE_TEST_VERSION}"
8285

8386
echo "Upgrading kubefed to current version"
84-
KUBEFED_NAMESPACE=$KUBEFED_UPGRADE_TEST_NS KIND_CLUSTER_NAME=${HOST_CLUSTER} KIND_LOAD_IMAGE=y ./scripts/deploy-kubefed.sh local/kubefed:e2e "${join_cluster_list[@]-}"
87+
IMAGE_NAME="local/kubefed:e2e"
88+
local repository=${IMAGE_NAME%/*}
89+
local image_tag=${IMAGE_NAME##*/}
90+
local image=${image_tag%:*}
91+
local tag=${image_tag#*:}
92+
93+
helm upgrade -i kubefed charts/kubefed --namespace ${KUBEFED_UPGRADE_TEST_NS} \
94+
--set controllermanager.controller.repository=${repo} \
95+
--set controllermanager.controller.image=${image} \
96+
--set controllermanager.controller.tag=${tag} \
97+
--set controllermanager.webhook.repository=${repo} \
98+
--set controllermanager.webhook.image=${image} \
99+
--set controllermanager.webhook.tag=${tag} \
100+
--set controllermanager.featureGates.CrossClusterServiceDiscovery=Enabled,controllermanager.featureGates.FederatedIngress=Enabled,controllermanager.featureGates.RawResourceStatusCollection=Enabled \
101+
--wait
85102

86103
deployment-image-as-expected "${KUBEFED_UPGRADE_TEST_NS}" kubefed-admission-webhook admission-webhook "local/kubefed:e2e"
87104
deployment-image-as-expected "${KUBEFED_UPGRADE_TEST_NS}" kubefed-controller-manager controller-manager "local/kubefed:e2e"

0 commit comments

Comments
 (0)