From b0ccda8a423b0cd26e620e554e1f4710f0774089 Mon Sep 17 00:00:00 2001
From: Florian Ruynat <florian234@hotmail.com>
Date: Thu, 19 Mar 2020 10:57:13 +0100
Subject: [PATCH] Upgrade to Kubernetes 1.15.11 (#5578)

---
 README.md                                     |  2 +-
 .../group_vars/k8s-cluster/k8s-cluster.yml    |  2 +-
 roles/download/defaults/main.yml              | 32 ++++++++++++++++++-
 roles/kubespray-defaults/defaults/main.yaml   |  2 +-
 4 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index e13471061..b41c5920a 100644
--- a/README.md
+++ b/README.md
@@ -109,7 +109,7 @@ Supported Components
 --------------------
 
 -   Core
-    -   [kubernetes](https://github.com/kubernetes/kubernetes) v1.15.6
+    -   [kubernetes](https://github.com/kubernetes/kubernetes) v1.15.11
     -   [etcd](https://github.com/coreos/etcd) v3.3.10
     -   [docker](https://www.docker.com/) v18.06 (see note)
     -   [cri-o](http://cri-o.io/) v1.11.5 (experimental: see [CRI-O Note](docs/cri-o.md). Only on centos based OS)
diff --git a/inventory/sample/group_vars/k8s-cluster/k8s-cluster.yml b/inventory/sample/group_vars/k8s-cluster/k8s-cluster.yml
index 856f1c154..ac14b48f3 100644
--- a/inventory/sample/group_vars/k8s-cluster/k8s-cluster.yml
+++ b/inventory/sample/group_vars/k8s-cluster/k8s-cluster.yml
@@ -20,7 +20,7 @@ kube_users_dir: "{{ kube_config_dir }}/users"
 kube_api_anonymous_auth: true
 
 ## Change this to use another Kubernetes version, e.g. a current beta release
-kube_version: v1.15.6
+kube_version: v1.15.11
 
 # kubernetes image repo define
 kube_image_repo: "gcr.io/google-containers"
diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
index 812abdaaa..e8cba3831 100644
--- a/roles/download/defaults/main.yml
+++ b/roles/download/defaults/main.yml
@@ -49,7 +49,7 @@ download_delegate: "{% if download_localhost %}localhost{% else %}{{ groups['kub
 image_arch: "{{host_architecture | default('amd64')}}"
 
 # Versions
-kube_version: v1.15.6
+kube_version: v1.15.11
 kubeadm_version: "{{ kube_version }}"
 etcd_version: v3.3.10
 
@@ -105,6 +105,11 @@ crictl_checksums:
 # Checksums
 hyperkube_checksums:
   arm:
+    v1.15.11: a7fce8d8b7d3e33c3c68100e21d75fd97a079fcc0ec5ade44996e47dd5c26d35
+    v1.15.10: b8d4e46376a9d42d87f16b91d5900bf1aba4a2bf9bc943a9ab628cf06e382117
+    v1.15.9: 34c7d3076b4c5a1b778a1f61dcfe55edf7bf9ae096baabcd2b0619610cd43ace
+    v1.15.8: 45b2025b2455110bc0b4b54addfd4b27de855763e6b2b33b8a90da95c7187fd9
+    v1.15.7: 25efadd6c8f699ba7bb768efc9438378422e1cc6f9a56b489f53d0013c2c9d25
     v1.15.6: 0addfb93b236afc51d9636d3008451ecc1e59662afcd02443ff1147ce3d1900e
     v1.15.5: d16b3d28c2ce23e591aaa58ee4fa20fe7ab841f7a7b46a3d641a64e3fab272a4
     v1.15.4: 480f2428a18875bce1deb24e6e3ef39a5f29f6cd7b8b02c93b6e6c3ee27e896e
@@ -119,6 +124,11 @@ hyperkube_checksums:
     v1.14.1: 839a4abfeafbd5f5ab057ad0e8a0b0b488b3cde14a646eba040a7f579875f565
     v1.14.0: d090b1da23564a7e9bb8f1f4264f2116536c52611ae203fe2ca13eaad0a8003e
   arm64:
+    v1.15.11: 0b50954efe4a0b5c86a0e4db83e93880f6e12c04907d715d751ce0c545c8d5f4
+    v1.15.10: cb47d4ff05a456c6a06c51908e676d0deeeb05f1feaeb3c29049b11235e85dc0
+    v1.15.9: c9acae4d1a107a893b5a61727f4bf774cc35c58886a002888811d631d1c59b47
+    v1.15.8: f875b6438c1662ddba7a22503eeddf3392c198ec2e58858da236d7af53e4ceef
+    v1.15.7: 63dfe4330d42d04fd5b3e18d10afd360df1fa450be79f970f29f482b6ce170e6
     v1.15.6: e117eabe736c2518854a308f86ac16d9d59a8e9a6299da0c93d6a26fc97919bd
     v1.15.5: 04d5f6b859083373e0be95b5040b514e141506d060b5ae41c1d606e6c81d682f
     v1.15.4: febe35c7390119b08073b6b348e5934ba308e4b3197638b94d16bcc0b37dedb4
@@ -133,6 +143,11 @@ hyperkube_checksums:
     v1.14.1: d5236efc2547fd07c7cc2ed9345dfbcd1204385847ca686cf1c62d15056de399
     v1.14.0: 708e00a41f6516d525dee00c91ebe3c3bf2feaf9b7f0af7689487e3e17e356c2
   amd64:
+    v1.15.11: 25b93bbf65d1cafc2dff34dd547483401e236b840cc73ab8f12269cda98a4f98
+    v1.15.10: 22789e14800fc71498d6f1a147dbc38e9c3c31f652963cf7cd45c40c23b77aa4
+    v1.15.9: 5f666ef43073d8d38b96d9e6615023b9c8876c2bc39efb709167faeefdb3446c
+    v1.15.8: 6b5b3cfb24d0d1554483ca7e575818f461c30d2649c4fa6db4181061fc22affc
+    v1.15.7: 001eb004940563200a4a6fb1163ba61f56adfcef98780113daa045f67c47dace
     v1.15.6: 5864218351364e4c47889029a2dcb07e4737fdb71656f4855f7cdc6541161dee
     v1.15.5: 15988bea1177a3e169aa43177456b6f58a15318165b15144c47ccd044de9edfe
     v1.15.4: 7b8d6a151cde98a22c4fbc9d93e2fe29a13fc1a3d97d84904682488fc34453f1
@@ -148,6 +163,11 @@ hyperkube_checksums:
     v1.14.0: af8b04504365dbe4ce6a1772f42eb390d4221a21149b522fc8a0c4b1cd3d97aa
 kubeadm_checksums:
   arm:
+    v1.15.11: 47eb7b7e14cd58531bb39bbee618259b3d0a14e4d9cd9135ce4670bd8295e644
+    v1.15.10: 2515eb19b8cbd50dc639ec15d90835f3720cb64f9550e140b8f408ede9373f55
+    v1.15.9: 90047aa32b071f05892764c5bcfd28dcc6e0de51ea7af8c41269cde9eb15dfe2
+    v1.15.8: 612dbcdbcd2ba6ec2f54b431bee3d58589e6b50dcd707528bc83e89bf74128aa
+    v1.15.7: 313a5cde31a2c892dbde82f3c8ec3675787b8f26f27f14533d38bdf326f6c872
     v1.15.6: 0c6b9e3c91476b75e716c6789783c4bd0d480e94690b5e556b7d96b61fcf227e
     v1.15.5: 4a4ed964b61bbe99c4293c5ef0168cc8c2601d285e525d177b8b0d478960a8ab
     v1.15.4: 69984698052f1563fd44d78e1a68e140a552df7ed57ccd9c83bdfd82bc6103dd
@@ -162,6 +182,11 @@ kubeadm_checksums:
     v1.14.1: 4bd111411208f1270ed3af8780b87d24a3c17c9fdbe4b0f8c7a9a21cd765543e
     v1.14.0: 11f2cfa8bf7ee177dbac8073ab0f039dc265536baaa8dc0c4dea699f981f6fd1
   arm64:
+    v1.15.11: e947c5472e5167503a502e5825f8d11aa40d15bb8f2181d43331807bcd2a7731
+    v1.15.10: b318749f2865c403ce64f48ccb1d189597e19b726f9e866ae34108de3cc2916f
+    v1.15.9: 99f52bfb87a5e4720768d6249e4d450604690a77ad5afa6e4f246cf0d914b62d
+    v1.15.8: 1af2abc47e15aeafca6f8b10eaaca59746d7c4645d63fedd007ba0b455e3528a
+    v1.15.7: 39488a6b7d887d1ff4fe4801724e512ee547752c5337e3e50b8e32eade1e376a
     v1.15.6: 79aea11d6aaf7792135cabecd7446c9725966be7daf24a441ba89d9dec918d00
     v1.15.5: 26e0587398cf4b5bf4456aa65c507aa3713498025a43e3ae1654f54295f27464
     v1.15.4: df6747066627f8d803033c20e1161c0cd68f3e8ffd72a972f1cfc4221c67c6e9
@@ -176,6 +201,11 @@ kubeadm_checksums:
     v1.14.1: 5cf05464168e45ee4719264a267c65f9319fae1ceb9923fedab97a9d6a629e0b
     v1.14.0: 7ed9d706e50cd6d3fc618a7af3d19b691b8a5343ddedaeccb4ea09af3ecfae2c
   amd64:
+    v1.15.11: 2ebc93a6f64419e5e7f26a4674c6784463c7b2a51c0afe8ec2c0423471e7cec3
+    v1.15.10: f4a6fb64125d3f517976a68db2ba0f76a85467681b6e1b50b95ea3397ec7e520
+    v1.15.9: 366a7f260cbd1aaa2661b1e3b83a7fc8781c8a8b07c71944bdaf66d49ff5abae
+    v1.15.8: 9c5a176ea2f4dbf383557211873ec95fe4ffdb5d54d4311f00b92ec592d2bae7
+    v1.15.7: d64d6e4a711d293758476ec3183091cbfeb1ed0a19d92eda8ff3350017ed6ba0
     v1.15.6: e1699c7afa090453241a009d9878fdd405a48f052e93e2ff056a8f2cf3a1cae7
     v1.15.5: e64bb0b2cfdcaa1f4063879bb358848c41aa1b5cc18b75c91994d11a9bf8c136
     v1.15.4: 3acf748ec5d69f316da85fb1e75945afb028f1e207ecb0b5986e23932c040194
diff --git a/roles/kubespray-defaults/defaults/main.yaml b/roles/kubespray-defaults/defaults/main.yaml
index 97f64f1cb..e6234516b 100644
--- a/roles/kubespray-defaults/defaults/main.yaml
+++ b/roles/kubespray-defaults/defaults/main.yaml
@@ -12,7 +12,7 @@ is_atomic: false
 disable_swap: true
 
 ## Change this to use another Kubernetes version, e.g. a current beta release
-kube_version: v1.15.6
+kube_version: v1.15.11
 
 ## The minimum version working
 kube_version_min_required: v1.14.0