Skip to content

Commit f413caa

Browse files
gwynbleidd2106gwynbleidd2106
committed
Run test w/ requests and limits
Signed-off-by: Ahmad Murzahmatov <[email protected]>
1 parent a0d2f94 commit f413caa

8 files changed

Lines changed: 123 additions & 26 deletions

File tree

‎hack/e2e-apps/clickhouse.bats‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,21 @@
22

33
@test "Create DB ClickHouse" {
44
name='test'
5+
withResources='true'
6+
if [ "$withResources" == 'true' ]; then
7+
resources=$(cat <<EOF
8+
resources:
9+
requests:
10+
cpu: 500m
11+
memory: 768Mi
12+
limits:
13+
cpu: "1000m"
14+
memory: "1Gi"
15+
EOF
16+
)
17+
else
18+
resources=' resources: {}'
19+
fi
520
kubectl -n tenant-test get clickhouses.apps.cozystack.io $name ||
621
kubectl create -f- <<EOF
722
apiVersion: apps.cozystack.io/v1alpha1
@@ -28,15 +43,15 @@ spec:
2843
s3AccessKey: oobaiRus9pah8PhohL1ThaeTa4UVa7gu
2944
s3SecretKey: ju3eum4dekeich9ahM1te8waeGai0oog
3045
resticPassword: ChaXoveekoh6eigh4siesheeda2quai0
31-
resources: {}
46+
$resources
3247
resourcesPreset: "nano"
3348
EOF
3449
sleep 5
35-
kubectl -n tenant-test wait hr clickhouse-$name --timeout=20s --for=condition=ready
50+
kubectl -n tenant-test wait hr clickhouse-$name --timeout=40s --for=condition=ready
3651
timeout 180 sh -ec "until kubectl -n tenant-test get svc chendpoint-clickhouse-$name -o jsonpath='{.spec.ports[*].port}' | grep -q '8123 9000'; do sleep 10; done"
3752
kubectl -n tenant-test wait statefulset.apps/chi-clickhouse-$name-clickhouse-0-0 --timeout=120s --for=jsonpath='{.status.replicas}'=1
38-
timeout 80 sh -ec "until kubectl -n tenant-test get endpoints chi-clickhouse-$name-clickhouse-0-0 -o jsonpath='{.subsets[*].addresses[*].ip}' | grep -q '[0-9]'; do sleep 10; done"
3953
timeout 100 sh -ec "until kubectl -n tenant-test get svc chi-clickhouse-$name-clickhouse-0-0 -o jsonpath='{.spec.ports[*].port}' | grep -q '9000 8123 9009'; do sleep 10; done"
4054
timeout 80 sh -ec "until kubectl -n tenant-test get sts chi-clickhouse-$name-clickhouse-0-1 ; do sleep 10; done"
4155
kubectl -n tenant-test wait statefulset.apps/chi-clickhouse-$name-clickhouse-0-1 --timeout=140s --for=jsonpath='{.status.replicas}'=1
56+
kubectl -n tenant-test delete clickhouse.apps.cozystack.io $name
4257
}

‎hack/e2e-apps/kafka.bats‎

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,22 @@
22

