diff --git a/puppet-manifests/src/modules/platform/manifests/helm.pp b/puppet-manifests/src/modules/platform/manifests/helm.pp index 47b5effe14..31396dae90 100644 --- a/puppet-manifests/src/modules/platform/manifests/helm.pp +++ b/puppet-manifests/src/modules/platform/manifests/helm.pp @@ -76,9 +76,12 @@ class platform::helm } } else { - exec { 'initialize helm': + + Class['::platform::kubernetes::master'] + + -> exec { 'initialize helm': environment => [ 'KUBECONFIG=/etc/kubernetes/admin.conf', 'HOME=/home/wrsroot' ], - command => 'helm init --client-only', + command => 'helm init --skip-refresh --client-only', logoutput => true, user => 'wrsroot', group => 'wrs', diff --git a/puppet-manifests/src/modules/platform/manifests/kubernetes.pp b/puppet-manifests/src/modules/platform/manifests/kubernetes.pp index 2045f2791d..97bc539674 100644 --- a/puppet-manifests/src/modules/platform/manifests/kubernetes.pp +++ b/puppet-manifests/src/modules/platform/manifests/kubernetes.pp @@ -16,10 +16,14 @@ class platform::kubernetes::kubeadm { $iptables_file = "net.bridge.bridge-nf-call-ip6tables = 1 net.bridge.bridge-nf-call-iptables = 1" + # Ensure DNS is configured as name resolution is required when + # kubeadm init is run. + Class['::platform::dns'] + # Update iptables config. This is required based on: # https://kubernetes.io/docs/tasks/tools/install-kubeadm # This probably belongs somewhere else - initscripts package? - file { '/etc/sysctl.d/k8s.conf': + -> file { '/etc/sysctl.d/k8s.conf': ensure => file, content => $iptables_file, owner => 'root',