Bump to Kubernetes v1.6.1

[mumoshu]

As etcd3 support is already introduced via #417, it was (ideally) a matter of running bump-version and then run E2E tests against a newly created kube-aws cluster with k8s 1.6.1.

• Run contrib/bump-version v1.6.1_coreos.0
• Fix cni + flannel Kubernetes 1.6.x: CNI + Flannel results in pods like kube-dns, heapster, etc to stall in ContainerCreating #495
• Fix cni + calico Kubernetes v1.6.x: CNI + Self-hosted Calico is broken #494

[codecov-io]

Codecov Report

Merging #492 into master will increase coverage by 0.02%.
The diff coverage is 50%.

@@            Coverage Diff             @@
##           master     #492      +/-   ##
==========================================
+ Coverage    38.1%   38.12%   +0.02%     
==========================================
  Files          44       44              
  Lines        3110     3108       -2     
==========================================
  Hits         1185     1185              
  Misses       1729     1729              
+ Partials      196      194       -2

Impacted Files	Coverage Δ
model/etcd.go	0% <0%> (ø)	⬆️
core/controlplane/config/config.go	55.47% <100%> (ø)	⬆️

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 16168b7...3cff7f7. Read the comment docs.

[mumoshu]

Self-hosted Calico + cni is not working. See #494

[mumoshu]

Even flannel + cni is not working #495

[camilb]

Hi @mumoshu I think these changes should also be made to create the minimal roles when RBAC is enabled.
Edit: already created the PR #504

diff --git a/core/controlplane/config/templates/cloud-config-controller b/core/controlplane/config/templates/cloud-config-controller
index 1c57c4d..f2c3a20 100644
--- a/core/controlplane/config/templates/cloud-config-controller
+++ b/core/controlplane/config/templates/cloud-config-controller
@@ -491,7 +491,7 @@ write_files:
       #!/bin/bash -e
 
       kubectl() {
-          /usr/bin/docker run --rm --net=host -v /srv/kubernetes/manifests:/srv/kubernetes/manifests {{.HyperkubeImage.RepoWithTag}} /hyperkube kubectl "$@"
+          /usr/bin/docker run --rm --net=host -v /srv/kubernetes:/srv/kubernetes {{.HyperkubeImage.RepoWithTag}} /hyperkube kubectl "$@"
       }
 
       mfdir=/srv/kubernetes/manifests
@@ -845,7 +845,7 @@ write_files:
   - path: /srv/kubernetes/rbac/cluster-roles/cluster-admin.yaml
     content: |
         kind: ClusterRole
-        apiVersion: rbac.authorization.k8s.io/v1alpha1
+        apiVersion: rbac.authorization.k8s.io/v1beta1
         metadata:
             name: cluster-admin
         rules:
@@ -860,7 +860,7 @@ write_files:
   - path: /srv/kubernetes/rbac/cluster-roles/bootstrapped-node.yaml
     content: |
         kind: ClusterRole
-        apiVersion: rbac.authorization.k8s.io/v1alpha1
+        apiVersion: rbac.authorization.k8s.io/v1beta1
         metadata:
             name: bootstrapped-node
         rules:
@@ -892,7 +892,7 @@ write_files:
   - path: /srv/kubernetes/rbac/cluster-role-bindings/kube-admin.yaml
     content: |
         kind: ClusterRoleBinding
-        apiVersion: rbac.authorization.k8s.io/v1alpha1
+        apiVersion: rbac.authorization.k8s.io/v1beta1
         metadata:
           name: kube-admin
         subjects:
@@ -906,7 +906,7 @@ write_files:
   - path: /srv/kubernetes/rbac/cluster-role-bindings/kube-worker.yaml
     content: |
         kind: ClusterRoleBinding
-        apiVersion: rbac.authorization.k8s.io/v1alpha1
+        apiVersion: rbac.authorization.k8s.io/v1beta1
         metadata:
           name: kube-worker
         subjects:
@@ -921,7 +921,7 @@ write_files:
   - path: /srv/kubernetes/rbac/cluster-role-bindings/system-worker.yaml
     content: |
         kind: ClusterRoleBinding
-        apiVersion: rbac.authorization.k8s.io/v1alpha1
+        apiVersion: rbac.authorization.k8s.io/v1beta1
         metadata:
           name: system-worker
         subjects:
@@ -938,7 +938,7 @@ write_files:
   - path: /srv/kubernetes/rbac/cluster-role-bindings/bootstrapped-node.yaml
     content: |
         kind: ClusterRoleBinding
-        apiVersion: rbac.authorization.k8s.io/v1alpha1
+        apiVersion: rbac.authorization.k8s.io/v1beta1
         metadata:
           name: bootstrapped-node
         subjects:
@@ -954,7 +954,7 @@ write_files:
   - path: /srv/kubernetes/rbac/cluster-roles/kubelet-bootstrap.yaml
     content: |
         kind: ClusterRole
-        apiVersion: rbac.authorization.k8s.io/v1alpha1
+        apiVersion: rbac.authorization.k8s.io/v1beta1
         metadata:
           name: kubelet-bootstrap
         rules:
@@ -971,7 +971,7 @@ write_files:
   - path: /srv/kubernetes/rbac/cluster-role-bindings/kubelet-bootstrap.yaml
     content: |
         kind: ClusterRoleBinding
-        apiVersion: rbac.authorization.k8s.io/v1alpha1
+        apiVersion: rbac.authorization.k8s.io/v1beta1
         metadata:
           name: kubelet-bootstrap
         subjects:
@@ -1076,7 +1076,7 @@ write_files:
           - --tls-private-key-file=/etc/kubernetes/ssl/apiserver-key.pem
           - --client-ca-file=/etc/kubernetes/ssl/ca.pem
           - --service-account-key-file=/etc/kubernetes/ssl/apiserver-key.pem
-          - --runtime-config=extensions/v1beta1/networkpolicies=true,batch/v2alpha1{{if .Experimental.Plugins.Rbac.Enabled}},rbac.authorization.k8s.io/v1alpha1=true{{ end }}{{if .Experimental.Admission.PodSecurityPolicy.Enabled}},extensions/v1beta1/podsecuritypolicy=true{{ end }}
+          - --runtime-config=extensions/v1beta1/networkpolicies=true,batch/v2alpha1{{if .Experimental.Plugins.Rbac.Enabled}},rbac.authorization.k8s.io/v1beta1=true{{ end }}{{if .Experimental.Admission.PodSecurityPolicy.Enabled}},extensions/v1beta1/podsecuritypolicy=true{{ end }}
           - --cloud-provider=aws
           livenessProbe:
             httpGet:
@@ -1184,7 +1184,7 @@ write_files:
         hostNetwork: true
         volumes:
         {{if .Experimental.DisableSecurityGroupIngress}}
-        - hostPath: 
+        - hostPath:
             path: /etc/kubernetes/additional-configs
           name: additional-configs
         {{end}}

[redbaron]

why first check for "3"?

  if e.Cluster.Version != "" {
    return e.Cluster.Version
  }
  return "3.1.5"

[mumoshu]

The intention here is to translate:

etcd:
  version: 3

to

etcd:
  version: 3.1.5

for users who doesn't care much about minor/patch versions.
However as kube-aws starts defaulting to etcd3 from now on, we can just default to "3.1.5" when it is omitted, as you've suggested 👍

[mumoshu]

E2E is passing against a cluster with/without Calico.