Merge pull request #123 from feiskyer/update-k8s-1.14

Update k8s 1.14

Author: feiskyer

Dockerfile

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM golang:1.11.2-stretch AS build
+FROM golang:1.12.1-stretch AS build
 WORKDIR /go/src/k8s.io/cloud-provider-azure
 COPY . .
 RUN make

Makefile

@@ -25,7 +25,7 @@ TEST_RESULTS_DIR=testResults
 GOMETALINTER_OPTION=--tests --disable-all -E gofmt -E vet -E golint
 
 IMAGE_REGISTRY ?= local
-K8S_VERSION ?= v1.14.0-beta.1
+K8S_VERSION ?= v1.14.0-rc.1
 AKSENGINE_VERSION ?= master
 HYPERKUBE_IMAGE ?= "gcrio.azureedge.net/google_containers/hyperkube-amd64:$(K8S_VERSION)"
 # manifest name under tests/e2e/k8s-azure/manifest

glide.lock

@@ -1,13 +1,13 @@
 package: k8s.io/cloud-provider-azure
 import:
 - package: k8s.io/kubernetes
-  version: v1.14.0-beta.1
+  version: v1.14.0-rc.1
 - package: github.com/Azure/azure-sdk-for-go
   version: v21.3.0
 testImport:
 - package: github.com/stretchr/testify
-  version: v1.1.4
+  version: v1.3.0
 - package: github.com/onsi/ginkgo
   version: 67b9df7f55fe1165fd9ad49aca7754cce01a42b8
 - package: github.com/onsi/gomega
-  version: d59fa0ac68bb5dd932ee8d24eed631cdd519efc3
+  version: 5533ce8a0da374da682cd53d70ddcc54adf1a710

glide.yaml

