Merge pull request #517 from puppetlabs/release-prep

Release prep v6.1.0

Author: daianamezdrea

CHANGELOG.md

@@ -2,6 +2,23 @@
 
 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.1.0](https://github.com/puppetlabs/puppetlabs-kubernetes/tree/v6.1.0) (2021-05-11)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-kubernetes/compare/v6.0.0...v6.1.0)
+
+### Added
+
+- Add config.toml for containerd installed with 'archive' [\#516](https://github.com/puppetlabs/puppetlabs-kubernetes/pull/516) ([danifr](https://github.com/danifr))
+- Improvements to containerd configs when using a package [\#510](https://github.com/puppetlabs/puppetlabs-kubernetes/pull/510) ([treydock](https://github.com/treydock))
+- Add kubeadm skip-phases option [\#507](https://github.com/puppetlabs/puppetlabs-kubernetes/pull/507) ([BaronMsk](https://github.com/BaronMsk))
+- Configure image registry settings for  containerd when installed via package [\#500](https://github.com/puppetlabs/puppetlabs-kubernetes/pull/500) ([andeman](https://github.com/andeman))
+
+### Fixed
+
+- \(IAC-1497\) - Removal of unsupported `translate` dependency [\#501](https://github.com/puppetlabs/puppetlabs-kubernetes/pull/501) ([david22swan](https://github.com/david22swan))
+- Repair containerd archive [\#497](https://github.com/puppetlabs/puppetlabs-kubernetes/pull/497) ([daianamezdrea](https://github.com/daianamezdrea))
+- Added information about Hiera YAML Lookup; installing a updated version. [\#494](https://github.com/puppetlabs/puppetlabs-kubernetes/pull/494) ([bitvijays](https://github.com/bitvijays))
+
 ## [v6.0.0](https://github.com/puppetlabs/puppetlabs-kubernetes/tree/v6.0.0) (2021-02-27)
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-kubernetes/compare/v5.5.0...v6.0.0)
@@ -115,7 +132,7 @@ All notable changes to this project will be documented in this file. The format
 ### Fixed
 
 - Manage front-proxy ca certs - fixes \#275 [\#321](https://github.com/puppetlabs/puppetlabs-kubernetes/pull/321) ([nickperry](https://github.com/nickperry))
-- Expose ttl duration parameter [\#313](https://github.com/puppetlabs/puppetlabs-kubernetes/pull/313) ([carabasdaniel](https://github.com/carabasdaniel))
+- \(IAC-181\) Expose ttl duration parameter [\#313](https://github.com/puppetlabs/puppetlabs-kubernetes/pull/313) ([carabasdaniel](https://github.com/carabasdaniel))
 - make proxy mode configurable [\#297](https://github.com/puppetlabs/puppetlabs-kubernetes/pull/297) ([mrwulf](https://github.com/mrwulf))
 - Fixed duplicate tlsBootstrapToken in config\_worker.yaml.erb for kubernetes 1.14 [\#287](https://github.com/puppetlabs/puppetlabs-kubernetes/pull/287) ([Hillkorn](https://github.com/Hillkorn))
 
@@ -130,10 +147,6 @@ All notable changes to this project will be documented in this file. The format
 - Avoid log message about waiting for SA when it already exists [\#278](https://github.com/puppetlabs/puppetlabs-kubernetes/pull/278) ([jorhett](https://github.com/jorhett))
 - MODULES-8947 fixing bugs and tests [\#274](https://github.com/puppetlabs/puppetlabs-kubernetes/pull/274) ([sheenaajay](https://github.com/sheenaajay))
 
-### UNCATEGORIZED PRS; LABEL THEM ON GITHUB
-
-- Add kubeadm v1beta1 [\#272](https://github.com/puppetlabs/puppetlabs-kubernetes/pull/272) ([carabasdaniel](https://github.com/carabasdaniel))
-
 # Version 4.0.0
 
 Upgrade tasks for version v1beta1

REFERENCE.md

@@ -560,6 +560,8 @@
 ### Plans
 
 * [`k8s::deploy`](#k8sdeploy): This plan is meant to create a deployment and a service on Kubernetes To run this plan you will have to enable the anonymous user access to y
+* [`kubernetes::provision_cluster`](#kubernetesprovision_cluster): Provisions machines
+* [`kubernetes::puppetserver_setup`](#kubernetespuppetserver_setup): Provisions machines
 
 ## Classes
 
@@ -617,6 +619,25 @@ the files if they do not exist.
  The URL to download the containerd archive
  Defaults to https://github.com/containerd/containerd/releases/download/v${containerd_version}/${containerd_archive}
 
+[*containerd_config_template*]
+  The template to use for containerd configuration
+  This value is ignored if containerd_config_source is defined
+  Default to 'kubernetes/containerd/config.toml.erb'
+
+[*containerd_config_source*]
+  The source of the containerd configuration
+  This value overrides containerd_config_template
+  Default to undef
+
+[*containerd_plugins_registry*]
+ The configuration for the image registries used by containerd when containerd_install_method is package.
+ See https://github.com/containerd/containerd/blob/master/docs/cri/registry.md
+ Defaults to `undef`
+
+[*containerd_default_runtime_name*]
+  The default runtime to use with containerd
+  Defaults to runc
+
 [*dns_domain*]
   This is a string that sets the dns domain in kubernetes cluster
   Default cluster.local
@@ -1066,6 +1087,10 @@ Default to 24h0m0s
 Directory to use when downloading archives for install.
 Default to /var/tmp/puppetlabs-kubernetes
 
+[*skip_phases*]
+Allow kubeadm init skip some phases
+Default: none phases skipped
+
 Authors
 -------
 
@@ -1153,6 +1178,10 @@ The following parameters are available in the `kubernetes` class:
 * [`containerd_archive`](#containerd_archive)
 * [`containerd_archive_checksum`](#containerd_archive_checksum)
 * [`containerd_source`](#containerd_source)
+* [`containerd_config_template`](#containerd_config_template)
+* [`containerd_config_source`](#containerd_config_source)
+* [`containerd_plugins_registry`](#containerd_plugins_registry)
+* [`containerd_default_runtime_name`](#containerd_default_runtime_name)
 * [`etcd_archive`](#etcd_archive)
 * [`etcd_archive_checksum`](#etcd_archive_checksum)
 * [`etcd_package_name`](#etcd_package_name)
@@ -1188,6 +1217,7 @@ The following parameters are available in the `kubernetes` class:
 * [`ignore_preflight_errors`](#ignore_preflight_errors)
 * [`metrics_bind_address`](#metrics_bind_address)
 * [`join_discovery_file`](#join_discovery_file)
+* [`skip_phases`](#skip_phases)
 * [`conntrack_max_per_core`](#conntrack_max_per_core)
 * [`conntrack_min`](#conntrack_min)
 * [`conntrack_tcp_wait_timeout`](#conntrack_tcp_wait_timeout)
@@ -1800,7 +1830,7 @@ Data type: `Optional[String]`
 
 
 
-Default value: `"containerd-${containerd_version}.linux-amd64.tar.gz"`
+Default value: `"containerd-${containerd_version}-linux-amd64.tar.gz"`
 
 ##### <a name="containerd_archive_checksum"></a>`containerd_archive_checksum`
 
@@ -1818,6 +1848,44 @@ Data type: `Optional[String]`
 
 Default value: `"https://github.com/containerd/containerd/releases/download/v${containerd_version}/${containerd_archive}"`
 
+##### <a name="containerd_config_template"></a>`containerd_config_template`
+
+Data type: `String`
+
+
+
+Default value: `'kubernetes/containerd/config.toml.erb'`
+
+##### <a name="containerd_config_source"></a>`containerd_config_source`
+
+Data type: `Optional[String]`
+
+
+
+Default value: ``undef``
+
+##### <a name="containerd_plugins_registry"></a>`containerd_plugins_registry`
+
+Data type: `Optional[Hash]`
+
+
+
+Default value: `{
+    'docker.io' => {
+      'mirrors' => {
+        'endpoint' => 'https://registry-1.docker.io'
+      },
+    },
+  }`
+
+##### <a name="containerd_default_runtime_name"></a>`containerd_default_runtime_name`
+
+Data type: `Enum['runc','nvidia']`
+
+
+
+Default value: `'runc'`
+
 ##### <a name="etcd_archive"></a>`etcd_archive`
 
 Data type: `String`
@@ -2096,6 +2164,14 @@ Data type: `Optional[String]`
 
 
 
+Default value: ``undef``
+
+##### <a name="skip_phases"></a>`skip_phases`
+
+Data type: `Optional[String]`
+
+
+
 Default value: ``undef``
 
 ##### <a name="conntrack_max_per_core"></a>`conntrack_max_per_core`
@@ -2153,6 +2229,7 @@ The following parameters are available in the `kubernetes::cluster_roles` class:
 * [`join_discovery_file`](#join_discovery_file)
 * [`ignore_preflight_errors`](#ignore_preflight_errors)
 * [`env`](#env)
+* [`skip_phases`](#skip_phases)
 
 ##### <a name="controller"></a>`controller`
 
@@ -2210,6 +2287,14 @@ Data type: `Optional[Array]`
 
 Default value: `$kubernetes::environment`
 
+##### <a name="skip_phases"></a>`skip_phases`
+
+Data type: `Optional[String]`
+
+
+
+Default value: `$kubernetes::skip_phases`
+
 ### <a name="kubernetesconfigkubeadm"></a>`kubernetes::config::kubeadm`
 
 Class kubernetes config kubeadm, populates kubeadm config file with params to bootstrap cluster
@@ -3128,6 +3213,10 @@ The following parameters are available in the `kubernetes::packages` class:
 * [`containerd_archive`](#containerd_archive)
 * [`containerd_archive_checksum`](#containerd_archive_checksum)
 * [`containerd_source`](#containerd_source)
+* [`containerd_config_template`](#containerd_config_template)
+* [`containerd_config_source`](#containerd_config_source)
+* [`containerd_plugins_registry`](#containerd_plugins_registry)
+* [`containerd_default_runtime_name`](#containerd_default_runtime_name)
 * [`etcd_archive`](#etcd_archive)
 * [`etcd_archive_checksum`](#etcd_archive_checksum)
 * [`etcd_version`](#etcd_version)
@@ -3297,6 +3386,38 @@ Data type: `Optional[String]`
 
 Default value: `$kubernetes::containerd_source`
 
+##### <a name="containerd_config_template"></a>`containerd_config_template`
+
+Data type: `String`
+
+
+
+Default value: `$kubernetes::containerd_config_template`
+
+##### <a name="containerd_config_source"></a>`containerd_config_source`
+
+Data type: `Optional[String]`
+
+
+
+Default value: `$kubernetes::containerd_config_source`
+
+##### <a name="containerd_plugins_registry"></a>`containerd_plugins_registry`
+
+Data type: `Optional[Hash]`
+
+
+
+Default value: `$kubernetes::containerd_plugins_registry`
+
+##### <a name="containerd_default_runtime_name"></a>`containerd_default_runtime_name`
+
+Data type: `Enum['runc','nvidia']`
+
+
+
+Default value: `$kubernetes::containerd_default_runtime_name`
+
 ##### <a name="etcd_archive"></a>`etcd_archive`
 
 Data type: `String`
@@ -3702,6 +3823,7 @@ The following parameters are available in the `kubernetes::kubeadm_init` defined
 * [`path`](#path)
 * [`env`](#env)
 * [`ignore_preflight_errors`](#ignore_preflight_errors)
+* [`skip_phases`](#skip_phases)
 
 ##### <a name="node_name"></a>`node_name`
 
@@ -3751,6 +3873,14 @@ Data type: `Optional[Array]`
 
 Default value: `$kubernetes::ignore_preflight_errors`
 
+##### <a name="skip_phases"></a>`skip_phases`
+
+Data type: `Optional[String]`
+
+
+
+Default value: `$kubernetes::skip_phases`
+
 ### <a name="kuberneteskubeadm_join"></a>`kubernetes::kubeadm_join`
 
 == kubernetes::kubeadm_join
@@ -53511,3 +53641,64 @@ Data type: `String[1]`
 
 
 
+### <a name="kubernetesprovision_cluster"></a>`kubernetes::provision_cluster`
+
+Provisions machines for integration testing
+
+#### Examples
+
+##### 
+
+```puppet
+kubernetes::provision_cluster
+```
+
+#### Parameters
+
+The following parameters are available in the `kubernetes::provision_cluster` plan:
+
+* [`image_type`](#image_type)
+* [`provision_type`](#provision_type)
+
+##### <a name="image_type"></a>`image_type`
+
+Data type: `Optional[String]`
+
+
+
+Default value: `'centos-7'`
+
+##### <a name="provision_type"></a>`provision_type`
+
+Data type: `Optional[String]`
+
+
+
+Default value: `'provision_service'`
+
+### <a name="kubernetespuppetserver_setup"></a>`kubernetes::puppetserver_setup`
+
+Puppet Server Setup
+
+#### Examples
+
+##### 
+
+```puppet
+kubernetes::puppetserver_setup
+```
+
+#### Parameters
+
+The following parameters are available in the `kubernetes::puppetserver_setup` plan:
+
+* [`collection`](#collection)
+
+##### <a name="collection"></a>`collection`
+
+Data type: `Optional[String]`
+
+
+
+Default value: `'puppet7-nightly'`
+

metadata.json

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