Skip to content

Commit be7350f

Browse files
committed
[kubernetes] refactoring doubles for difference k8s versions
Signed-off-by: IvanHunters <[email protected]>
1 parent 636fb2f commit be7350f

2 files changed

Lines changed: 31 additions & 121 deletions

File tree

‎hack/e2e-apps/kubernetes-latest-version.bats‎

Lines changed: 0 additions & 103 deletions
This file was deleted.

hack/e2e-apps/kubernetes-previous-version.bats renamed to hack/e2e-apps/kubernetes.bats

Lines changed: 31 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
#!/usr/bin/env bats
22

3-
@test "Create a previous version tenant Kubernetes control plane" {
4-
# Get latest version of k8s from gcr
5-
PREVIOUS_K8S_VERSION=$(yq 'keys | .[-2]' ../packages/apps/kubernetes/files/versions.yaml)
6-
TEMPORAL_TENANT_PORT=59992
3+
run_kubernetes_test() {
4+
local version_expr="$1"
5+
local test_name="$2"
6+
local port="$3"
7+
local k8s_version=$(yq "$version_expr" ../packages/apps/kubernetes/files/versions.yaml)
78

89
kubectl apply -f - <<EOF
910
apiVersion: apps.cozystack.io/v1alpha1
1011
kind: Kubernetes
1112
metadata:
12-
name: test-previous
13+
name: "${test_name}"
1314
namespace: tenant-test
1415
spec:
1516
addons:
@@ -64,41 +65,53 @@ spec:
6465
roles:
6566
- ingress-nginx
6667
storageClass: replicated
67-
version: "$PREVIOUS_K8S_VERSION"
68+
version: "${k8s_version}"
6869
EOF
6970
# Wait for the tenant-test namespace to be active
7071
kubectl wait namespace tenant-test --timeout=20s --for=jsonpath='{.status.phase}'=Active
7172

7273
# Wait for the Kamaji control plane to be created (retry for up to 10 seconds)
73-
timeout 10 sh -ec 'until kubectl get kamajicontrolplane -n tenant-test kubernetes-test-previous; do sleep 1; done'
74-
74+
timeout 10 sh -ec 'until kubectl get kamajicontrolplane -n tenant-test kubernetes-'"${test_name}"'; do sleep 1; done'
75+
7576
# Wait for the tenant control plane to be fully created (timeout after 4 minutes)
76-
kubectl wait --for=condition=TenantControlPlaneCreated kamajicontrolplane -n tenant-test kubernetes-test-previous --timeout=4m
77+
kubectl wait --for=condition=TenantControlPlaneCreated kamajicontrolplane -n tenant-test kubernetes-${test_name} --timeout=4m
7778

7879
# Wait for Kubernetes resources to be ready (timeout after 2 minutes)
79-
kubectl wait tcp -n tenant-test kubernetes-test-previous --timeout=2m --for=jsonpath='{.status.kubernetesResources.version.status}'=Ready
80+
kubectl wait tcp -n tenant-test kubernetes-${test_name} --timeout=2m --for=jsonpath='{.status.kubernetesResources.version.status}'=Ready
8081

8182
# Wait for all required deployments to be available (timeout after 4 minutes)
82-
kubectl wait deploy --timeout=4m --for=condition=available -n tenant-test kubernetes-test-previous kubernetes-test-previous-cluster-autoscaler kubernetes-test-previous-kccm kubernetes-test-previous-kcsi-controller
83+
kubectl wait deploy --timeout=4m --for=condition=available -n tenant-test kubernetes-${test_name} kubernetes-${test_name}-cluster-autoscaler kubernetes-${test_name}-kccm kubernetes-${test_name}-kcsi-controller
8384

8485
# Wait for the machine deployment to scale to 2 replicas (timeout after 1 minute)
85-
kubectl wait machinedeployment kubernetes-test-previous-md0 -n tenant-test --timeout=1m --for=jsonpath='{.status.replicas}'=2
86+
kubectl wait machinedeployment kubernetes-${test_name}-md0 -n tenant-test --timeout=1m --for=jsonpath='{.status.replicas}'=2
8687

8788
# Get the admin kubeconfig and save it to a file
88-
kubectl get secret kubernetes-test-previous-admin-kubeconfig -ojsonpath='{.data.super-admin\.conf}' -n tenant-test | base64 -d > tenantkubeconfig
89+
kubectl get secret kubernetes-${test_name}-admin-kubeconfig -ojsonpath='{.data.super-admin\.conf}' -n tenant-test | base64 -d > tenantkubeconfig
8990

9091
# Update the kubeconfig to use localhost for the API server
91-
yq -i ".clusters[0].cluster.server = \"https://localhost:${TEMPORAL_TENANT_PORT}\"" tenantkubeconfig
92+
yq -i ".clusters[0].cluster.server = \"https://localhost:${port}\"" tenantkubeconfig
9293

9394
# Set up port forwarding to the Kubernetes API server for a 40 second timeout
94-
bash -c 'timeout 40s kubectl port-forward service/kubernetes-test-previous -n tenant-test '"${TEMPORAL_TENANT_PORT}"':6443 > /dev/null 2>&1 &'
95+
bash -c 'timeout 40s kubectl port-forward service/kubernetes-'"${test_name}"' -n tenant-test '"${port}"':6443 > /dev/null 2>&1 &'
9596

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

99100
# Wait for all machine deployment replicas to be ready (timeout after 10 minutes)
100-
kubectl wait machinedeployment kubernetes-test-previous-md0 -n tenant-test --timeout=10m --for=jsonpath='{.status.v1beta2.readyReplicas}'=2
101+
kubectl wait machinedeployment kubernetes-${test_name}-md0 -n tenant-test --timeout=10m --for=jsonpath='{.status.v1beta2.readyReplicas}'=2
101102

102103
# Clean up by deleting the Kubernetes resource
103-
kubectl -n tenant-test delete kuberneteses.apps.cozystack.io test-previous
104+
kubectl -n tenant-test delete kuberneteses.apps.cozystack.io $test_name
105+
106+
}
107+
108+
@test "Create a tenant Kubernetes control plane with latest version" {
109+
echo "#################_TESTING_OF_LATEST_VERSION_###################"
110+
run_kubernetes_test 'keys | sort_by(.) | .[-1]' 'test-latest-version' '59991'
111+
echo "#############################_END_#############################"
112+
}
113+
@test "Create a tenant Kubernetes control plane with previous version" {
114+
echo "#################_TESTING_OF_PREVIOUS_VERSION_#################"
115+
run_kubernetes_test 'keys | sort_by(.) | .[-2]' 'test-previous-version' '59992'
116+
echo "#############################_END_#############################"
104117
}

0 commit comments

Comments
 (0)