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

4
test/integration/framework/master_utils.go
View File

@@ -241,7 +241,7 @@ func StopRC(rc *api.ReplicationController, restClient *client.Client) error {
}
// ScaleRC scales the given rc to the given replicas.
func ScaleRC(name, ns string, replicas int, restClient *client.Client) (*api.ReplicationController, error) {
func ScaleRC(name, ns string, replicas int32, restClient *client.Client) (*api.ReplicationController, error) {
scaler, err := kubectl.ScalerFor(api.Kind("ReplicationController"), restClient)
if err != nil {
return nil, err
@@ -291,7 +291,7 @@ func StartPods(numPods int, host string, restClient *client.Client) error {
controller := RCFromManifest(TestRCManifest)
// Make the rc unique to the given host.
controller.Spec.Replicas = numPods
controller.Spec.Replicas = int32(numPods)
controller.Spec.Template.Spec.NodeName = host
controller.Name = controller.Name + host
controller.Spec.Selector["host"] = host

4
test/integration/quota_test.go
View File

@@ -156,7 +156,7 @@ func scale(t *testing.T, namespace string, clientset *clientset.Clientset) {
Namespace: namespace,
},
Spec: api.ReplicationControllerSpec{
Replicas: target,
Replicas: int32(target),
Selector: map[string]string{"foo": "bar"},
Template: &api.PodTemplateSpec{
ObjectMeta: api.ObjectMeta{
@@ -194,7 +194,7 @@ func scale(t *testing.T, namespace string, clientset *clientset.Clientset) {
switch cast := event.Object.(type) {
case *api.ReplicationController:
if cast.Status.Replicas == target {
if int(cast.Status.Replicas) == target {
return true, nil
}
}