33
@test "Create Kafka" {
44
name='test'
5+
withResources='true'
6+
if [ "$withResources" == 'true' ]; then
7+
resources=$(cat <<EOF
8+
resources:
9+
requests:
10+
cpu: 500m
11+
memory: 768Mi
12+
limits:
13+
cpu: "1000m"
14+
memory: "1Gi"
15+
EOF
16+
)
17+
else
18+
resources='resources: {}'
19+
fi
20+
kubectl -n tenant-test get kafkas.apps.cozystack.io $name ||
521
kubectl create -f- <<EOF
622
apiVersion: apps.cozystack.io/v1alpha1
723
kind: Kafka
@@ -14,13 +30,13 @@ spec:
1430
size: 10Gi
1531
replicas: 2
1632
storageClass: ""
17-
resources: {}
33+
$resources
1834
resourcesPreset: "nano"
1935
zookeeper:
2036
size: 5Gi
2137
replicas: 2
2238
storageClass: ""
23-
resources:
39+
$resources
2440
resourcesPreset: "nano"
2541
topics:
2642
- name: testResults
@@ -39,13 +55,10 @@ spec:
3955
EOF
4056
sleep 5
4157
kubectl -n tenant-test wait hr kafka-$name --timeout=30s --for=condition=ready
42-
kubectl wait kafkas -n tenant-test test --timeout=60s --for=condition=ready
58+
kubectl wait kafkas -n tenant-test $name --timeout=60s --for=condition=ready
4359
timeout 60 sh -ec "until kubectl -n tenant-test get pvc data-kafka-$name-zookeeper-0; do sleep 10; done"
4460
kubectl -n tenant-test wait pvc data-kafka-$name-zookeeper-0 --timeout=50s --for=jsonpath='{.status.phase}'=Bound
4561
timeout 40 sh -ec "until kubectl -n tenant-test get svc kafka-$name-zookeeper-client -o jsonpath='{.spec.ports[0].port}' | grep -q '2181'; do sleep 10; done"
4662
timeout 40 sh -ec "until kubectl -n tenant-test get svc kafka-$name-zookeeper-nodes -o jsonpath='{.spec.ports[*].port}' | grep -q '2181 2888 3888'; do sleep 10; done"
47-
timeout 80 sh -ec "until kubectl -n tenant-test get endpoints kafka-$name-zookeeper-nodes -o jsonpath='{.subsets[*].addresses[0].ip}' | grep -q '[0-9]'; do sleep 10; done"
4863
kubectl -n tenant-test delete kafka.apps.cozystack.io $name
49-
kubectl -n tenant-test delete pvc data-kafka-$name-zookeeper-0
50-
kubectl -n tenant-test delete pvc data-kafka-$name-zookeeper-1
5164
}

‎hack/e2e-apps/kubernetes.bats‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ EOF
6565
kubectl wait namespace tenant-test --timeout=20s --for=jsonpath='{.status.phase}'=Active
6666
timeout 10 sh -ec 'until kubectl get kamajicontrolplane -n tenant-test kubernetes-test; do sleep 1; done'
6767
kubectl wait --for=condition=TenantControlPlaneCreated kamajicontrolplane -n tenant-test kubernetes-test --timeout=4m
68-
kubectl wait tcp -n tenant-test kubernetes-test --timeout=2m --for=jsonpath='{.status.kubernetesResources.version.status}'=Ready
68+
kubectl wait tcp -n tenant-test kubernetes-test --timeout=210s --for=jsonpath='{.status.kubernetesResources.version.status}'=Ready
6969
kubectl wait deploy --timeout=4m --for=condition=available -n tenant-test kubernetes-test kubernetes-test-cluster-autoscaler kubernetes-test-kccm kubernetes-test-kcsi-controller
7070
kubectl wait machinedeployment kubernetes-test-md0 -n tenant-test --timeout=1m --for=jsonpath='{.status.replicas}'=2
7171
kubectl wait machinedeployment kubernetes-test-md0 -n tenant-test --timeout=10m --for=jsonpath='{.status.v1beta2.readyReplicas}'=2

‎hack/e2e-apps/mysql.bats‎

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,21 @@
22

