Yuvipanda has uploaded a new change for review. https://gerrit.wikimedia.org/r/287501
Change subject: k8s: Allow pod infra image to be overriden with hiera ...................................................................... k8s: Allow pod infra image to be overriden with hiera Bug: T133873 Change-Id: If5a007ad180b0b700f9763824d937ff68ac995c6 --- M modules/k8s/manifests/kubelet.pp M modules/k8s/templates/initscripts/kubelet.systemd.erb 2 files changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/01/287501/1 diff --git a/modules/k8s/manifests/kubelet.pp b/modules/k8s/manifests/kubelet.pp index 8e6539e..55554a2 100644 --- a/modules/k8s/manifests/kubelet.pp +++ b/modules/k8s/manifests/kubelet.pp @@ -1,6 +1,7 @@ class k8s::kubelet( $master_host, $cluster_dns_ip = '192.168.0.100', + $pod_infra_container_image = 'gcr.io/google_containers/pause:2.0', ) { include ::k8s::infrastructure_config diff --git a/modules/k8s/templates/initscripts/kubelet.systemd.erb b/modules/k8s/templates/initscripts/kubelet.systemd.erb index bcd0ccf..4acab48 100644 --- a/modules/k8s/templates/initscripts/kubelet.systemd.erb +++ b/modules/k8s/templates/initscripts/kubelet.systemd.erb @@ -10,7 +10,8 @@ --tls-private-key-file=/var/lib/kubernetes/ssl/private_keys/server.key \ --tls-cert-file=/var/lib/kubernetes/ssl/certs/cert.pem \ --cluster-domain=kube \ - --hostname-override=<%= @fqdn %> + --hostname-override=<%= @fqdn %> \ + --pod-infra-container-image="<%= @pod_infra_container_image %>" [Install] WantedBy=multi-user.target -- To view, visit https://gerrit.wikimedia.org/r/287501 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If5a007ad180b0b700f9763824d937ff68ac995c6 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Yuvipanda <yuvipa...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits