Bump Kubernetes version to v1.11.3 (#1459)

* Bump Kubernetes version to v1.11.3 * fix: remove rkt container runtime support kubelet v1.11 does not already support flags necessary to the runtime. Without doing this, I was unable to start kubelets on kube-aws controller nodes * fix calico-related CRDs installation * serviceaccounts should be created before anything else ref #1459 (comment)
kubernetes-retired · Sep 30, 2018 · c113c7e · c113c7e · davidmccormick · Oct 1, 2018
1 parent e1d2772
commit c113c7e
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 101 deletions.
diff --git a/contrib/bump-version b/contrib/bump-version
@@ -6,12 +6,12 @@
 
 if [ $# -ne 1 ] || [ `expr $1 : ".*.*"` == 0 ]; then
     echo "USAGE: $0 <target-version>"
-    echo "  example: $0 'v1.10.5'"
+    echo "  example: $0 'v1.11.3'"
     exit 1
 fi
 
 # the version needs to be published, see https://quay.io/repository/coreos/hyperkube?tag=latest&tab=tags
-CURRENT_VERSION=${CURRENT_VERSION:-"v1.10.5"}
+CURRENT_VERSION=${CURRENT_VERSION:-"v1.11.3"}
 TARGET_VERSION=${1}
 
 CURRENT_VERSION_BASE=${CURRENT_VERSION%%_*}

diff --git a/core/controlplane/config/config.go b/core/controlplane/config/config.go
@@ -29,7 +29,7 @@ import (
 )
 
 const (
-	k8sVer = "v1.10.5"
+	k8sVer = "v1.11.3"
 
 	credentialsDir = "credentials"
 	userDataDir    = "userdata"

diff --git a/core/controlplane/config/config_test.go b/core/controlplane/config/config_test.go
@@ -1503,10 +1503,10 @@ func TestInvalidKubernetesVersion(t *testing.T) {
 kubernetesVersion: v1.x.3
 `,
 		`
-kubernetesVersion: v1.10.5yes
+kubernetesVersion: v1.11.3yes
 `,
 		`
-kubernetesVersion: $v1.10.5
+kubernetesVersion: $v1.11.3
 `}
 
 	for _, testCase := range testCases {
@@ -1522,7 +1522,7 @@ kubernetesVersion: $v1.10.5
 func TestValidKubernetesVersion(t *testing.T) {
 	testCases := []string{
 		`
-kubernetesVersion: v1.10.5
+kubernetesVersion: v1.11.3
 `,
 		`
 kubernetesVersion: v1.7.2
@@ -1557,7 +1557,7 @@ kubernetesVersion: v1.8.12
 func TestApiServerLeaseEndpointReconcilerEnabled(t *testing.T) {
 	testCases := []string{
 		`
-kubernetesVersion: v1.10.5
+kubernetesVersion: v1.11.3
 `,
 		`
 kubernetesVersion: v1.10.2

diff --git a/core/controlplane/config/templates/cloud-config-controller b/core/controlplane/config/templates/cloud-config-controller
@@ -296,14 +296,6 @@ coreos:
         Environment="RKT_RUN_ARGS={{.HyperkubeImage.Options}}\
         --volume dns,kind=host,source=/etc/resolv.conf \
         --mount volume=dns,target=/etc/resolv.conf \
-        {{ if eq .ContainerRuntime "rkt" -}}
-        --volume rkt,kind=host,source=/opt/bin/host-rkt \
-        --mount volume=rkt,target=/usr/bin/rkt \
-        --volume var-lib-rkt,kind=host,source=/var/lib/rkt \
-        --mount volume=var-lib-rkt,target=/var/lib/rkt \
-        --volume stage,kind=host,source=/tmp \
-        --mount volume=stage,target=/tmp \
-        {{ end -}}
         --volume var-lib-cni,kind=host,source=/var/lib/cni \
         --mount volume=var-lib-cni,target=/var/lib/cni \
         --volume var-run-calico,kind=host,source=/var/run/calico \
@@ -335,8 +327,6 @@ coreos:
         --cni-bin-dir=/opt/cni/bin \
         --network-plugin={{.K8sNetworkPlugin}} \
         --container-runtime={{.ContainerRuntime}} \
-        --rkt-path=/usr/bin/rkt \
-        --rkt-stage1-image=coreos.com/rkt/stage1-coreos \
         --node-labels=node-role.kubernetes.io/master="",kubernetes.io/role=master,service-cidr={{ .ServiceCIDR | toLabel }}{{if .NodeLabels.Enabled}},{{.NodeLabels.String}}{{end}} \
         --register-with-taints=node.alpha.kubernetes.io/role=master:NoSchedule \
         --allow-privileged=true \
@@ -365,36 +355,6 @@ coreos:
       command: start
       enable: true
 
-{{ if eq .ContainerRuntime "rkt" }}
-    - name: rkt-api.service
-      enable: true
-      content: |
-        [Unit]
-        Before=kubelet.service
-        [Service]
-        ExecStart=/usr/bin/rkt api-service
-        Restart=always
-        RestartSec=10
-        [Install]
-        RequiredBy=kubelet.service
-
-    - name: load-rkt-stage1.service
-      enable: true
-      content: |
-        [Unit]
-        Description=Load rkt stage1 images
-        Documentation=http://github.com/coreos/rkt
-        Requires=network-online.target
-        After=network-online.target
-        Before=rkt-api.service
-        [Service]
-        Type=oneshot
-        RemainAfterExit=yes
-        ExecStart=/usr/bin/rkt fetch /usr/lib/rkt/stage1-images/stage1-coreos.aci /usr/lib/rkt/stage1-images/stage1-fly.aci  --insecure-options=image
-        [Install]
-        RequiredBy=rkt-api.service
-{{ end }}
-
     - name: install-kube-system.service
       command: start
       runtime: true
@@ -514,8 +474,6 @@ coreos:
         What=/dev/{{.Experimental.EphemeralImageStorage.Disk}}
 {{if eq .ContainerRuntime "docker"}}
         Where=/var/lib/docker
-{{else if eq .ContainerRuntime "rkt"}}
-        Where=/var/lib/rkt
 {{end}}
         Type={{.Experimental.EphemeralImageStorage.Filesystem}}
 {{end}}
@@ -868,6 +826,13 @@ write_files:
         sleep 3
       done
 
+      # Service Accounts
+      applyall \
+        "${mfdir}/heapster-sa.yaml" \
+        "${mfdir}/{{ .KubeDns.Provider }}-sa.yaml" \
+        "${mfdir}/kube-proxy-sa.yaml" \
+        {{ if .KubernetesDashboard.Enabled }}"${mfdir}/kubernetes-dashboard-sa.yaml"{{ end }}
+
       {{if .Experimental.KIAMSupport.Enabled }}
       kiam_tls_dir=/etc/kubernetes/ssl/kiam
       vols="${vols} -v $kiam_tls_dir:$kiam_tls_dir"
@@ -937,13 +902,6 @@ write_files:
         "${mfdir}"/{kube-proxy,heapster-config}"-cm.yaml" \
         "${mfdir}/{{ .KubeDns.Provider }}-cm.yaml"
 
-      # Service Accounts
-      applyall \
-        "${mfdir}/heapster-sa.yaml" \
-        "${mfdir}/{{ .KubeDns.Provider }}-sa.yaml" \
-        "${mfdir}/kube-proxy-sa.yaml" \
-        {{ if .KubernetesDashboard.Enabled }}"${mfdir}/kubernetes-dashboard-sa.yaml"{{ end }}
-
       {{ if eq .KubeDns.Provider "coredns" -}}
       applyall \
         "${mfdir}/coredns-cr.yaml" \
@@ -1665,7 +1623,6 @@ write_files:
       ---
 
       apiVersion: apiextensions.k8s.io/v1beta1
-      description: Calico Felix Configuration
       kind: CustomResourceDefinition
       metadata:
         name: felixconfigurations.crd.projectcalico.org
@@ -1681,7 +1638,6 @@ write_files:
       ---
 
       apiVersion: apiextensions.k8s.io/v1beta1
-      description: Calico BGP Configuration
       kind: CustomResourceDefinition
       metadata:
         name: bgpconfigurations.crd.projectcalico.org
@@ -1697,7 +1653,6 @@ write_files:
       ---
 
       apiVersion: apiextensions.k8s.io/v1beta1
-      description: Calico IP Pools
       kind: CustomResourceDefinition
       metadata:
         name: ippools.crd.projectcalico.org
@@ -1713,7 +1668,6 @@ write_files:
       ---
 
       apiVersion: apiextensions.k8s.io/v1beta1
-      description: Calico Cluster Information
       kind: CustomResourceDefinition
       metadata:
         name: clusterinformations.crd.projectcalico.org
@@ -1729,7 +1683,6 @@ write_files:
       ---
 
       apiVersion: apiextensions.k8s.io/v1beta1
-      description: Calico Global Network Policies
       kind: CustomResourceDefinition
       metadata:
         name: globalnetworkpolicies.crd.projectcalico.org
@@ -1745,7 +1698,6 @@ write_files:
       ---
 
       apiVersion: apiextensions.k8s.io/v1beta1
-      description: Calico Network Policies
       kind: CustomResourceDefinition
       metadata:
         name: networkpolicies.crd.projectcalico.org
@@ -2948,8 +2900,6 @@ write_files:
           namespace: kube-system
           labels:
             k8s-app: kube-proxy
-          annotations:
-            rkt.alpha.kubernetes.io/stage1-name-override: coreos.com/rkt/stage1-fly
         spec:
           updateStrategy:
             type: RollingUpdate

diff --git a/core/nodepool/config/templates/cloud-config-worker b/core/nodepool/config/templates/cloud-config-worker
@@ -348,8 +348,6 @@ coreos:
         --cni-bin-dir=/opt/cni/bin \
         --network-plugin={{.K8sNetworkPlugin}} \
         --container-runtime={{.ContainerRuntime}} \
-        --rkt-path=/usr/bin/rkt \
-        --rkt-stage1-image=coreos.com/rkt/stage1-coreos \
         --node-labels=kubernetes.io/role=node,node-role.kubernetes.io/node="",node-role.kubernetes.io/{{ toLabel .NodePoolName }}=""{{if .NodeLabels.Enabled}},{{.NodeLabels.String}}{{end}} \
         --register-node=true \
         {{if .Taints}}--register-with-taints={{.Taints.String}}\
@@ -393,36 +391,6 @@ coreos:
       command: start
       enable: true
 
-{{ if eq .ContainerRuntime "rkt" }}
-    - name: rkt-api.service
-      enable: true
-      content: |
-        [Unit]
-        Before=kubelet.service
-        [Service]
-        ExecStart=/usr/bin/rkt api-service
-        Restart=always
-        RestartSec=10
-        [Install]
-        RequiredBy=kubelet.service
-
-    - name: load-rkt-stage1.service
-      enable: true
-      content: |
-        [Unit]
-        Description=Load rkt stage1 images
-        Documentation=http://github.com/coreos/rkt
-        Requires=network-online.target
-        After=network-online.target
-        Before=rkt-api.service
-        [Service]
-        Type=oneshot
-        RemainAfterExit=yes
-        ExecStart=/usr/bin/rkt fetch /usr/lib/rkt/stage1-images/stage1-coreos.aci /usr/lib/rkt/stage1-images/stage1-fly.aci  --insecure-options=image
-        [Install]
-        RequiredBy=rkt-api.service
-{{ end }}
-
 {{if .AwsEnvironment.Enabled}}
     - name: set-aws-environment.service
       enable: true
@@ -563,8 +531,6 @@ coreos:
         What=/dev/{{.Experimental.EphemeralImageStorage.Disk}}
 {{if eq .ContainerRuntime "docker"}}
         Where=/var/lib/docker
-{{else if eq .ContainerRuntime "rkt"}}
-        Where=/var/lib/rkt
 {{end}}
         Type={{.Experimental.EphemeralImageStorage.Filesystem}}
 {{end}}

diff --git a/core/root/config/templates/cluster.yaml b/core/root/config/templates/cluster.yaml
@@ -1023,7 +1023,7 @@ worker:
 # and pulling from quay or dockerhub is slow and you get many timeouts.
 
 # Version of hyperkube image to use. This is the tag for the hyperkube image repository.
-# kubernetesVersion: v1.10.5
+# kubernetesVersion: v1.11.3
 
 # Hyperkube image repository to use.
 # hyperkubeImage:

diff --git a/e2e/kubernetes/Dockerfile b/e2e/kubernetes/Dockerfile
@@ -1,6 +1,6 @@
 FROM golang:1.8.3
 
-ARG KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.10.5}
+ARG KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.11.3}
 
 RUN apt-get update && \
     apt-get install -y rsync && \

diff --git a/e2e/kubernetes/Makefile b/e2e/kubernetes/Makefile
@@ -1,4 +1,4 @@
-KUBERNETES_VERSION ?= v1.10.5
+KUBERNETES_VERSION ?= v1.11.3
 DOCKER_REPO ?=
 DOCKER_TAG ?= $(DOCKER_REPO)kube-e2e:$(KUBERNETES_VERSION)
 DOCKER_TAG_SANITIZED ?= $(shell echo $(DOCKER_TAG) | sed -e 's/+/_/')