github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the rest of the code

Browse Source
This commit is contained in:
Clayton Coleman
2016-04-27 00:35:14 -04:00
parent 8d0187add2
commit fdb110c859
129 changed files with 625 additions and 663 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/e2e/cluster_upgrade.go
View File

@@ -80,7 +80,7 @@ func masterUpgradeGKE(v string) error {
return err
}
var nodeUpgrade = func(f *framework.Framework, replicas int, v string) error {
var nodeUpgrade = func(f *framework.Framework, replicas int32, v string) error {
// Perform the upgrade.
var err error
switch framework.TestContext.Provider {
@@ -172,7 +172,7 @@ func nodeUpgradeGKE(v string) error {
var _ = framework.KubeDescribe("Upgrade [Feature:Upgrade]", func() {
svcName, replicas := "baz", 2
svcName, replicas := "baz", int32(2)
var rcName, ip, v string
var ingress api.LoadBalancerIngress
@@ -429,7 +429,7 @@ func runCmd(command string, args ...string) (string, string, error) {
return stdout, stderr, nil
}
func validate(f *framework.Framework, svcNameWant, rcNameWant string, ingress api.LoadBalancerIngress, podsWant int) error {
func validate(f *framework.Framework, svcNameWant, rcNameWant string, ingress api.LoadBalancerIngress, podsWant int32) error {
framework.Logf("Beginning cluster validation")
// Verify RC.
rcs, err := f.Client.ReplicationControllers(f.Namespace.Name).List(api.ListOptions{})