Alexandros Kosiaris has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/352581 )
Change subject: Migrate to using kubemaster.svc.$site.wmnet
......................................................................
Migrate to using kubemaster.svc.$site.wmnet
Use the LVS service's IP address instead of using the fqdn of the very
first host from the master hosts.
Change-Id: Ic42087bf72e4d54e1ef703612693d64301d6488f
---
M hieradata/role/common/kubernetes/worker.yaml
M modules/profile/manifests/kubernetes/node.pp
2 files changed, 4 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/81/352581/1
diff --git a/hieradata/role/common/kubernetes/worker.yaml
b/hieradata/role/common/kubernetes/worker.yaml
index 0f8294d..5d4985d 100644
--- a/hieradata/role/common/kubernetes/worker.yaml
+++ b/hieradata/role/common/kubernetes/worker.yaml
@@ -6,6 +6,7 @@
profile::docker::storage::vg_to_remove: ''
profile::docker::engine::version: "1.12.6-0~debian-jessie"
profile::docker::engine::declare_service: true
+profile::kubernetes::master_fqdn: "kubemaster.svc.%{::site}.wmnet"
profile::kubernetes::master_hosts:
- argon.eqiad.wmnet
- chlorine.eqiad.wmnet
diff --git a/modules/profile/manifests/kubernetes/node.pp
b/modules/profile/manifests/kubernetes/node.pp
index 402e86c..881208c 100644
--- a/modules/profile/manifests/kubernetes/node.pp
+++ b/modules/profile/manifests/kubernetes/node.pp
@@ -1,4 +1,5 @@
class profile::kubernetes::node(
+ $master_fqdn = hiera('profile::kubernetes::master_fqdn'),
$master_hosts = hiera('profile::kubernetes::master_hosts'),
$infra_pod = hiera('profile::kubernetes::infra_pod'),
$use_cni = hiera('profile::kubernetes::use_cni')
@@ -9,11 +10,8 @@
user => 'root',
group => 'root',
}
- # TODO: Evaluate whether it makes sense to use a naive per host balancing
- # based on fqdn_rand() here or whether a more HA solution is better
- $master_host = $master_hosts[0]
class { '::k8s::kubelet':
- master_host => $master_host,
+ master_host => $master_fqdn,
listen_address => '0.0.0.0',
cluster_dns_ip => '192.168.0.100',
cni => $use_cni,
@@ -23,7 +21,7 @@
tls_key => '/etc/kubernetes/ssl/server.key',
}
class { '::k8s::proxy':
- master_host => $master_host,
+ master_host => $master_fqdn,
}
$master_hosts_ferm = join($master_hosts, ' ')
--
To view, visit https://gerrit.wikimedia.org/r/352581
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic42087bf72e4d54e1ef703612693d64301d6488f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <akosia...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