33
@test "Create DB MySQL" {
44
name='test'
5+
withResources='true'
6+
if [ "$withResources" == 'true' ]; then
7+
resources=$(cat <<EOF
8+
resources:
9+
requests:
10+
cpu: 500m
11+
memory: 768Mi
12+
limits:
13+
cpu: "1000m"
14+
memory: "1Gi"
15+
EOF
16+
)
17+
else
18+
resources=' resources: {}'
19+
fi
520
kubectl -n tenant-test get mysqls.apps.cozystack.io $name ||
621
kubectl create -f- <<EOF
722
apiVersion: apps.cozystack.io/v1alpha1
@@ -32,16 +47,14 @@ spec:
3247
s3AccessKey: oobaiRus9pah8PhohL1ThaeTa4UVa7gu
3348
s3SecretKey: ju3eum4dekeich9ahM1te8waeGai0oog
3449
resticPassword: ChaXoveekoh6eigh4siesheeda2quai0
35-
resources: {}
50+
$resources
3651
resourcesPreset: "nano"
3752
EOF
3853
sleep 5
3954
kubectl -n tenant-test wait hr mysql-$name --timeout=30s --for=condition=ready
4055
timeout 80 sh -ec "until kubectl -n tenant-test get svc mysql-$name -o jsonpath='{.spec.ports[0].port}' | grep -q '3306'; do sleep 10; done"
41-
timeout 80 sh -ec "until kubectl -n tenant-test get endpoints mysql-$name -o jsonpath='{.subsets[*].addresses[*].ip}' | grep -q '[0-9]'; do sleep 10; done"
4256
kubectl -n tenant-test wait statefulset.apps/mysql-$name --timeout=110s --for=jsonpath='{.status.replicas}'=2
43-
timeout 80 sh -ec "until kubectl -n tenant-test get svc mysql-$name-metrics -o jsonpath='{.spec.ports[0].port}' | grep -q '9104'; do sleep 10; done"
44-
timeout 40 sh -ec "until kubectl -n tenant-test get endpoints mysql-$name-metrics -o jsonpath='{.subsets[*].addresses[*].ip}' | grep -q '[0-9]'; do sleep 10; done"
45-
kubectl -n tenant-test wait deployment.apps/mysql-$name-metrics --timeout=90s --for=jsonpath='{.status.replicas}'=1
57+
timeout 80 sh -ec "until kubectl -n tenant-test get svc mysql-$name -o jsonpath='{.spec.ports[0].port}' | grep -q '3306'; do sleep 10; done"
58+
kubectl -n tenant-test wait deployment.apps/mysql-$name-metrics --timeout=130s --for=jsonpath='{.status.replicas}'=1
4659
kubectl -n tenant-test delete mysqls.apps.cozystack.io $name
4760
}

‎hack/e2e-apps/postgres.bats‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,21 @@
22

33
@test "Create DB PostgreSQL" {
44
name='test'
5+
withResources='true'
6+
if [ "$withResources" == 'true' ]; then
7+
resources=$(cat <<EOF
8+
resources:
9+
requests:
10+
cpu: 500m
11+
memory: 768Mi
12+
limits:
13+
cpu: "1000m"
14+
memory: "1Gi"
15+
EOF
16+
)
17+
else
18+
resources=' resources: {}'
19+
fi
520
kubectl -n tenant-test get postgreses.apps.cozystack.io $name ||
621
kubectl create -f - <<EOF
722
apiVersion: apps.cozystack.io/v1alpha1
@@ -37,19 +52,15 @@ spec:
3752
s3AccessKey: oobaiRus9pah8PhohL1ThaeTa4UVa7gu
3853
s3SecretKey: ju3eum4dekeich9ahM1te8waeGai0oog
3954
resticPassword: ChaXoveekoh6eigh4siesheeda2quai0
40-
resources: {}
55+
$resources
4156
resourcesPreset: "nano"
4257
EOF
4358
sleep 5
44-
kubectl -n tenant-test wait hr postgres-$name --timeout=100s --for=condition=ready
59+
kubectl -n tenant-test wait hr postgres-$name --timeout=150s --for=condition=ready
4560
kubectl -n tenant-test wait job.batch postgres-$name-init-job --timeout=50s --for=condition=Complete
4661
timeout 40 sh -ec "until kubectl -n tenant-test get svc postgres-$name-r -o jsonpath='{.spec.ports[0].port}' | grep -q '5432'; do sleep 10; done"
4762
timeout 40 sh -ec "until kubectl -n tenant-test get svc postgres-$name-ro -o jsonpath='{.spec.ports[0].port}' | grep -q '5432'; do sleep 10; done"
4863
timeout 40 sh -ec "until kubectl -n tenant-test get svc postgres-$name-rw -o jsonpath='{.spec.ports[0].port}' | grep -q '5432'; do sleep 10; done"
49-
timeout 120 sh -ec "until kubectl -n tenant-test get endpoints postgres-$name-r -o jsonpath='{.subsets[*].addresses[*].ip}' | grep -q '[0-9]'; do sleep 10; done"
50-
# for some reason it takes longer for the read-only endpoint to be ready
51-
#timeout 120 sh -ec "until kubectl -n tenant-test get endpoints postgres-$name-ro -o jsonpath='{.subsets[*].addresses[*].ip}' | grep -q '[0-9]'; do sleep 10; done"
52-
timeout 120 sh -ec "until kubectl -n tenant-test get endpoints postgres-$name-rw -o jsonpath='{.subsets[*].addresses[*].ip}' | grep -q '[0-9]'; do sleep 10; done"
5364
kubectl -n tenant-test delete postgreses.apps.cozystack.io $name
5465
kubectl -n tenant-test delete job.batch/postgres-$name-init-job
5566
}

