Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add config manifest for serial e2e test. #192

Merged
merged 2 commits into from
Jul 22, 2019
Merged

Add config manifest for serial e2e test. #192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b3c037
increase some timeout configs
Jul 22, 2019
9ba5640
add config manifest for serial e2e test
Jul 22, 2019
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
4 changes: 2 additions & 2 deletions tests/e2e/utils/service_utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
)

const (
serviceTimeout = 20 * time.Minute
serviceTimeout = 30 * time.Minute
)

// DeleteService deletes a service
Expand Down Expand Up @@ -99,7 +99,7 @@ func WaitUpdateServiceExposure(cs clientset.Interface, namespace string, name st
var service *v1.Service
var err error
poll := 10 * time.Second
timeout := 10 * time.Minute
timeout := 30 * time.Minute

return wait.PollImmediate(poll, timeout, func() (bool, error) {
service, err = cs.CoreV1().Services(namespace).Get(name, metav1.GetOptions{})
Expand Down
53 changes: 53 additions & 0 deletions tests/k8s-azure/manifest/linux-vmss-serial.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
{
"apiVersion": "vlabs",
"location": "",
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"orchestratorRelease": "1.15",
"kubernetesConfig": {
"useCloudControllerManager": true,
"customCcmImage": "gcrio.azureedge.net/google_containers/cloud-controller-manager-amd64:v1.15.0",
"customHyperkubeImage": "gcrio.azureedge.net/google_containers/hyperkube-amd64:v1.15.0",
"networkPolicy": "none",
"cloudProviderRateLimitQPS": 6,
"cloudProviderRateLimitBucket": 20,
"controllerManagerConfig": {
"--feature-gates": "CSIInlineVolume=true,LocalStorageCapacityIsolation=true,ServiceNodeExclusion=true"
},
"apiServerConfig": {
"--enable-admission-plugins": "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,ResourceQuota,AlwaysPullImages"
}
}
},
"masterProfile": {
"count": 1,
"dnsPrefix": "{dnsPrefix}",
"vmSize": "Standard_F2"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Standard_D4s_v3

},
"agentPoolProfiles": [
{
"name": "agentpool1",
"count": 2,
"vmSize": "Standard_F2",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

let's change the size here same as the test e2e tests, Standard_D4s_v3

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It'll be overwritten in cloud-provider-azure-config.yaml in test-infra.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

right, but changing here would make it more clear for reading

"availabilityProfile": "VirtualMachineScaleSets",
"storageProfile": "ManagedDisks",
"enableVMSSNodePublicIP": true
}
],
"linuxProfile": {
"adminUsername": "k8s-ci",
"ssh": {
"publicKeys": [
{
"keyData": "{keyData}"
}
]
}
},
"servicePrincipalProfile": {
"clientID": "{servicePrincipalClientID}",
"secret": "{servicePrincipalClientSecret}"
}
}
}