Skip to content

Commit 2988f32

Browse files
Cecile Robert-MichonTerje Torkelsen
Cecile Robert-Michon
authored and
Terje Torkelsen
committed
More e2e tests (Azure#2277)
* add features on and features off * fix off model * add seperate tests for each feature disabled * move features off dir * rbac bool * added clear containers * added addons enabled test * fix typo in apimodel * remove aci-connector * move addons to default
1 parent 3233f36 commit 2988f32

File tree

5 files changed

+208
-4
lines changed

5 files changed

+208
-4
lines changed

‎examples/e2e-tests/kubernetes/kubernetes-config/addons-disabled.json

+56
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
{
2+
"apiVersion": "vlabs",
3+
"properties": {
4+
"orchestratorProfile": {
5+
"orchestratorType": "Kubernetes",
6+
"kubernetesConfig": {
7+
"addons": [
8+
{
9+
"name": "tiller",
10+
"enabled": false
11+
},
12+
{
13+
"name": "aci-connector",
14+
"enabled": false
15+
},
16+
{
17+
"name": "kubernetes-dashboard",
18+
"enabled": false
19+
},
20+
{
21+
"name": "rescheduler",
22+
"enabled": false
23+
}
24+
]
25+
}
26+
},
27+
"masterProfile": {
28+
"count": 1,
29+
"dnsPrefix": "",
30+
"vmSize": "Standard_D2_v2"
31+
},
32+
"agentPoolProfiles": [
33+
{
34+
"name": "linuxpool1",
35+
"count": 3,
36+
"vmSize": "Standard_D2_v2",
37+
"availabilityProfile": "AvailabilitySet"
38+
}
39+
],
40+
"linuxProfile": {
41+
"adminUsername": "azureuser",
42+
"ssh": {
43+
"publicKeys": [
44+
{
45+
"keyData": ""
46+
}
47+
]
48+
}
49+
},
50+
"servicePrincipalProfile": {
51+
"clientId": "",
52+
"secret": ""
53+
},
54+
"certificateProfile": {}
55+
}
56+
}

‎examples/e2e-tests/kubernetes/kubernetes-config/clear-containers.json

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
{
2+
"apiVersion": "vlabs",
3+
"properties": {
4+
"orchestratorProfile": {
5+
"orchestratorType": "Kubernetes",
6+
"kubernetesConfig": {
7+
"containerRuntime": "clear-containers"
8+
}
9+
},
10+
"masterProfile": {
11+
"count": 1,
12+
"dnsPrefix": "",
13+
"vmSize": "Standard_D2_v2"
14+
},
15+
"agentPoolProfiles": [
16+
{
17+
"name": "linuxpool1",
18+
"count": 3,
19+
"vmSize": "Standard_D2_v2",
20+
"availabilityProfile": "AvailabilitySet"
21+
}
22+
],
23+
"linuxProfile": {
24+
"adminUsername": "azureuser",
25+
"ssh": {
26+
"publicKeys": [
27+
{
28+
"keyData": ""
29+
}
30+
]
31+
}
32+
},
33+
"servicePrincipalProfile": {
34+
"clientId": "",
35+
"secret": ""
36+
},
37+
"certificateProfile": {}
38+
}
39+
}

‎examples/e2e-tests/kubernetes/kubernetes-config/network-policy-none.json

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
{
2+
"apiVersion": "vlabs",
3+
"properties": {
4+
"orchestratorProfile": {
5+
"orchestratorType": "Kubernetes",
6+
"kubernetesConfig": {
7+
"networkPolicy":"none"
8+
}
9+
},
10+
"masterProfile": {
11+
"count": 1,
12+
"dnsPrefix": "",
13+
"vmSize": "Standard_D2_v2"
14+
},
15+
"agentPoolProfiles": [
16+
{
17+
"name": "linuxpool1",
18+
"count": 3,
19+
"vmSize": "Standard_D2_v2",
20+
"availabilityProfile": "AvailabilitySet"
21+
}
22+
],
23+
"linuxProfile": {
24+
"adminUsername": "azureuser",
25+
"ssh": {
26+
"publicKeys": [
27+
{
28+
"keyData": ""
29+
}
30+
]
31+
}
32+
},
33+
"servicePrincipalProfile": {
34+
"clientId": "",
35+
"secret": ""
36+
},
37+
"certificateProfile": {}
38+
}
39+
}

‎examples/e2e-tests/kubernetes/kubernetes-config/rbac-disabled.json

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
{
2+
"apiVersion": "vlabs",
3+
"properties": {
4+
"orchestratorProfile": {
5+
"orchestratorType": "Kubernetes",
6+
"kubernetesConfig": {
7+
"enableRbac": false
8+
}
9+
},
10+
"masterProfile": {
11+
"count": 1,
12+
"dnsPrefix": "",
13+
"vmSize": "Standard_D2_v2"
14+
},
15+
"agentPoolProfiles": [
16+
{
17+
"name": "linuxpool1",
18+
"count": 3,
19+
"vmSize": "Standard_D2_v2",
20+
"availabilityProfile": "AvailabilitySet"
21+
}
22+
],
23+
"linuxProfile": {
24+
"adminUsername": "azureuser",
25+
"ssh": {
26+
"publicKeys": [
27+
{
28+
"keyData": ""
29+
}
30+
]
31+
}
32+
},
33+
"servicePrincipalProfile": {
34+
"clientId": "",
35+
"secret": ""
36+
},
37+
"certificateProfile": {}
38+
}
39+
}

‎examples/e2e-tests/kubernetes/release/default/definition.json

+35-4
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,45 @@
88
"addons": [
99
{
1010
"name": "tiller",
11-
"enabled" : true,
11+
"enabled": true,
1212
"config": {
13-
"max-history": "5"
14-
}
13+
"max-history": "10"
14+
},
15+
"containers": [
16+
{
17+
"name": "tiller",
18+
"cpuRequests": "1",
19+
"memoryRequests": "1024Mi",
20+
"cpuLimits": "1",
21+
"memoryLimits": "1024Mi"
22+
}
23+
]
24+
},
25+
{
26+
"name": "kubernetes-dashboard",
27+
"enabled": true,
28+
"containers": [
29+
{
30+
"name": "kubernetes-dashboard",
31+
"cpuRequests": "50m",
32+
"memoryRequests": "512Mi",
33+
"cpuLimits": "50m",
34+
"memoryLimits": "512Mi"
35+
}
36+
]
1537
},
1638
{
1739
"name": "rescheduler",
18-
"enabled" : true
40+
"enabled": true,
41+
"containers": [
42+
{
43+
"name": "rescheduler",
44+
"cpuRequests": "20m",
45+
"memoryRequests": "200Mi",
46+
"cpuLimits": "20m",
47+
"memoryLimits": "200Mi"
48+
}
49+
]
1950
}
2051
]
2152
}

0 commit comments

Comments
 (0)