Alexandros Kosiaris has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/391807 )
Change subject: Remove unused cluster_dns_ip kubelet parameter
......................................................................
Remove unused cluster_dns_ip kubelet parameter
cluster_dns_ip is not used in kubelet in any way in our configuration.
Remove it. While at it, remove the forced undef cluster_domain parameter
from the invocation as well
Change-Id: I0b535fafc31ab70ef1c203ecb90d2679c924c8a9
---
M modules/k8s/manifests/kubelet.pp
M modules/profile/manifests/kubernetes/node.pp
2 files changed, 0 insertions(+), 3 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/k8s/manifests/kubelet.pp b/modules/k8s/manifests/kubelet.pp
index 08e7273..061d07f 100644
--- a/modules/k8s/manifests/kubelet.pp
+++ b/modules/k8s/manifests/kubelet.pp
@@ -2,7 +2,6 @@
$master_host,
$listen_address = '0.0.0.0',
$listen_port = undef,
- $cluster_dns_ip = '192.168.0.100',
$pod_infra_container_image = 'gcr.io/google_containers/pause:2.0',
$cluster_domain = 'kube',
$tls_cert = '/var/lib/kubernetes/ssl/certs/cert.pem',
diff --git a/modules/profile/manifests/kubernetes/node.pp
b/modules/profile/manifests/kubernetes/node.pp
index c49b3e2..e525014 100644
--- a/modules/profile/manifests/kubernetes/node.pp
+++ b/modules/profile/manifests/kubernetes/node.pp
@@ -24,10 +24,8 @@
class { '::k8s::kubelet':
master_host => $master_fqdn,
listen_address => '0.0.0.0',
- cluster_dns_ip => '192.168.0.100',
cni => $use_cni,
pod_infra_container_image => $infra_pod,
- cluster_domain => undef,
tls_cert => '/etc/kubernetes/ssl/cert.pem',
tls_key => '/etc/kubernetes/ssl/server.key',
kubeconfig => $kubelet_config,
--
To view, visit https://gerrit.wikimedia.org/r/391807
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0b535fafc31ab70ef1c203ecb90d2679c924c8a9
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Gehel <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
