Upgrade kuberntes to v1.8.0

Author: dkoshkin

Makefile

@@ -18,7 +18,7 @@ ANSIBLE_VERSION = 2.3.0.0
 PROVISIONER_VERSION = v1.5.0
 KUBERANG_VERSION = v1.2.1
 GO_VERSION = 1.8.0
-KUBECTL_VERSION = v1.7.4
+KUBECTL_VERSION = v1.8.0
 HELM_VERSION = v2.5.1
 
 ifeq ($(origin GLIDE_GOOS), undefined)

README.md

@@ -29,7 +29,7 @@ KET operational tools include:
 ## Components
 | Component | Version |
 | --- | --- |
-| Kubernetes | v1.7.4 |
+| Kubernetes | v1.8.0 |
 | Docker | v1.12.6 |
 | Etcd (for Kubernetes) | v3.1.10 |
 | Etcd (for Calico & Contiv) | v3.1.10 |

ansible/group_vars/all.yaml

@@ -1,7 +1,7 @@
 #===============================================================================
 # VERSIONS
-kubernetes_yum_version: 1.7.4-0
-kubernetes_deb_version: 1.7.4-00
+kubernetes_yum_version: 1.8.0-0
+kubernetes_deb_version: 1.8.0-00
 docker_engine_yum_version: 1.12.6-1.el7.centos
 docker_engine_apt_version: 1.12.6-0~ubuntu-xenial
 glusterfs_server_version_rhel: "3.8.15-2.el7"
@@ -151,17 +151,17 @@ kubernetes_certificates:
   service_account_key: "{{ kubernetes_certificates_dir }}/service-account-key.pem"
 
 kubernetes_api_server_option_defaults:
-  "admission-control": "NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,ResourceQuota"
+  "admission-control": "NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,ResourceQuota,NodeRestriction"
   "advertise-address": "{{ internal_ipv4 }}"
   "allow-privileged": "true"
   "apiserver-count": "{{ kubernetes_master_apiserver_count }}"
   "anonymous-auth": "false"
-  "authorization-mode": "RBAC,ABAC"
+  "authorization-mode": "Node,RBAC,ABAC"
   "authorization-policy-file": "{{ kubernetes_authorization_policy_path }}"
   "basic-auth-file": "{{ kubernetes_basic_auth_path }}"
   "bind-address": "0.0.0.0"
   "client-ca-file": "{{ kubernetes_certificates.ca }}"
-  "cloud-provider": "{{ cloud_provider | quote }}"
+  "cloud-provider": "{{ cloud_provider }}"
   "cloud-config": "{{ cloud_config }}"
   "enable-swagger-ui": "true"
   "etcd-cafile": "{{ kubernetes_certificates.ca }}"

ansible/group_vars/container_images.yaml

@@ -4,16 +4,16 @@ official_images:
     version: v3.1.10
   kube_proxy:
     name: gcr.io/google-containers/kube-proxy-amd64
-    version: v1.7.4
+    version: v1.8.0
   kube_controller_manager:
     name: gcr.io/google-containers/kube-controller-manager-amd64
-    version: v1.7.4
+    version: v1.8.0
   kube_scheduler:
     name: gcr.io/google-containers/kube-scheduler-amd64
-    version: v1.7.4
+    version: v1.8.0
   kube_apiserver:
     name: gcr.io/google-containers/kube-apiserver-amd64
-    version: v1.7.4
+    version: v1.8.0
   calico_node:
     name: calico/node
     version: v1.3.0

docs/packages.md

@@ -39,7 +39,7 @@ EOF'
 | Component | Install Command |
 | ---- | ---- |
 | Etcd Node | `sudo yum -y install docker-engine-1.12.6-1.el7.centos` |
-| Kubernetes Node | `sudo yum -y install docker-engine-1.12.6-1.el7.centos nfs-utils kubelet-1.7.4-0 kubectl-1.7.4-0` |
+| Kubernetes Node | `sudo yum -y install docker-engine-1.12.6-1.el7.centos nfs-utils kubelet-1.8.0-0 kubectl-1.8.0-0` |
 
 ## Installing via DEB (Ubuntu Xenial)
 
@@ -90,7 +90,7 @@ sudo apt-get update
 | Component | Install Command |
 | ---- | ---- |
 | Etcd Node | `sudo apt-get install -y docker-engine=1.12.6-0~ubuntu-xenial` |
