diff --git a/examples/e2e-tests/kubernetes/kubernetes-config/addons-disabled.json b/examples/e2e-tests/kubernetes/kubernetes-config/addons-disabled.json new file mode 100644 index 0000000000..e204634659 --- /dev/null +++ b/examples/e2e-tests/kubernetes/kubernetes-config/addons-disabled.json @@ -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": {} + } +} \ No newline at end of file diff --git a/examples/e2e-tests/kubernetes/kubernetes-config/clear-containers.json b/examples/e2e-tests/kubernetes/kubernetes-config/clear-containers.json new file mode 100644 index 0000000000..a7e7dece3b --- /dev/null +++ b/examples/e2e-tests/kubernetes/kubernetes-config/clear-containers.json @@ -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": {} + } +} \ No newline at end of file diff --git a/examples/e2e-tests/kubernetes/kubernetes-config/network-policy-none.json b/examples/e2e-tests/kubernetes/kubernetes-config/network-policy-none.json new file mode 100644 index 0000000000..63c065f6fd --- /dev/null +++ b/examples/e2e-tests/kubernetes/kubernetes-config/network-policy-none.json @@ -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": {} + } +} \ No newline at end of file diff --git a/examples/e2e-tests/kubernetes/kubernetes-config/rbac-disabled.json b/examples/e2e-tests/kubernetes/kubernetes-config/rbac-disabled.json new file mode 100644 index 0000000000..2bdb3607dc --- /dev/null +++ b/examples/e2e-tests/kubernetes/kubernetes-config/rbac-disabled.json @@ -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": {} + } +} \ No newline at end of file diff --git a/examples/e2e-tests/kubernetes/release/default/definition.json b/examples/e2e-tests/kubernetes/release/default/definition.json index 239fafd343..9d0ec6b6d3 100644 --- a/examples/e2e-tests/kubernetes/release/default/definition.json +++ b/examples/e2e-tests/kubernetes/release/default/definition.json @@ -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" + } + ] } ] }