‎hack/e2e-apps/redis.bats‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,22 @@
22

33
@test "Create Redis" {
44
name='test'
5+
withResources='true'
6+
if [ "$withResources" == 'true' ]; then
7+
resources=$(cat <<EOF
8+
resources:
9+
requests:
10+
cpu: 500m
11+
memory: 768Mi
12+
limits:
13+
cpu: "1000m"
14+
memory: "1Gi"
15+
EOF
16+
)
17+
else
18+
resources='resources: {}'
19+
fi
20+
kubectl -n tenant-test get redis.apps.cozystack.io $name ||
521
kubectl create -f- <<EOF
622
apiVersion: apps.cozystack.io/v1alpha1
723
kind: Redis
@@ -14,7 +30,7 @@ spec:
1430
replicas: 2
1531
storageClass: ""
1632
authEnabled: true
17-
resources: {}
33+
$resources
1834
resourcesPreset: "nano"
1935
EOF
2036
sleep 5

‎hack/e2e-apps/virtualmachine.bats‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,22 @@
22

33
@test "Create a Virtual Machine" {
44
name='test'
5+
withResources='true'
6+
if [ "$withResources" == 'true' ]; then
7+
resources=$(cat <<EOF
8+
resources:
9+
limits:
10+
requests:
11+
cpu: 500m
12+
memory: 768Mi
13+
limits:
14+
cpu: "1000m"
15+
memory: "1Gi"
16+
EOF
17+
)
18+
else
19+
resources='resources: {}'
20+
fi
521
kubectl -n tenant-test get virtualmachines.apps.cozystack.io $name ||
622
kubectl create -f - <<EOF
723
apiVersion: apps.cozystack.io/v1alpha1
@@ -21,9 +37,7 @@ spec:
2137
storage: 5Gi
2238
storageClass: replicated
2339
gpus: []
24-
resources:
25-
cpu: ""
26-
memory: ""
40+
$resources
2741
sshKeys:
2842
- ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPht0dPk5qQ+54g1hSX7A6AUxXJW5T6n/3d7Ga2F8gTF
2943
test@test

‎hack/e2e-apps/vminstance.bats‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,21 @@
22

33
@test "Create a VM Disk" {
44
name='test'
5+
withResources=''
6+
if [ "$withResources" == 'true' ]; then
7+
resources=$(cat <<EOF
8+
resources:
9+
requests:
10+
cpu: 500m
11+
memory: 768Mi
12+
limits:
13+
cpu: "1000m"
14+
memory: "1Gi"
15+
EOF
16+
)
17+
else
18+
resources='resources: {}'
19+
fi
520
kubectl -n tenant-test get vmdisks.apps.cozystack.io $name ||
621
kubectl create -f - <<EOF
722
apiVersion: apps.cozystack.io/v1alpha1
@@ -62,7 +77,7 @@ spec:
6277
cloudInitSeed: ""
6378
EOF
6479
sleep 5
65-
timeout 20 sh -ec "until kubectl -n tenant-test get vmi vm-instance-$name -o jsonpath='{.status.interfaces[0].ipAddress}' | grep -q '[0-9]'; do sleep 5; done"
80+
timeout 40 sh -ec "until kubectl -n tenant-test get vmi vm-instance-$name -o jsonpath='{.status.interfaces[0].ipAddress}' | grep -q '[0-9]'; do sleep 5; done"
6681
kubectl -n tenant-test wait hr vm-instance-$name --timeout=5s --for=condition=ready
6782
kubectl -n tenant-test wait vm vm-instance-$name --timeout=20s --for=condition=ready
6883
kubectl -n tenant-test delete vminstances.apps.cozystack.io $name

0 commit comments

Comments
 (0)