-| Kubernetes Node | `sudo apt-get install -y docker-engine=1.12.6-0~ubuntu-xenial nfs-common kubelet=1.7.4-00 kubectl=1.7.4-00` |
+| Kubernetes Node | `sudo apt-get install -y docker-engine=1.12.6-0~ubuntu-xenial nfs-common kubelet=1.8.0-00 kubectl=1.8.0-00` |
 
 #### Stop the kubelet
 When the Ubuntu kubelet package is installed the service will be started and will bind to ports. This will cause some preflight port checks to fail.

docs/provision.md

@@ -123,14 +123,14 @@ If you are building a large cluster or one that won't have access to these repos
     <td></td>
   </tr>
   <tr>
-    <td>Kismatic package of Kubernetes kubelet 1.7.4</td>
+    <td>Kismatic package of Kubernetes kubelet 1.8.0</td>
     <td>Kubernetes</td>
     <td></td>
     <td>yes</td>
     <td>yes</td>
   </tr>
   <tr>
-    <td>Kismatic package of Kubernetes kubectl 1.7.4</td>
+    <td>Kismatic package of Kubernetes kubectl 1.8.0</td>
     <td>Kubernetes</td>
     <td></td>
     <td>yes</td>

integration/aws/client.go

@@ -106,7 +106,7 @@ func (c *Client) prepareSession() error {
 
 // CreateNode is for creating a machine on AWS using the given AMI and InstanceType.
 // Returns the ID of the newly created machine.
-func (c Client) CreateNode(ami AMI, instanceType InstanceType, addBlockDevice bool) (string, error) {
+func (c Client) CreateNode(ami AMI, instanceType InstanceType, addBlockDevice bool, customTags map[string]string) (string, error) {
 	api, err := c.getEC2APIClient()
 	if err != nil {
 		return "", err
@@ -181,6 +181,11 @@ func (c Client) CreateNode(ami AMI, instanceType InstanceType, addBlockDevice bo
 			},
 		},
 	}
+	if customTags != nil {
+		for k, v := range customTags {
+			tagReq.Tags = append(tagReq.Tags, &ec2.Tag{Key: aws.String(k), Value: aws.String(v)})
+		}
+	}
 	err = retry.WithBackoff(func() error {
 		var err2 error
 		_, err2 = api.CreateTags(tagReq)

integration/aws/client_test.go

@@ -27,7 +27,7 @@ func TestClient(t *testing.T) {
 		},
 	}
 	fmt.Println("Creating node")
-	nodeID, err := c.CreateNode(Ubuntu1604LTSEast, T2Micro)
+	nodeID, err := c.CreateNode(Ubuntu1604LTSEast, T2Micro, nil)
 	if err != nil {
 		t.Fatalf("Failed to create node: %v", err)
 	}

integration/packet/node.go

@@ -37,7 +37,7 @@ type Node struct {
 }
 
 // CreateNode creates a node in packet with the given hostname and OS
-func (c Client) CreateNode(hostname string, os OS) (*Node, error) {
+func (c Client) CreateNode(hostname string, os OS, _ map[string]string) (*Node, error) {
 	device := &packngo.DeviceCreateRequest{
 		HostName:     hostname,
 		OS:           string(os),

integration/prepare.go

@@ -52,9 +52,9 @@ EOF`
 	moveGlusterRepoFileYum    = `sudo mv /tmp/gluster.repo /etc/yum.repos.d`
 
 	installDockerYum          = `sudo yum -y install docker-engine-1.12.6-1.el7.centos`
-	installKubeletYum         = `sudo yum -y install kubelet-1.7.4-0`
+	installKubeletYum         = `sudo yum -y install kubelet-1.8.0-0`
 	installNFSUtilsYum        = `sudo yum -y install nfs-utils` // required for the kubelet
-	installKubectlYum         = `sudo yum -y install kubectl-1.7.4-0`
+	installKubectlYum         = `sudo yum -y install kubectl-1.8.0-0`
 	installGlusterfsServerYum = `sudo yum -y install --nogpgcheck glusterfs-server-3.8.15-2.el7`
 
 	updateAptGet        = `sudo apt-get update`
@@ -64,10 +64,10 @@ EOF`
 
 	addKubernetesRepoKeyApt = `wget -qO - https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key add -`
 	addKubernetesRepoApt    = `sudo add-apt-repository "deb https://packages.cloud.google.com/apt/ kubernetes-xenial main"`
-	installKubeletApt       = `sudo apt-get -y install kubelet=1.7.4-00`
+	installKubeletApt       = `sudo apt-get -y install kubelet=1.8.0-00`
 	stopKubeletService      = `sudo systemctl stop kubelet`
 	installNFSCommonApt     = `sudo apt-get -y install nfs-common`
-	installKubectlApt       = `sudo apt-get -y install kubectl=1.7.4-00`
+	installKubectlApt       = `sudo apt-get -y install kubectl=1.8.0-00`
 
 	addGlusterRepoApt         = `sudo add-apt-repository -y ppa:gluster/glusterfs-3.8`
 	installGlusterfsServerApt = `sudo apt-get -y install glusterfs-server=3.8.15-ubuntu1~xenial1`

integration/provision.go

@@ -2,6 +2,7 @@ package integration
 
 import (
 	"fmt"
+	"math/rand"
 	"os"
 	"path/filepath"
 	"time"
@@ -165,38 +166,41 @@ func (p awsProvisioner) ProvisionNodes(nodeCount NodeCount, distro linuxDistro,
 		}
 	}
 
+	// when AWS cloud-provider is enabled all nodes in a cluster must have a unique identifier,
+	// set via kubernetes.io/cluster/$UNIQUE_ID EC2 tag
+	uniqueTag := fmt.Sprintf("kubernetes.io/cluster/testcluster%d", rand.Intn(32767))
 	provisioned := provisionedNodes{}
 	var i uint16
 	for i = 0; i < nodeCount.Etcd; i++ {
-		nodeID, err := p.client.CreateNode(ami, aws.T2Medium, addBlockDevice)
+		nodeID, err := p.client.CreateNode(ami, aws.T2Medium, addBlockDevice, map[string]string{uniqueTag: ""})
 		if err != nil {
 			return provisioned, err
 		}
 		provisioned.etcd = append(provisioned.etcd, NodeDeets{id: nodeID})
 	}
 	for i = 0; i < nodeCount.Master; i++ {
-		nodeID, err := p.client.CreateNode(ami, aws.T2Medium, addBlockDevice)
+		nodeID, err := p.client.CreateNode(ami, aws.T2Medium, addBlockDevice, map[string]string{uniqueTag: ""})
 		if err != nil {
 			return provisioned, err
 		}
 		provisioned.master = append(provisioned.master, NodeDeets{id: nodeID})
 	}
 	for i = 0; i < nodeCount.Worker; i++ {
-		nodeID, err := p.client.CreateNode(ami, aws.T2Medium, addBlockDevice)
+		nodeID, err := p.client.CreateNode(ami, aws.T2Medium, addBlockDevice, map[string]string{uniqueTag: ""})
 		if err != nil {
 			return provisioned, err
 		}
 		provisioned.worker = append(provisioned.worker, NodeDeets{id: nodeID})
 	}
 	for i = 0; i < nodeCount.Ingress; i++ {
-		nodeID, err := p.client.CreateNode(ami, aws.T2Medium, addBlockDevice)
+		nodeID, err := p.client.CreateNode(ami, aws.T2Medium, addBlockDevice, map[string]string{uniqueTag: ""})
 		if err != nil {
 			return provisioned, err
 		}
 		provisioned.ingress = append(provisioned.ingress, NodeDeets{id: nodeID})
 	}
 	for i = 0; i < nodeCount.Storage; i++ {
-		nodeID, err := p.client.CreateNode(ami, aws.T2Medium, addBlockDevice)
+		nodeID, err := p.client.CreateNode(ami, aws.T2Medium, addBlockDevice, map[string]string{uniqueTag: ""})
 		if err != nil {
 			return provisioned, err
 		}
@@ -429,7 +433,7 @@ func (p packetProvisioner) RemoveDNS(dnsRecord *DNSRecord) error {
 
 func (p packetProvisioner) createNode(distro packet.OS, count uint16) (string, error) {
 	hostname := fmt.Sprintf("kismatic-integration-%d-%d", time.Now().UnixNano(), count)
-	node, err := p.client.CreateNode(hostname, distro)
+	node, err := p.client.CreateNode(hostname, distro, nil)
 	if err != nil {
 		return "", err
 	}