Merge pull request #533 from puppetlabs/release-prep

Release prep v6.3.0

Author: daianamezdrea

CHANGELOG.md

@@ -2,6 +2,15 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
+## [v6.3.0](https://github.com/puppetlabs/puppetlabs-kubernetes/tree/v6.3.0) (2021-09-06)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-kubernetes/compare/v6.2.0...v6.3.0)
+
+### Added
+
+- Support Kubernetes 1.22 and kubeadm v1beta3 configurations [\#531](https://github.com/puppetlabs/puppetlabs-kubernetes/pull/531) ([treydock](https://github.com/treydock))
+- Enable live-restore for Docker daemon. [\#530](https://github.com/puppetlabs/puppetlabs-kubernetes/pull/530) ([peteroruba](https://github.com/peteroruba))
+
 ## [v6.2.0](https://github.com/puppetlabs/puppetlabs-kubernetes/tree/v6.2.0) (2021-07-19)
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-kubernetes/compare/v6.1.0...v6.2.0)

REFERENCE.md

@@ -1091,6 +1091,17 @@ Default to /var/tmp/puppetlabs-kubernetes
 Allow kubeadm init skip some phases
 Default: none phases skipped
 
+[*skip_phases_join*]
+Allow kubeadm join to skip some phases
+Only works with Kubernetes 1.22+
+Default: no phases skipped
+
+[*feature_gates*]
+Feature gate hash to be added to kubeadm configuration
+Example:
+  {'RootlessControlPlane' => true}
+Default: undefined, no feature gates
+
 Authors
 -------
 
@@ -1218,13 +1229,15 @@ The following parameters are available in the `kubernetes` class:
 * [`metrics_bind_address`](#metrics_bind_address)
 * [`join_discovery_file`](#join_discovery_file)
 * [`skip_phases`](#skip_phases)
+* [`skip_phases_join`](#skip_phases_join)
 * [`conntrack_max_per_core`](#conntrack_max_per_core)
 * [`conntrack_min`](#conntrack_min)
 * [`conntrack_tcp_wait_timeout`](#conntrack_tcp_wait_timeout)
 * [`conntrack_tcp_stablished_timeout`](#conntrack_tcp_stablished_timeout)
 * [`tmp_directory`](#tmp_directory)
 * [`wait_for_default_sa_tries`](#wait_for_default_sa_tries)
 * [`wait_for_default_sa_try_sleep`](#wait_for_default_sa_try_sleep)
+* [`feature_gates`](#feature_gates)
 
 ##### <a name="kubernetes_version"></a>`kubernetes_version`
 
@@ -2174,6 +2187,14 @@ Data type: `Optional[String]`
 
 
 
+Default value: ``undef``
+
+##### <a name="skip_phases_join"></a>`skip_phases_join`
+
+Data type: `Optional[Array]`
+
+
+
 Default value: ``undef``
 
 ##### <a name="conntrack_max_per_core"></a>`conntrack_max_per_core`
@@ -2232,6 +2253,14 @@ Data type: `Integer`
 
 Default value: `6`
 
+##### <a name="feature_gates"></a>`feature_gates`
+
+Data type: `Hash[String[1], Boolean]`
+
+
+
+Default value: `{}`
+
 ### <a name="kubernetescluster_roles"></a>`kubernetes::cluster_roles`
 
 The kubernetes::cluster_roles class.
@@ -2384,6 +2413,7 @@ The following parameters are available in the `kubernetes::config::kubeadm` clas
 * [`conntrack_min`](#conntrack_min)
 * [`conntrack_tcp_wait_timeout`](#conntrack_tcp_wait_timeout)
 * [`conntrack_tcp_stablished_timeout`](#conntrack_tcp_stablished_timeout)
+* [`feature_gates`](#feature_gates)
 
 ##### <a name="config_file"></a>`config_file`
 
@@ -2889,6 +2919,14 @@ Data type: `String`
 
 Default value: `$kubernetes::conntrack_tcp_stablished_timeout`
 
+##### <a name="feature_gates"></a>`feature_gates`
+
+Data type: `Hash[String[1], Boolean]`
+
+
+
+Default value: `$kubernetes::feature_gates`
+
 ### <a name="kubernetesconfigworker"></a>`kubernetes::config::worker`
 
 Class kubernetes config_worker, populates worker config files with joinconfig
@@ -2916,6 +2954,7 @@ The following parameters are available in the `kubernetes::config::worker` class
 * [`ignore_preflight_errors`](#ignore_preflight_errors)
 * [`skip_ca_verification`](#skip_ca_verification)
 * [`cgroup_driver`](#cgroup_driver)
+* [`skip_phases_join`](#skip_phases_join)
 
 ##### <a name="node_name"></a>`node_name`
 
@@ -3069,6 +3108,14 @@ Data type: `String`
 
 Default value: `$kubernetes::cgroup_driver`
 
+##### <a name="skip_phases_join"></a>`skip_phases_join`
+
+Data type: `Optional[Array]`
+
+
+
+Default value: `$kubernetes::skip_phases_join`
+
 ### <a name="kuberneteskube_addons"></a>`kubernetes::kube_addons`
 
 Class kubernetes kube_addons

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-kubernetes",
-  "version": "6.2.0",
+  "version": "6.3.0",
   "author": "puppetlabs",
   "summary": "The module installs and configures a Kubernetes cluster",
   "license": "Apache-2.0",