starlingx
/
config
Code Issues Proposed changes

Revert "Changing tiller pod networking settings to improve swact time" 

This reverts commit 4802f1d96a.
The change made is no longer necessary due to commit 9a4b6b6a.
The playbookconfig code was moved to the ansible-playbooks repo
and will be removed there.

Conflicts:
	playbookconfig/centos/build_srpm.data
	playbookconfig/playbookconfig/playbooks/bootstrap/roles/bringup-essential-services/tasks/bringup_helm.yml
	puppet-manifests/centos/build_srpm.data
	puppet-manifests/src/modules/platform/manifests/helm.pp

Change-Id: I20a38c1ad882bebb6e1208f43d6582bc399e9e87
Related-Bug: 1817941
Signed-off-by: Bart Wensley <barton.wensley@windriver.com>
This commit is contained in:
Bart Wensley 2019-07-15 13:05:35 -05:00
parent bdc014347d
commit a5c236dc52
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
puppet-manifests/src/modules/platform/manifests/helm.pp
View File

@ -133,7 +133,7 @@ class platform::helm
-> exec { 'initialize helm':
environment => [ 'KUBECONFIG=/etc/kubernetes/admin.conf', 'HOME=/home/sysadmin' ],
command => "helm init --skip-refresh --service-account tiller --node-selectors \"node-role.kubernetes.io/master\"=\"\" --tiller-image=${gcr_registry}/kubernetes-helm/tiller:v2.13.1 --override spec.template.spec.hostNetwork=true", # lint:ignore:140chars
command => "helm init --skip-refresh --service-account tiller --node-selectors \"node-role.kubernetes.io/master\"=\"\" --tiller-image=${gcr_registry}/kubernetes-helm/tiller:v2.13.1", # lint:ignore:140chars
logoutput => true,
user => 'sysadmin',
group => 'sys_protected',