Addresses #305. Modify config_version to kubernetes_version mapping. …

…Pre-req to supporting Kube 1.15. (#308)
puppetlabs · Jun 18, 2019 · 7d85f9a · 7d85f9a
1 parent d571381
commit 7d85f9a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/manifests/config/kubeadm.pp b/manifests/config/kubeadm.pp
@@ -138,8 +138,8 @@
 
   $config_version = $kubernetes_version ? {
     /1.1(0|1)/ => 'v1alpha1',
-    /1.1(3|4)/  => 'v1beta1',
-    default    => 'v1alpha3',
+    /1.12/     => 'v1alpha3',
+    default    => 'v1beta1',
   }
 
   file { $config_file:

diff --git a/manifests/config/worker.pp b/manifests/config/worker.pp
@@ -24,8 +24,8 @@
   $kubelet_extra_config_yaml = regsubst(to_yaml($kubelet_extra_config), '^---\n', '')
 
   $template = $kubernetes_version ? {
-    /1.1(3|4)/  => 'v1beta1',
-    default => 'v1alpha3',
+    /1.12/  => 'v1alpha3',
+    default => 'v1beta1',
   }
 
   file { '/etc/kubernetes':