Merge pull request #192 from nilo19/t-qini-add_serial-manifest

Add config manifest for serial e2e test.
kubernetes-sigs · Jul 22, 2019 · cce6391 · cce6391
2 parents f787afe + 9ba5640
commit cce6391
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 2 deletions.
diff --git a/tests/e2e/utils/service_utils.go b/tests/e2e/utils/service_utils.go
@@ -29,7 +29,7 @@ import (
 )
 
 const (
-	serviceTimeout = 20 * time.Minute
+	serviceTimeout = 30 * time.Minute
 )
 
 // DeleteService deletes a service
@@ -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{})

diff --git a/tests/k8s-azure/manifest/linux-vmss-serial.json b/tests/k8s-azure/manifest/linux-vmss-serial.json
@@ -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"
+        },
+        "agentPoolProfiles": [
+            {
+                "name": "agentpool1",
+                "count": 2,
+                "vmSize": "Standard_F2",
+                "availabilityProfile": "VirtualMachineScaleSets",
+                "storageProfile": "ManagedDisks",
+                "enableVMSSNodePublicIP": true
+            }
+        ],
+        "linuxProfile": {
+            "adminUsername": "k8s-ci",
+            "ssh": {
+                "publicKeys": [
+                    {
+                        "keyData": "{keyData}"
+                    }
+                ]
+            }
+        },
+        "servicePrincipalProfile": {
+            "clientID": "{servicePrincipalClientID}",
+            "secret": "{servicePrincipalClientSecret}"
+        }
+    }
+}