WIP: Upgrade to 1.21.2

CHANGELOG.md

@@ -1,4 +1,10 @@
 # UNRELEASED
+- Remove canal support from cookbook
+- Remove crio support from cookbook
+- Upgrade etcd to 3.4.16
+- [Kubernetes: 1.21.2](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.21.md#changelog-since-v1212)
+- [Node Problem Detector: 0.8.9](https://github.com/kubernetes/node-problem-detector/releases/tag/v0.8.9)
+- cpuCFSQuotaPeriod: default 100ms
 
 # 1.20.4 (22.02.2021)
 - [Kubernetes: 1.20.4](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.20.md#changelog-since-v1203)

README.md

@@ -590,100 +590,6 @@ Google Kubernetes installer for Ubuntu
   </tr>
 </table>
 
-###### crio
-<table>
-  <tr>
-    <th>Key</th>
-    <th>Type</th>
-    <th>Description</th>
-    <th>Default</th>
-  </tr>
-  <tr>
-    <td><tt>['kubernetes']['crio']['version']</tt></td>
-    <td>String</td>
-    <td>CRIO binary version</td>
-    <td><tt>1.15.2</tt></td>
-  </tr>
-  <tr>
-    <td><tt>['kubernetes']['crio']['endpoint']</tt></td>
-    <td>String</td>
-    <td>Path to UNIX socket for crio daemon to listen</td>
-    <td><tt>/var/run/crio/crio.sock</tt></td>
-  </tr>
-  <tr>
-    <td><tt>['kubernetes']['crio']['config']['runtime']</tt></td>
-    <td>String</td>
-    <td>OCI compatible runtime used for trusted container workloads.</td>
-    <td><tt>/usr/local/bin/runc</tt></td>
-  </tr>
-  <tr>
-    <td><tt>['kubernetes']['crio']['config']['untrusted_runtime']</tt></td>
-    <td>String</td>
-    <td>OCI compatible runtime used for untrusted container workloads.</td>
-    <td><tt>/usr/local/bin/runsc</tt></td>
-  </tr>
-  <tr>
-    <td><tt>['kubernetes']['crio']['config']['conmon']</tt></td>
-    <td>String</td>
-    <td>Path to conmon binary</td>
-    <td><tt>/usr/local/bin/conmon</tt></td>
-  </tr>
-  <tr>
-    <td><tt>['kubernetes']['crio']['config']['storage_driver']</tt></td>
-    <td>String</td>
-    <td>Storage driver</td>
-    <td><tt>aufs</tt></td>
-  </tr>
-  <tr>
-    <td><tt>['kubernetes']['crio']['config']['stream_port']</tt></td>
-    <td>Fixnum</td>
-    <td>Port on which the stream server will listen</td>
-    <td><tt>10010</tt></td>
-  </tr>
-  <tr>
-    <td><tt>['kubernetes']['crio']['config']['runroot']</tt></td>
-    <td>String</td>
-    <td>Path to the "run directory". CRIO stores all of its state in this directory.</td>
-    <td><tt>/var/run/containers/storage</tt></td>
-  </tr>
-  <tr>
-    <td><tt>['kubernetes']['crio']['config']['root']</tt></td>
-    <td>String</td>
-    <td>Path to the "root directory". CRIO stores all of its data, including container images, in this directory.</td>
-    <td><tt>/var/lib/containers/storage</tt></td>
-  </tr>
-  <tr>
-    <td><tt>['kubernetes']['crio']['config']['log_level']</tt></td>
-    <td>String</td>
-    <td>Log messages above specified level: debug, info, warn, error, fatal or panic</td>
-    <td><tt>info</tt></td>
-  </tr>
-  <tr>
-    <td><tt>['kubernetes']['crio']['daemon_flags']['log_format']</tt></td>
-    <td>String</td>
-    <td>Format used by logs</td>
-    <td><tt>text</tt></td>
-  </tr>
-  <tr>
-    <td><tt>['kubernetes']['crio']['daemon_flags']['profile']</tt></td>
-    <td>Boolean</td>
-    <td>Enable pprof remote profiler on localhost:6060</td>
-    <td><tt>false</tt></td>
-  </tr>
-  <tr>
-    <td><tt>['kubernetes']['crio']['daemon_flags']['enable_metrics']</tt></td>
-    <td>Boolean</td>
-    <td>Enable prometheus-compatible metrics endpoint for the server</td>
-    <td><tt>true</tt></td>
-  </tr>
-  <tr>
-    <td><tt>['kubernetes']['crio']['daemon_flags']['metrics_port']</tt></td>
-    <td>Fixnum</td>
-    <td>Port for the metrics endpoint</td>
-    <td><tt>9090</tt></td>
-  </tr>
-</table>
-
 
 ###### addons
 <table>

attributes/addons.rb

@@ -17,7 +17,7 @@
 default['kubernetes']['addons']['coredns']['hosts']              = []
 default['kubernetes']['addons']['npd']['enabled']                = false
 default['kubernetes']['addons']['npd']['repo_url']               ='k8s.gcr.io/node-problem-detector/node-problem-detector'
-default['kubernetes']['addons']['npd']['version']                = '0.8.7'
+default['kubernetes']['addons']['npd']['version']                = '0.8.9'
 default['kubernetes']['addons']['npd']['address']                = '0.0.0.0'
 default['kubernetes']['addons']['npd']['port']                   = 20256
 default['kubernetes']['addons']['npd']['log_level']              = 0

attributes/default.rb

@@ -3,7 +3,7 @@
 default['kubernetes']['roles']['node']                      = 'kubernetes_node'
 default['kubernetes']['install_via']                        = 'systemd' # other possible values are: static_pods
 default['kubernetes']['databag']                            = 'kubernetes'
-default['kubernetes']['version']                            = 'v1.20.4'
+default['kubernetes']['version']                            = 'v1.21.2'
 default['kubernetes']['keep_versions']                      = 3
 default['kubernetes']['image']                              = 'gcr.io/google_containers/hyperkube'
 default['kubernetes']['interface']                          = 'eth1'
@@ -74,22 +74,17 @@
 default['kubernetes']['audit_webhook_config']['server']     = ''
 default['kubernetes']['feature_gates']                      = {
   'APIServerIdentity'         => true,
-  'CronJobControllerV2'       => true,
-  'CSIStorageCapacity'        => true,
   'CustomCPUCFSQuotaPeriod'   => true,
   'EphemeralContainers'       => true,
-  'GenericEphemeralVolume'    => true,
-  'GracefulNodeShutdown'      => true,
   'ServiceTopology'           => true,
-  'TTLAfterFinished'          => true,
 }
 default['kubernetes']['packages']['storage_url']            = "https://storage.googleapis.com/kubernetes-release/release/#{node['kubernetes']['version']}/bin/linux/amd64/"
-default['kubernetes']['checksums']['apiserver']             = '61a76e3759bc3653903c7cdec2b4dc60af2a53e92d97ceedd35c345938323eb6'
-default['kubernetes']['checksums']['controller-manager']    = 'f4998d87fb10494743da924743a9f28c03b1c220c720b89e1a0eb38611c0f654'
-default['kubernetes']['checksums']['proxy']                 = 'd1bec1243d3c3478cf2549febece1f3ad8ed5f4e2a5a2e57df5604fb7f064b38'
-default['kubernetes']['checksums']['scheduler']             = 'fe1f86c0525332274faa46cd816306d68b085c4c4613db8c13d1242badcede48'
-default['kubernetes']['checksums']['kubectl']               = '98e8aea149b00f653beeb53d4bd27edda9e73b48fed156c4a0aa1dabe4b1794c'
-default['kubernetes']['checksums']['kubelet']               = 'a9f28ac492b3cbf75dee284576b2e1681e67170cd36f3f5cdc31495f1bdbf809'
+default['kubernetes']['checksums']['apiserver']             = '04de7369c4e80eaaf8da440dcf62e050e908d786ac8b3248585dbe659c06d769'
+default['kubernetes']['checksums']['controller-manager']    = '87fa798b1fb2c20d2726e870dd3157ef990a6475a8720e2dc4fc968213339075'
+default['kubernetes']['checksums']['proxy']                 = 'fca07965efa9435e20d24a2c4501b5c80c1f775793352aff2649e6b342c76537'
+default['kubernetes']['checksums']['scheduler']             = 'be9898626e52f3f292f1904b351387fb2a40834ba74286857642a6433e128e99'
+default['kubernetes']['checksums']['kubectl']               = 'aaf144b19c0676e1fe34a93dc753fb38f4de057a0e2d7521b0bef4e82f8ccc28'
+default['kubernetes']['checksums']['kubelet']               = '55b982527d76934c2f119e70bf0d69831d3af4985f72bb87cd4924b1c7d528da'
 default['kubernetes']['addon_manager']['version']           = 'v9.1.3'
 default['kubernetes']['multimaster']['access_via']          = 'haproxy' # other possible values are: direct, dns
 default['kubernetes']['multimaster']['haproxy_url']         = '127.0.0.1'

attributes/etcd.rb

@@ -1,4 +1,4 @@
-default['etcd']['version']               = 'v3.4.14'
+default['etcd']['version']               = 'v3.4.16'
 default['etcd']['checksum']              = 'f57141d45ceb727a84e2f0bcd0b98934ea2ad2b59009be90d901710861601651'
 default['etcd']['image']                 = 'quay.io/coreos/etcd'
 default['etcd']['trusted_ca_file']       = node['kubernetes']['etcd_server_cafile']

attributes/kubelet.rb

@@ -26,7 +26,7 @@
 default['kubernetes']['kubelet']['config']['readOnlyPort']                           = 10255
 default['kubernetes']['kubelet']['config']['serverTLSBootstrap']                     = true
 default['kubernetes']['kubelet']['config']['rotateCertificates']                     = true
-default['kubernetes']['kubelet']['config']['cpuCFSQuotaPeriod']                      = '10ms'
+default['kubernetes']['kubelet']['config']['cpuCFSQuotaPeriod']                      = '100ms'
 default['kubernetes']['kubelet']['config']['systemReserved']['cpu']                  = '100m'
 default['kubernetes']['kubelet']['config']['systemReserved']['memory']               = '100Mi'
 default['kubernetes']['kubelet']['config']['kubeReserved']['cpu']                    = '100m'

libraries/helpers.rb

@@ -123,11 +123,6 @@ def controller_manager_args
       options['feature-gates'] = options['feature-gates'].map { |k, v| "#{k}=#{v}" }.join(',')
       options.store('bind-address', k8s_ip(node))
 
-      if node['kubernetes']['sdn'] == 'canal'
-        options.store('allocate-node-cidrs', nil)
-        options.store('node-cidr-mask-size', node['kubernetes']['node_cidr_mask_size'])
-      end
-
       options.sort_by { |k, v| k }.map { |k, v| v.nil? ? "--#{k}" : "--#{k}=#{v}" }
     end