Merge pull request #1181 from piosz/nanny-version

addon-resizer: migrated to kubernetes client in version 1.3

Author: piosz

addon-resizer/Godeps/Godeps.json

@@ -21,12 +21,12 @@ import (
 
 	api "k8s.io/kubernetes/pkg/api"
 	apiv1 "k8s.io/kubernetes/pkg/api/v1"
-	"k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2"
+	client "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_3"
 )
 
 type kubernetesClient struct {
 	namespace, deployment, pod, container string
-	clientset                             *release_1_2.Clientset
+	clientset                             *client.Clientset
 }
 
 func (k *kubernetesClient) CountNodes() (uint64, error) {
@@ -74,7 +74,7 @@ func (k *kubernetesClient) UpdateDeployment(resources *apiv1.ResourceRequirement
 }
 
 // NewKubernetesClient gives a KubernetesClient with the given dependencies.
-func NewKubernetesClient(namespace, deployment, pod, container string, clientset *release_1_2.Clientset) KubernetesClient {
+func NewKubernetesClient(namespace, deployment, pod, container string, clientset *client.Clientset) KubernetesClient {
 	return &kubernetesClient{
 		namespace:  namespace,
 		deployment: deployment,

addon-resizer/nanny/kubernetes_client.go

@@ -26,7 +26,7 @@ import (
 	"k8s.io/contrib/addon-resizer/nanny"
 	resource "k8s.io/kubernetes/pkg/api/resource"
 
-	"k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2"
+	client "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_3"
 	"k8s.io/kubernetes/pkg/client/restclient"
 )
 
@@ -74,7 +74,7 @@ func main() {
 		log.Fatal(err)
 	}
 
-	clientset, err := release_1_2.NewForConfig(config)
+	clientset, err := client.NewForConfig(config)
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -107,7 +107,7 @@ func main() {
 		})
 	}
 
-	log.Infof("Resources: %v", resources)
+	log.Infof("Resources: %+v", resources)
 
 	var est nanny.ResourceEstimator
 	if *estimator == "linear" {

addon-resizer/nanny/main/pod_nanny.go

@@ -92,14 +92,14 @@ func PollAPIServer(k8s KubernetesClient, est ResourceEstimator, contName string,
 		// Query the apiserver for this pod's information.
 		resources, err := k8s.ContainerResources()
 		if err != nil {
-			log.Error(err)
+			log.Errorf("Error while querying apiserver for resources: %v", err)
 			continue
 		}
-		log.Infof("The container resources are %v", resources)
+		log.Infof("The container resources are %+v", *resources)
 
 		// Get the expected resource limits.
 		expResources := est.scaleWithNodes(num)
-		log.Infof("The expected resources are %v", expResources)
+		log.Infof("The expected resources are %+v", *expResources)
 
 		// If there's a difference, go ahead and set the new values.
 		if !shouldOverwriteResources(int64(threshold), resources.Limits, resources.Requests, expResources.Limits, expResources.Requests) {