Merge pull request #1849 from andyxning/bump_kubernetes_to_1.8

bump kubernetes to 1.9.3

Author: k8s-ci-robot

Godeps/Godeps.json

@@ -34,7 +34,7 @@ ifeq ($(INTERACTIVE), 1)
 	TTY=-t
 endif
 
-SUPPORTED_KUBE_VERSIONS=1.7.0-beta.2
+SUPPORTED_KUBE_VERSIONS=1.9.3
 TEST_NAMESPACE=heapster-e2e-tests
 
 HEAPSTER_LDFLAGS=-w -X k8s.io/heapster/version.HeapsterVersion=$(VERSION) -X k8s.io/heapster/version.GitCommit=$(GIT_COMMIT)

Makefile

@@ -38,20 +38,14 @@ const (
 
 func getConfigOverrides(uri *url.URL) (*kubeClientCmd.ConfigOverrides, error) {
 	kubeConfigOverride := kubeClientCmd.ConfigOverrides{
-		ClusterInfo: kubeClientCmdApi.Cluster{
-			APIVersion: APIVersion,
-		},
+		ClusterInfo: kubeClientCmdApi.Cluster{},
 	}
 	if len(uri.Scheme) != 0 && len(uri.Host) != 0 {
 		kubeConfigOverride.ClusterInfo.Server = fmt.Sprintf("%s://%s", uri.Scheme, uri.Host)
 	}
 
 	opts := uri.Query()
 
-	if len(opts["apiVersion"]) >= 1 {
-		kubeConfigOverride.ClusterInfo.APIVersion = opts["apiVersion"][0]
-	}
-
 	if len(opts["insecure"]) > 0 {
 		insecure, err := strconv.ParseBool(opts["insecure"][0])
 		if err != nil {
@@ -92,7 +86,7 @@ func GetKubeClientConfig(uri *url.URL) (*kube_rest.Config, error) {
 		if configOverrides.ClusterInfo.Server != "" {
 			kubeConfig.Host = configOverrides.ClusterInfo.Server
 		}
-		kubeConfig.GroupVersion = &schema.GroupVersion{Version: configOverrides.ClusterInfo.APIVersion}
+		kubeConfig.GroupVersion = &schema.GroupVersion{Version: APIVersion}
 		kubeConfig.Insecure = configOverrides.ClusterInfo.InsecureSkipTLSVerify
 		if configOverrides.ClusterInfo.InsecureSkipTLSVerify {
 			kubeConfig.TLSClientConfig.CAFile = ""
@@ -121,10 +115,12 @@ func GetKubeClientConfig(uri *url.URL) (*kube_rest.Config, error) {
 			}
 		} else {
 			kubeConfig = &kube_rest.Config{
-				Host:     configOverrides.ClusterInfo.Server,
-				Insecure: configOverrides.ClusterInfo.InsecureSkipTLSVerify,
+				Host: configOverrides.ClusterInfo.Server,
+				TLSClientConfig: kube_rest.TLSClientConfig{
+					Insecure: configOverrides.ClusterInfo.InsecureSkipTLSVerify,
+				},
 			}
-			kubeConfig.GroupVersion = &schema.GroupVersion{Version: configOverrides.ClusterInfo.APIVersion}
+			kubeConfig.GroupVersion = &schema.GroupVersion{Version: APIVersion}
 		}
 	}
 	if len(kubeConfig.Host) == 0 {

common/kubernetes/configs.go

@@ -15,9 +15,10 @@ spec:
       labels:
         k8s-app: heapster-test
     spec:
+      serviceAccountName: heapster
       containers:
       - name: heapster-test
-        image: k8s.gcr.io/heapster-amd64:v1.4.2
+        image: k8s.gcr.io/heapster-amd64:v1.5.1
         imagePullPolicy: Always
         command:
         - /heapster

deploy/kube-config/standalone-test/heapster-controller.yaml

@@ -0,0 +1,12 @@
+kind: ClusterRoleBinding
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: heapster
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: system:heapster
+subjects:
+- kind: ServiceAccount
+  name: heapster
+  namespace: heapster-e2e-tests

deploy/kube-config/standalone-test/heapster-rbac.yaml

@@ -0,0 +1,5 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: heapster
+  namespace: heapster-e2e-tests

deploy/kube-config/standalone-test/heapster-service-account.yaml

@@ -76,7 +76,6 @@ The following options are available:
 * `inClusterConfig` - Use kube config in service accounts associated with Heapster's namespace. (default: true)
 * `kubeletPort` - kubelet port to use (default: `10255`)
 * `kubeletHttps` - whether to use https to connect to kubelets (default: `false`)
-* `apiVersion` - API version to use to talk to Kubernetes. Defaults to the version in kubeConfig.
 * `insecure` - whether to trust kubernetes certificates (default: `false`)
 * `auth` - client auth file to use. Set auth if the service accounts are not usable.
 * `useServiceAccount` - whether to use the service account token if one is mounted at `/var/run/secrets/kubernetes.io/serviceaccount/token` (default: `false`)

docs/source-configuration.md

@@ -17,7 +17,7 @@ package core
 import (
 	"time"
 
-	kube_api "k8s.io/client-go/pkg/api/v1"
+	kube_api "k8s.io/api/core/v1"
 )
 
 type EventBatch struct {

events/core/types.go

@@ -18,7 +18,7 @@ import (
 	"testing"
 	"time"
 
-	kube_api "k8s.io/client-go/pkg/api/v1"
+	kube_api "k8s.io/api/core/v1"
 	"k8s.io/heapster/events/core"
 	"k8s.io/heapster/events/util"
 )

events/manager/manager_test.go

@@ -20,7 +20,7 @@ import (
 	"time"
 
 	"github.com/golang/glog"
-	kube_api "k8s.io/client-go/pkg/api/v1"
+	kube_api "k8s.io/api/core/v1"
 	esCommon "k8s.io/heapster/common/elasticsearch"
 	event_core "k8s.io/heapster/events/core"
 	"k8s.io/heapster/metrics/core"