@@ -39,7 +39,6 @@ E2E_TEST_CMD="${TEMP_DIR}/e2e-${PLATFORM} ${COMMON_TEST_ARGS}"
39
39
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"
40
40
41
41
KUBEFED_UPGRADE_TEST_NS=" upgrade-test"
42
- KUBEFED_UPGRADE_TEST_VERSION=" v0.5.0"
43
42
44
43
function build-binaries() {
45
44
${MAKE_CMD} hyperfed
@@ -73,15 +72,33 @@ function run-e2e-upgrade-test() {
73
72
74
73
echo " Adding a repo to install an older kubefed version"
75
74
helm repo add kubefed-charts https://raw.githubusercontent.com/kubernetes-sigs/kubefed/master/charts
75
+ helm repo update
76
76
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 )
79
79
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} "
82
85
83
86
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
85
102
86
103
deployment-image-as-expected " ${KUBEFED_UPGRADE_TEST_NS} " kubefed-admission-webhook admission-webhook " local/kubefed:e2e"
87
104
deployment-image-as-expected " ${KUBEFED_UPGRADE_TEST_NS} " kubefed-controller-manager controller-manager " local/kubefed:e2e"
0 commit comments