diff --git a/experiment/compatibility-versions/e2e-k8s-compatibility-versions.sh b/experiment/compatibility-versions/e2e-k8s-compatibility-versions.sh index e3fcad1b3d73..dd44f2fcf28c 100755 --- a/experiment/compatibility-versions/e2e-k8s-compatibility-versions.sh +++ b/experiment/compatibility-versions/e2e-k8s-compatibility-versions.sh @@ -283,7 +283,7 @@ run_tests() { } upgrade_cluster_components() { - # upgrade cluster components excluding kube-proxy and kubelet + # upgrade cluster components excluding the kubelet # Get the retry attempts, defaulting to 5 if not set RETRY_ATTEMPTS="${RETRY_ATTEMPTS:-5}" @@ -291,12 +291,12 @@ upgrade_cluster_components() { local attempt=1 local success=false - echo "Attempt $attempt of $RETRY_ATTEMPTS to upgrade cluster..." - bash -x "${UPGRADE_SCRIPT}" --no-kproxy --no-kubelet | tee "${ARTIFACTS}/upgrade-output-1.txt" - bash -x "${UPGRADE_SCRIPT}" --no-kproxy --no-kubelet | tee "${ARTIFACTS}/upgrade-output-2.txt" + bash -x "${UPGRADE_SCRIPT}" --no-kubelet | tee "${ARTIFACTS}/upgrade-output-1.txt" + bash -x "${UPGRADE_SCRIPT}" --no-kubelet | tee "${ARTIFACTS}/upgrade-output-2.txt" # Run the script twice, is necessary for fully updating the binaries while [ "$attempt" -le "$RETRY_ATTEMPTS" ]; do + echo "Attempt $attempt of $RETRY_ATTEMPTS to upgrade cluster..." # Check if kubectl version reports the current version kind export kubeconfig --name kind if kubectl version | grep "Server Version:"| grep -q "$CURRENT_VERSION"; then diff --git a/experiment/compatibility-versions/kind-upgrade.sh b/experiment/compatibility-versions/kind-upgrade.sh index 62f24b48979b..6ce97e34b69d 100755 --- a/experiment/compatibility-versions/kind-upgrade.sh +++ b/experiment/compatibility-versions/kind-upgrade.sh @@ -34,26 +34,6 @@ update_kubelet() { done } -update_kube_proxy() { - for n in $NODES; do - kind load image-archive ${IMAGES_PATH}/kube-proxy.tar --name ${CLUSTER_NAME} - done - # RollingUpdate - kubectl set image ds/kube-proxy kube-proxy=${DOCKER_REGISTRY}/kube-proxy-amd64:${DOCKER_TAG} -n kube-system - kubectl rollout status ds/kube-proxy -n kube-system -w - echo "Updated kube-proxy" -} - -update_cni() { - for n in $NODES; do - kind load image-archive ${CNI_IMAGE} --name ${CLUSTER_NAME} - done - # RollingUpdate - kubectl set image ds/kindnet kindnet-cni=${CNI_IMAGE} -n kube-system - kubectl rollout status ds/kindnet -n kube-system -w - echo "Updated kindnet" -} - update_control_plane(){ # TODO allow to configure node and control plane components for n in $CONTROL_PLANE_NODES; do @@ -68,8 +48,8 @@ update_control_plane(){ usage() { - echo "usage: kind_upgrade.sh [-n|--name ] [--cni ]" - echo " [--no-kproxy] [--no-control-plane] [--no-kubelet]" + echo "usage: kind_upgrade.sh [-n|--name ]" + echo " [--no-control-plane] [--no-kubelet]" echo "" } @@ -80,11 +60,6 @@ parse_args() -n | --name ) shift CLUSTER_NAME=$1 ;; - --cni-image ) shift - CNI_IMAGE=$1 - ;; - --no-kproxy ) UPDATE_KUBE_PROXY=false - ;; --no-kubelet ) UPDATE_KUBELET=false ;; --no-control-plane ) UPDATE_CONTROL_PLANE=false @@ -139,15 +114,6 @@ if [[ "$UPDATE_KUBELET" == "true" ]]; then update_kubelet fi -if [[ "$UPDATE_KUBE_PROXY" == "true" ]]; then - update_kube_proxy -fi - -# If CNI_IMAGE set update the CNI -if [[ ! -z ${CNI_IMAGE} ]]; then - update_cni -fi - if kubectl get nodes | grep NoReady; then echo "Error: KIND cluster $CLUSTER_NAME NOT READY" exit 1