This repository has been archived by the owner on Jan 11, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 558
More e2e tests #2277
Merged
CecileRobertMichon
merged 13 commits into
Azure:master
from
CecileRobertMichon:more-e2e
Feb 16, 2018
Merged
More e2e tests #2277
Changes from 12 commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
82b5646
add features on and features off
e17abdd
Merge branch 'master' of https://github.com/CecileRobertMichon/acs-en…
b2e283a
fix off model
ddabe64
Merge branch 'master' of https://github.com/Azure/acs-engine into mor…
c567806
add seperate tests for each feature disabled
94ef10a
Merge branch 'master' of https://github.com/Azure/acs-engine into mor…
913671d
move features off dir
c60e25e
rbac bool
6a17e0c
added clear containers
e93d361
added addons enabled test
e2e908b
fix typo in apimodel
974efa0
remove aci-connector
570cb09
move addons to default
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
56 changes: 56 additions & 0 deletions
56
examples/e2e-tests/kubernetes/kubernetes-config/addons-disabled.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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": 5, | ||
| "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": {} | ||
| } | ||
| } | ||
82 changes: 82 additions & 0 deletions
82
examples/e2e-tests/kubernetes/kubernetes-config/addons-enabled.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| { | ||
| "apiVersion": "vlabs", | ||
| "properties": { | ||
| "orchestratorProfile": { | ||
| "orchestratorType": "Kubernetes", | ||
| "kubernetesConfig": { | ||
| "addons": [ | ||
| { | ||
| "name": "tiller", | ||
| "enabled": true, | ||
| "config": { | ||
| "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, | ||
| "containers": [ | ||
| { | ||
| "name": "rescheduler", | ||
| "cpuRequests": "20m", | ||
| "memoryRequests": "200Mi", | ||
| "cpuLimits": "20m", | ||
| "memoryLimits": "200Mi" | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "masterProfile": { | ||
| "count": 5, | ||
| "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
39
examples/e2e-tests/kubernetes/kubernetes-config/clear-containers.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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
39
examples/e2e-tests/kubernetes/kubernetes-config/network-policy-none.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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
39
examples/e2e-tests/kubernetes/kubernetes-config/rbac-disabled.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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": {} | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I still think we should do single masters for these tests, thoughts?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes that's a miss, I'll fix it! same for addons-enabled