From 9e654b91046eb7952e90ae56531647cdc003a2d4 Mon Sep 17 00:00:00 2001
From: Victor Cabezas <vcabezas@tuenti.com>
Date: Wed, 1 Aug 2018 11:53:00 +0200
Subject: [PATCH 1/3] Make vault-helper download URL customizable

---
 puppet/modules/vault_client/manifests/init.pp    | 5 +++--
 puppet/modules/vault_client/manifests/install.pp | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/puppet/modules/vault_client/manifests/init.pp b/puppet/modules/vault_client/manifests/init.pp
index a4f80545b5..a18e27d210 100644
--- a/puppet/modules/vault_client/manifests/init.pp
+++ b/puppet/modules/vault_client/manifests/init.pp
@@ -25,6 +25,7 @@
   $version = $::vault_client::params::version,
   $bin_dir = $::vault_client::params::bin_dir,
   $download_dir = $::vault_client::params::download_dir,
+  $download_url = $::vault_client::params::download_url,
   $dest_dir = $::vault_client::params::dest_dir,
   $server_url = $::vault_client::params::server_url,
   $systemd_dir = $::vault_client::params::systemd_dir,
@@ -51,8 +52,8 @@
   }
 
   ## build download URL
-  $download_url = regsubst(
-    $::vault_client::params::download_url,
+  $real_download_url = regsubst(
+    $download_url,
     '#VERSION#',
     $version,
     'G'
diff --git a/puppet/modules/vault_client/manifests/install.pp b/puppet/modules/vault_client/manifests/install.pp
index 721855b925..b85503bd96 100644
--- a/puppet/modules/vault_client/manifests/install.pp
+++ b/puppet/modules/vault_client/manifests/install.pp
@@ -11,7 +11,7 @@
         mode   => '0755',
     }
     -> exec {"vault-helper-${vault_client::version}-download":
-        command => "curl -sL ${::vault_client::download_url} -o ${vault_helper_path}/vault-helper",
+        command => "curl -sL ${::vault_client::real_download_url} -o ${vault_helper_path}/vault-helper",
         creates => "${vault_helper_path}/vault-helper",
         path    => ['/usr/bin', '/bin'],
     }

From 8d2e82ddcac909c965f9dd78bdde65207edd55d1 Mon Sep 17 00:00:00 2001
From: Victor Cabezas <vcabezas@tuenti.com>
Date: Thu, 9 Aug 2018 21:01:43 +0200
Subject: [PATCH 2/3] Improve vault_client README

---
 puppet/modules/vault_client/README.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/puppet/modules/vault_client/README.md b/puppet/modules/vault_client/README.md
index 14e0afa51e..b004d1f516 100644
--- a/puppet/modules/vault_client/README.md
+++ b/puppet/modules/vault_client/README.md
@@ -38,6 +38,10 @@ Puppet module to install and manage a vault client install
 [*init_role*]
   TODO
 
+[*download_url*]
+  Download url for the `vault-helper` binary. It supports the placeholder `#VERSION#`
+  that gets replaced by `$version` variable.
+
 #### Parameters
 
 ##### `version`
@@ -55,6 +59,11 @@ Puppet module to install and manage a vault client install
 * Type: `Any`
 * Default: `$::vault_client::params::download_dir`
 
+##### `download_url`
+
+* Type: `Any`
+* Default: `$::vault_client::params::download_url`
+
 ##### `dest_dir`
 
 * Type: `Any`

From d96a209477f61c6d077d3963bb8c76afe32c9a1f Mon Sep 17 00:00:00 2001
From: Victor Cabezas <vcabezas@tuenti.com>
Date: Thu, 9 Aug 2018 21:01:56 +0200
Subject: [PATCH 3/3] Add download_url capability to hyperkube download

---
 puppet/modules/kubernetes/README.md            | 5 +++++
 puppet/modules/kubernetes/manifests/init.pp    | 5 +++--
 puppet/modules/kubernetes/manifests/install.pp | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/puppet/modules/kubernetes/README.md b/puppet/modules/kubernetes/README.md
index 30b1423611..42788eb7bd 100644
--- a/puppet/modules/kubernetes/README.md
+++ b/puppet/modules/kubernetes/README.md
@@ -33,6 +33,11 @@ Class: kubernetes
 * Type: `Any`
 * Default: `$::kubernetes::params::download_dir`
 
+##### `download_url`
+
+* Type: `Any`
+* Default: `$::kubernetes::params::download_url`
+
 ##### `dest_dir`
 
 * Type: `Any`
diff --git a/puppet/modules/kubernetes/manifests/init.pp b/puppet/modules/kubernetes/manifests/init.pp
index 7f53571eae..486f8e684a 100644
--- a/puppet/modules/kubernetes/manifests/init.pp
+++ b/puppet/modules/kubernetes/manifests/init.pp
@@ -3,6 +3,7 @@
   $version = $::kubernetes::params::version,
   $bin_dir = $::kubernetes::params::bin_dir,
   $download_dir = $::kubernetes::params::download_dir,
+  $download_url = $::kubernetes::params::download_url,
   $dest_dir = $::kubernetes::params::dest_dir,
   $config_dir = $::kubernetes::params::config_dir,
   $systemd_dir = $::kubernetes::params::systemd_dir,
@@ -96,8 +97,8 @@
       $_master_url = $master_url
   }
 
-  $download_url = regsubst(
-    $::kubernetes::params::download_url,
+  $real_download_url = regsubst(
+    $download_url,
     '#VERSION#',
     $version,
     'G'
diff --git a/puppet/modules/kubernetes/manifests/install.pp b/puppet/modules/kubernetes/manifests/install.pp
index 2b845a6a92..8952effacb 100644
--- a/puppet/modules/kubernetes/manifests/install.pp
+++ b/puppet/modules/kubernetes/manifests/install.pp
@@ -9,7 +9,7 @@
     mode   => '0755',
   }
   -> exec {"kubernetes-${kubernetes::version}-download":
-    command => "curl -sL -o  ${hyperkube_path} ${::kubernetes::download_url}",
+    command => "curl -sL -o  ${hyperkube_path} ${::kubernetes::real_download_url}",
     creates => $hyperkube_path,
     path    => ['/usr/bin/', '/bin'],
   }