Merge branch 'improvement/update-cve-2018-1002105-1.2' into q/1.2

scality · Dec 8, 2018 · 0e96477 · 0e96477
2 parents f714742 + 87e9831
commit 0e96477
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/ChangeLog.rst b/ChangeLog.rst
@@ -2,6 +2,9 @@
 
 Release 1.2.0 (in development)
 ==============================
+This version updates the Kubernetes version to 1.12.3 to handle
+CVE-2018-100210.
+
 Features added
 --------------
 :ghpull:`462` - update vendored Kubespray version
@@ -12,6 +15,9 @@ Features added
 
 :ghpull:`499` - use helm_cli to install prometheus (:ghissue:`496`)
 
+Bugs Fixed
+----------
+:ghpull:`517` - update Kubernetes version to 1.12.3 to include a fix for CVE-2018-100210
 
 Release 1.1.0 (in development)
 ==============================

diff --git a/playbooks/group_vars/k8s-cluster/10-metal-k8s.yml b/playbooks/group_vars/k8s-cluster/10-metal-k8s.yml
@@ -5,11 +5,11 @@ kubeconfig_localhost: True
 dns_mode: 'coredns'
 kube_proxy_mode: 'ipvs'
 
-kube_version: 'v1.11.5'
+kube_version: 'v1.12.3'
 hyperkube_checksums:
-  v1.11.5: 88e17abcc821e4895184e64d4b136095263b147c6d679b6e5177b0f58a2629cc
+  v1.12.3: 600aad3f0d016716abd85931239806193ffbe95f2edfdcea11532d518ae5cdb1
 kubeadm_checksums:
-  v1.11.5: b28ec97875cad94ef9d554d9fb1170674e6588c97e1746f2026e0795aecabc40
+  v1.12.3: c675aa3be82754b3f8dfdde2a1526a72986713312d46d898e65cb564c6aa8ad4
 
 # Request usage of the `overlay2` storage driver, even on pre-18.03 Docker
 # installs.