Skip to content
This repository has been archived by the owner on Jan 11, 2023. It is now read-only.

More e2e tests #2277

Merged
merged 13 commits into from
Feb 16, 2018
Merged

More e2e tests #2277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
82b5646
add features on and features off
Feb 13, 2018
e17abdd
Merge branch 'master' of https://github.com/CecileRobertMichon/acs-en…
Feb 13, 2018
b2e283a
fix off model
Feb 14, 2018
ddabe64
Merge branch 'master' of https://github.com/Azure/acs-engine into mor…
Feb 14, 2018
c567806
add seperate tests for each feature disabled
Feb 14, 2018
94ef10a
Merge branch 'master' of https://github.com/Azure/acs-engine into mor…
Feb 14, 2018
913671d
move features off dir
Feb 14, 2018
c60e25e
rbac bool
Feb 14, 2018
6a17e0c
added clear containers
Feb 15, 2018
e93d361
added addons enabled test
Feb 15, 2018
e2e908b
fix typo in apimodel
Feb 15, 2018
974efa0
remove aci-connector
Feb 15, 2018
570cb09
move addons to default
Feb 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 56 additions & 0 deletions examples/e2e-tests/kubernetes/kubernetes-config/addons-disabled.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
{
"apiVersion": "vlabs",
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"kubernetesConfig": {
"addons": [
{
"name": "tiller",
"enabled": false
},
{
"name": "aci-connector",
"enabled": false
},
{
"name": "kubernetes-dashboard",
"enabled": false
},
{
"name": "rescheduler",
"enabled": false
}
]
}
},
"masterProfile": {
"count": 1,
"dnsPrefix": "",
"vmSize": "Standard_D2_v2"
},
"agentPoolProfiles": [
{
"name": "linuxpool1",
"count": 3,
"vmSize": "Standard_D2_v2",
"availabilityProfile": "AvailabilitySet"
}
],
"linuxProfile": {
"adminUsername": "azureuser",
"ssh": {
"publicKeys": [
{
"keyData": ""
}
]
}
},
"servicePrincipalProfile": {
"clientId": "",
"secret": ""
},
"certificateProfile": {}
}
}
39 changes: 39 additions & 0 deletions examples/e2e-tests/kubernetes/kubernetes-config/clear-containers.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{
"apiVersion": "vlabs",
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"kubernetesConfig": {
"containerRuntime": "clear-containers"
}
},
"masterProfile": {
"count": 1,
"dnsPrefix": "",
"vmSize": "Standard_D2_v2"
},
"agentPoolProfiles": [
{
"name": "linuxpool1",
"count": 3,
"vmSize": "Standard_D2_v2",
"availabilityProfile": "AvailabilitySet"
}
],
"linuxProfile": {
"adminUsername": "azureuser",
"ssh": {
"publicKeys": [
{
"keyData": ""
}
]
}
},
"servicePrincipalProfile": {
"clientId": "",
"secret": ""
},
"certificateProfile": {}
}
}
39 changes: 39 additions & 0 deletions examples/e2e-tests/kubernetes/kubernetes-config/network-policy-none.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{
"apiVersion": "vlabs",
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"kubernetesConfig": {
"networkPolicy":"none"
}
},
"masterProfile": {
"count": 1,
"dnsPrefix": "",
"vmSize": "Standard_D2_v2"
},
"agentPoolProfiles": [
{
"name": "linuxpool1",
"count": 3,
"vmSize": "Standard_D2_v2",
"availabilityProfile": "AvailabilitySet"
}
],
"linuxProfile": {
"adminUsername": "azureuser",
"ssh": {
"publicKeys": [
{
"keyData": ""
}
]
}
},
"servicePrincipalProfile": {
"clientId": "",
"secret": ""
},
"certificateProfile": {}
}
}
39 changes: 39 additions & 0 deletions examples/e2e-tests/kubernetes/kubernetes-config/rbac-disabled.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{
"apiVersion": "vlabs",
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"kubernetesConfig": {
"enableRbac": false
}
},
"masterProfile": {
"count": 1,
"dnsPrefix": "",
"vmSize": "Standard_D2_v2"
},
"agentPoolProfiles": [
{
"name": "linuxpool1",
"count": 3,
"vmSize": "Standard_D2_v2",
"availabilityProfile": "AvailabilitySet"
}
],
"linuxProfile": {
"adminUsername": "azureuser",
"ssh": {
"publicKeys": [
{
"keyData": ""
}
]
}
},
"servicePrincipalProfile": {
"clientId": "",
"secret": ""
},
"certificateProfile": {}
}
}
39 changes: 35 additions & 4 deletions examples/e2e-tests/kubernetes/release/default/definition.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,45 @@
"addons": [
{
"name": "tiller",
"enabled" : true,
"enabled": true,
"config": {
"max-history": "5"
}
"max-history": "10"
},
"containers": [
{
"name": "tiller",
"cpuRequests": "1",
"memoryRequests": "1024Mi",
"cpuLimits": "1",
"memoryLimits": "1024Mi"
}
]
},
{
"name": "kubernetes-dashboard",
"enabled": true,
"containers": [
{
"name": "kubernetes-dashboard",
"cpuRequests": "50m",
"memoryRequests": "512Mi",
"cpuLimits": "50m",
"memoryLimits": "512Mi"
}
]
},
{
"name": "rescheduler",
"enabled" : true
"enabled": true,
"containers": [
{
"name": "rescheduler",
"cpuRequests": "20m",
"memoryRequests": "200Mi",
"cpuLimits": "20m",
"memoryLimits": "200Mi"
}
]
}
]
}
Expand Down