Bump CI image versions for 1.14 release.

experiment/bump_e2e_image.sh

@@ -43,10 +43,10 @@ TAG="${DATE}-$(git describe --tags --always --dirty)"
 
 make -C "${TREE}/images/kubekins-e2e" push
 K8S=experimental make -C "${TREE}/images/kubekins-e2e" push
+K8S=1.14 make -C "${TREE}/images/kubekins-e2e" push
 K8S=1.13 make -C "${TREE}/images/kubekins-e2e" push
 K8S=1.12 make -C "${TREE}/images/kubekins-e2e" push
 K8S=1.11 make -C "${TREE}/images/kubekins-e2e" push
-K8S=1.10 make -C "${TREE}/images/kubekins-e2e" push
 
 echo "TAG = ${TAG}"
 

experiment/test_config.yaml

@@ -1348,6 +1348,10 @@ nodeK8sVersions:
     - --repo=k8s.io/kubernetes=master
     prowImage: gcr.io/k8s-testimages/kubekins-e2e:v20190214-f4092ae69-master
   beta:
+    args:
+    - --repo=k8s.io/kubernetes=release-1.14
+    prowImage: gcr.io/k8s-testimages/kubekins-e2e:v20190205-d83780367-1.14
+  stable1:
     args:
     - --repo=k8s.io/kubernetes=release-1.13
     prowImage: gcr.io/k8s-testimages/kubekins-e2e:v20190214-f4092ae69-1.13

images/kubekins-e2e/Makefile

@@ -34,6 +34,14 @@ ifeq ($(K8S), experimental)
 endif
 
 # kubernetes release-X branch configs
+ifeq ($(K8S), 1.14)
+	K8S_RELEASE=latest
+	GO = 1.11.5
+	BAZEL = 0.21.0
+	CFSSL = R1.2
+	UPGRADE_DOCKER = false
+endif
+
 ifeq ($(K8S), 1.13)
 	K8S_RELEASE=stable-1.13
 	GO = 1.11.5
@@ -55,14 +63,6 @@ ifeq ($(K8S), 1.11)
 	CFSSL = R1.2
 endif
 
-ifeq ($(K8S), 1.10)
-	K8S_RELEASE=stable-1.10
-	GO = 1.9.3
-	BAZEL = 0.14.0
-	CFSSL = R1.2
-endif
-
-
 all: build
 
 kubetest:

images/kubekins-test/Dockerfile-1.14

@@ -0,0 +1,83 @@
+# Copyright 2018 The Kubernetes Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# This file creates a build environment for building and running kubernetes
+# unit and integration tests
+
+FROM golang:1.11.5
+
+# Setup workspace and symlink to gopath
+WORKDIR /workspace
+RUN mkdir -p /go/src/k8s.io/kubernetes /workspace \
+    && ln -s /go/src/k8s.io/kubernetes /workspace/kubernetes
+ENV WORKSPACE=/workspace \
+    TERM=xterm
+
+# Install linux packages
+# bc is needed by shell2junit
+# dnsutils is needed by federation cluster scripts.
+# file is used when uploading test artifacts to GCS.
+# jq is used by hack/verify-godep-licenses.sh
+# python-pip is needed to install the AWS cli.
+# netcat is used by integration test scripts.
+RUN apt-get -o Acquire::Check-Valid-Until=false update && apt-get install -y \
+	bc \
+	dnsutils \
+	file \
+	jq \
+	python-pip \
+	netcat-openbsd \
+	rsync \
+	--no-install-recommends \
+	&& rm -rf /var/lib/apt/lists/*
+
+
+
+# Install Docker deps, some of these are already installed in the image but
+# that's fine since they won't re-install and we can reuse the code below
+# for another image someday.
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    apt-transport-https \
+    ca-certificates \
+    curl \
+    gnupg2 \
+    software-properties-common \
+    lsb-release && \
+    rm -rf /var/lib/apt/lists/*
+
+# Add the Docker apt-repository
+RUN curl -fsSL https://download.docker.com/linux/$(. /etc/os-release; echo "$ID")/gpg \
+    | apt-key add - && \
+    add-apt-repository \
+    "deb [arch=amd64] https://download.docker.com/linux/$(. /etc/os-release; echo "$ID") \
+    $(lsb_release -cs) stable"
+
+# Install Docker
+# TODO(bentheelder): the `sed` is a bit of a hack, look into alternatives.
+# Why this exists: `docker service start` on debian runs a `cgroupfs_mount` method,
+# We're already inside docker though so we can be sure these are already mounted.
+# Trying to remount these makes for a very noisy error block in the beginning of
+# the pod logs, so we just comment out the call to it... :shrug:
+# TODO(benthelder): update docker version. This is pinned because of
+# https://github.com/kubernetes/test-infra/issues/6187
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends docker-ce=17.09.1~ce-0~debian && \
+    rm -rf /var/lib/apt/lists/* && \
+    sed -i 's/cgroupfs_mount$/#cgroupfs_mount\n/' /etc/init.d/docker
+
+
+
+# Install any go packages
+RUN go get \
+    github.com/golang/lint/golint

scenarios/kubernetes_verify.py

@@ -25,7 +25,7 @@
 import subprocess
 import sys
 
-
+# This is deprecated from 1.14 onwards.
 VERSION_TAG = {
     '1.10': '1.10-v20180221-3655e24ae',
     '1.11': '1.11-v20190125-cc5d6ecff3',