Merge pull request #520 from puppetlabs/release-prep

Release prep v6.2.0

CHANGELOG.md

@@ -2,6 +2,19 @@
 
 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.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)
+
+### Added
+
+- Allow configuring of waiting times during sa creation [\#519](https://github.com/puppetlabs/puppetlabs-kubernetes/pull/519) ([ZloeSabo](https://github.com/ZloeSabo))
+
+### Fixed
+
+- Support for kubernetes dashboard version 2.0.0 and onwards [\#528](https://github.com/puppetlabs/puppetlabs-kubernetes/pull/528) ([danifr](https://github.com/danifr))
+- Support both standard Calico and Calico Tigera [\#511](https://github.com/puppetlabs/puppetlabs-kubernetes/pull/511) ([treydock](https://github.com/treydock))
+
 ## [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)

REFERENCE.md

@@ -726,7 +726,7 @@ the files if they do not exist.
 
 [*runc_version*]
  The version of runc to install
- Defaults to 1.0.0-rc5
+ Defaults to 1.0.0
 
 [*runc_source*]
  The URL to download runc
@@ -897,11 +897,11 @@ the files if they do not exist.
 
 [*kubernetes_dashboard_url*]
   The URL to get the Kubernetes Dashboard yaml file.
-  Defaults to the upstream source. `kube_tool` sets this value.
+  Default is based on dashboard_version.
 
 [*dashboard_version*]
   The version of Kubernetes dashboard you want to install.
-  Defaults to v1.10.1
+  Defaults to 1.10.1
 
 [*schedule_on_controller*]
   A flag to remove the control plane role and allow pod scheduling on controllers
@@ -1576,15 +1576,15 @@ Data type: `String`
 
 
 
-Default value: `'v1.10.1'`
+Default value: `'1.10.1'`
 
 ##### <a name="kubernetes_dashboard_url"></a>`kubernetes_dashboard_url`
 
-Data type: `String`
+Data type: `Optional[String]`
 
 
 
-Default value: `"https://raw.githubusercontent.com/kubernetes/dashboard/${dashboard_version}/src/deploy/recommended/kubernetes-dashboard.yaml"`
+Default value: ``undef``
 
 ##### <a name="schedule_on_controller"></a>`schedule_on_controller`
 
@@ -1808,7 +1808,7 @@ Data type: `Optional[String]`
 
 
 
-Default value: `'1.0.0-rc5'`
+Default value: `'1.0.0'`
 
 ##### <a name="runc_source"></a>`runc_source`
 
@@ -3084,8 +3084,8 @@ The following parameters are available in the `kubernetes::kube_addons` class:
 * [`cni_rbac_binding`](#cni_rbac_binding)
 * [`install_dashboard`](#install_dashboard)
 * [`dashboard_version`](#dashboard_version)
+* [`dashboard_url`](#dashboard_url)
 * [`kubernetes_version`](#kubernetes_version)
-* [`kubernetes_dashboard_url`](#kubernetes_dashboard_url)
 * [`controller`](#controller)
 * [`schedule_on_controller`](#schedule_on_controller)
 * [`node_name`](#node_name)
@@ -3148,21 +3148,21 @@ Data type: `String`
 
 Default value: `$kubernetes::dashboard_version`
 
-##### <a name="kubernetes_version"></a>`kubernetes_version`
+##### <a name="dashboard_url"></a>`dashboard_url`
 
 Data type: `String`
 
 
 
-Default value: `$kubernetes::kubernetes_version`
+Default value: `$kubernetes::dashboard_url`
 
-##### <a name="kubernetes_dashboard_url"></a>`kubernetes_dashboard_url`
+##### <a name="kubernetes_version"></a>`kubernetes_version`
 
 Data type: `String`
 
 
 
-Default value: `$kubernetes::kubernetes_dashboard_url`
+Default value: `$kubernetes::kubernetes_version`
 
 ##### <a name="controller"></a>`controller`
 

metadata.json

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