@@ -20,8 +20,8 @@ import (
 	"fmt"
 	"strconv"
 
+	appsv1 "k8s.io/api/apps/v1"
 	"k8s.io/api/core/v1"
-	"k8s.io/api/extensions/v1beta1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	clientset "k8s.io/client-go/kubernetes"
@@ -129,7 +129,7 @@ var _ = Describe("Cluster size autoscaler [Serial][Slow]", func() {
 		utils.Logf("Create deployment")
 		replicas := int32(podCount)
 		deployment := createDeploymentManifest(basename+"-deployment", replicas, map[string]string{"app": basename})
-		_, err := cs.Extensions().Deployments(ns.Name).Create(deployment)
+		_, err := cs.AppsV1().Deployments(ns.Name).Create(deployment)
 		Expect(err).NotTo(HaveOccurred())
 
 		By("Scale up")
@@ -141,7 +141,7 @@ var _ = Describe("Cluster size autoscaler [Serial][Slow]", func() {
 		utils.Logf("Delete Pods by replic=0")
 		replicas = 0
 		deployment.Spec.Replicas = &replicas
-		_, err = cs.Extensions().Deployments(ns.Name).Update(deployment)
+		_, err = cs.AppsV1().Deployments(ns.Name).Update(deployment)
 		Expect(err).NotTo(HaveOccurred())
 		targetNodeCount = initNodeCount
 		err = utils.WaitAutoScaleNodes(cs, targetNodeCount)
@@ -178,13 +178,13 @@ func createScalerPodManifest(name string) (result *v1.Pod) {
 	return
 }
 
-func createDeploymentManifest(name string, replicas int32, label map[string]string) (result *v1beta1.Deployment) {
+func createDeploymentManifest(name string, replicas int32, label map[string]string) (result *appsv1.Deployment) {
 	spec := createPodSpec()
-	result = &v1beta1.Deployment{
+	result = &appsv1.Deployment{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: name,
 		},
-		Spec: v1beta1.DeploymentSpec{
+		Spec: appsv1.DeploymentSpec{
 			Replicas: &replicas,
 			Selector: &metav1.LabelSelector{
 				MatchLabels: label,

tests/e2e/autoscaling/autoscaler.go

@@ -63,12 +63,12 @@ var _ = Describe("Network security group", func() {
 
 		utils.Logf("Creating deployment " + serviceName)
 		deployment := createNginxDeploymentManifest(serviceName, labels)
-		_, err = cs.Extensions().Deployments(ns.Name).Create(deployment)
+		_, err = cs.AppsV1().Deployments(ns.Name).Create(deployment)
 		Expect(err).NotTo(HaveOccurred())
 	})
 
 	AfterEach(func() {
-		err := cs.Extensions().Deployments(ns.Name).Delete(serviceName, nil)
+		err := cs.AppsV1().Deployments(ns.Name).Delete(serviceName, nil)
 		Expect(err).NotTo(HaveOccurred())
 
 		err = utils.DeleteNamespace(cs, ns.Name)

tests/e2e/network/network_security_group.go

@@ -22,8 +22,8 @@ import (
 	"strings"
 	"time"
 
+	appsv1 "k8s.io/api/apps/v1"
 	"k8s.io/api/core/v1"
-	"k8s.io/api/extensions/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/apimachinery/pkg/util/uuid"
@@ -68,12 +68,12 @@ var _ = Describe("Service with annotation", func() {
 
 		utils.Logf("Creating deployment " + serviceName)
 		deployment := createNginxDeploymentManifest(serviceName, labels)
-		_, err = cs.Extensions().Deployments(ns.Name).Create(deployment)
+		_, err = cs.AppsV1().Deployments(ns.Name).Create(deployment)
 		Expect(err).NotTo(HaveOccurred())
 	})
 
 	AfterEach(func() {
-		err := cs.Extensions().Deployments(ns.Name).Delete(serviceName, nil)
+		err := cs.AppsV1().Deployments(ns.Name).Delete(serviceName, nil)
 		Expect(err).NotTo(HaveOccurred())
 
 		err = utils.DeleteNamespace(cs, ns.Name)
@@ -213,14 +213,14 @@ func createLoadBalancerServiceManifest(c clientset.Interface, name string, annot
 
 // defaultDeployment returns a default deployment
 // running nginx image which exposes port 80
-func createNginxDeploymentManifest(name string, labels map[string]string) (result *v1beta1.Deployment) {
+func createNginxDeploymentManifest(name string, labels map[string]string) (result *appsv1.Deployment) {
 	var replicas int32
 	replicas = 5
-	result = &v1beta1.Deployment{
+	result = &appsv1.Deployment{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: name,
 		},
-		Spec: v1beta1.DeploymentSpec{
+		Spec: appsv1.DeploymentSpec{
 			Replicas: &replicas,
 			Selector: &metav1.LabelSelector{
 				MatchLabels: labels,

tests/e2e/network/service_annotations.go

@@ -12,10 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM golang:1.11.2-stretch AS build_kubernetes
+FROM golang:1.12.1-stretch AS build_kubernetes
 # rsync: building k8s
 RUN apt update && apt install -y --no-install-recommends rsync
-ARG K8S_VERSION=v1.13.0-alpha.3
+ARG K8S_VERSION=v1.14.0-rc.1
 WORKDIR /go/src/k8s.io/kubernetes
 RUN git clone https://github.com/kubernetes/kubernetes . \
     && git checkout -b temp $K8S_VERSION \
@@ -26,8 +26,8 @@ RUN git clone https://github.com/kubernetes/kubernetes . \
     && ./e2e
 RUN rm -rf _output/local/go
 
-FROM golang:1.11.2-stretch AS build_aks-engine
-ARG AKSENGINE_VERSION=v0.31.1
+FROM golang:1.12.1-stretch AS build_aks-engine
+ARG AKSENGINE_VERSION=v0.32.3
 WORKDIR /go/src/github.com/Azure/aks-engine
 RUN git clone https://github.com/Azure/aks-engine . \
     && git checkout -b temp $AKSENGINE_VERSION \

tests/k8s-azure/Dockerfile

@@ -7,7 +7,8 @@
             "orchestratorRelease": "1.14",
             "kubernetesConfig": {
                 "useCloudControllerManager": true,
-                "customCcmImage": "gcrio.azureedge.net/google_containers/cloud-controller-manager-amd64:v1.14.0-alpha.1",
+                "customCcmImage": "gcrio.azureedge.net/google_containers/cloud-controller-manager-amd64:v1.14.0-rc.1",
+                "customHyperkubeImage": "gcrio.azureedge.net/google_containers/hyperkube-amd64:v1.14.0-rc.1",
                 "networkPolicy": "none",
                 "cloudProviderRateLimitQPS": 6,
                 "cloudProviderRateLimitBucket": 20,