Skip to content

Commit 33b6de2

Browse files
committed
[kubernetes] refactoring checking k8s version for nitpick comment by rabbit
Signed-off-by: IvanHunters <[email protected]>
1 parent cf989f2 commit 33b6de2

1 file changed

Lines changed: 1 addition & 5 deletions

File tree

‎hack/e2e-apps/kubernetes.bats‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ EOF
9595
bash -c 'timeout 40s kubectl port-forward service/kubernetes-'"${test_name}"' -n tenant-test '"${port}"':6443 > /dev/null 2>&1 &'
9696

9797
# Verify the Kubernetes version matches what we expect (retry for up to 20 seconds)
98-
timeout 20 sh -ec 'until kubectl --kubeconfig tenantkubeconfig version 2>/dev/null | grep -q "Server Version: ${k8s_version}"; do sleep 5; done'
98+
timeout 20 sh -ec 'until kubectl --kubeconfig tenantkubeconfig version 2>/dev/null | grep -Fq "Server Version: ${k8s_version}"; do sleep 5; done'
9999

100100
# Wait for all machine deployment replicas to be ready (timeout after 10 minutes)
101101
kubectl wait machinedeployment kubernetes-${test_name}-md0 -n tenant-test --timeout=10m --for=jsonpath='{.status.v1beta2.readyReplicas}'=2
@@ -106,12 +106,8 @@ EOF
106106
}
107107

108108
@test "Create a tenant Kubernetes control plane with latest version" {
109-
echo "#################_TESTING_OF_LATEST_VERSION_###################"
110109
run_kubernetes_test 'keys | sort_by(.) | .[-1]' 'test-latest-version' '59991'
111-
echo "#############################_END_#############################"
112110
}
113111
@test "Create a tenant Kubernetes control plane with previous version" {
114-
echo "#################_TESTING_OF_PREVIOUS_VERSION_#################"
115112
run_kubernetes_test 'keys | sort_by(.) | .[-2]' 'test-previous-version' '59992'
116-
echo "#############################_END_#############################"
117113
}

0 commit comments

Comments
 (0)