Giuseppe Lavagetto has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/377459 )
Change subject: k8s: fix template scoping
......................................................................
k8s: fix template scoping
Since the future parser has different scoping rules, do as follows:
* Add a master_host parameter to k8s::infrastructure
* Explicitly declare k8s::infrastructure_config in k8s::node
* Change the "include" in a "require" for the config class in k8s::proxy
and k8s::kubelet as it's the proper logical relationship
Bug: T171704
Change-Id: I7a59f3337d3f1d5c96eafbe3240a1544ef2366d8
---
M modules/k8s/manifests/infrastructure_config.pp
M modules/k8s/manifests/kubelet.pp
M modules/k8s/manifests/proxy.pp
M modules/profile/manifests/kubernetes/node.pp
4 files changed, 8 insertions(+), 3 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, but someone else must approve
Giuseppe Lavagetto: Looks good to me, approved
Alexandros Kosiaris: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/modules/k8s/manifests/infrastructure_config.pp
b/modules/k8s/manifests/infrastructure_config.pp
index 61c2c5c..3953c93 100644
--- a/modules/k8s/manifests/infrastructure_config.pp
+++ b/modules/k8s/manifests/infrastructure_config.pp
@@ -1,4 +1,4 @@
-class k8s::infrastructure_config {
+class k8s::infrastructure_config($master_host) {
file { '/etc/kubernetes':
ensure => directory,
owner => 'root',
diff --git a/modules/k8s/manifests/kubelet.pp b/modules/k8s/manifests/kubelet.pp
index 885c894..68b6d36 100644
--- a/modules/k8s/manifests/kubelet.pp
+++ b/modules/k8s/manifests/kubelet.pp
@@ -11,7 +11,7 @@
$cni_bin_dir='/opt/cni/bin',
$cni_conf_dir='/etc/cni/net.d',
) {
- include ::k8s::infrastructure_config
+ require ::k8s::infrastructure_config
require_package('kubernetes-node')
diff --git a/modules/k8s/manifests/proxy.pp b/modules/k8s/manifests/proxy.pp
index e7ad8fa..c313c76 100644
--- a/modules/k8s/manifests/proxy.pp
+++ b/modules/k8s/manifests/proxy.pp
@@ -3,7 +3,7 @@
$proxy_mode = 'iptables',
$masquerade_all = true,
) {
- include ::k8s::infrastructure_config
+ require ::k8s::infrastructure_config
$master_ip = ipresolve($master_host, 4, $::nameservers[0])
diff --git a/modules/profile/manifests/kubernetes/node.pp
b/modules/profile/manifests/kubernetes/node.pp
index 881208c..90642c3 100644
--- a/modules/profile/manifests/kubernetes/node.pp
+++ b/modules/profile/manifests/kubernetes/node.pp
@@ -10,6 +10,11 @@
user => 'root',
group => 'root',
}
+
+ class { '::k8s::infrastructure_config':
+ master_host => $master_fqdn,
+ }
+
class { '::k8s::kubelet':
master_host => $master_fqdn,
listen_address => '0.0.0.0',
--
To view, visit https://gerrit.wikimedia.org/r/377459
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7a59f3337d3f1d5c96eafbe3240a1544ef2366d8
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: Gehel <guillaume.leder...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
