Move DNS requirement into kubernetes::master
This was causing a failure in computes unlock process where the Platform::Dns class cannot be found. Closes-bug: 1817126 Change-Id: I0a9e9b60580944a49b9672803fc05216f204b222 Signed-off-by: Erich Cordoba <erich.cordoba.malibran@intel.com>
This commit is contained in:
parent
28766a8d43
commit
cba2b66e9b
|
@ -16,14 +16,10 @@ class platform::kubernetes::kubeadm {
|
||||||
$iptables_file = "net.bridge.bridge-nf-call-ip6tables = 1
|
$iptables_file = "net.bridge.bridge-nf-call-ip6tables = 1
|
||||||
net.bridge.bridge-nf-call-iptables = 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:
|
# Update iptables config. This is required based on:
|
||||||
# https://kubernetes.io/docs/tasks/tools/install-kubeadm
|
# https://kubernetes.io/docs/tasks/tools/install-kubeadm
|
||||||
# This probably belongs somewhere else - initscripts package?
|
# This probably belongs somewhere else - initscripts package?
|
||||||
-> file { '/etc/sysctl.d/k8s.conf':
|
file { '/etc/sysctl.d/k8s.conf':
|
||||||
ensure => file,
|
ensure => file,
|
||||||
content => $iptables_file,
|
content => $iptables_file,
|
||||||
owner => 'root',
|
owner => 'root',
|
||||||
|
@ -271,6 +267,9 @@ class platform::kubernetes::master
|
||||||
|
|
||||||
Class['::platform::etcd'] -> Class[$name]
|
Class['::platform::etcd'] -> Class[$name]
|
||||||
Class['::platform::docker::config'] -> Class[$name]
|
Class['::platform::docker::config'] -> Class[$name]
|
||||||
|
# Ensure DNS is configured as name resolution is required when
|
||||||
|
# kubeadm init is run.
|
||||||
|
Class['::platform::dns'] -> Class[$name]
|
||||||
Class['::platform::kubernetes::kubeadm']
|
Class['::platform::kubernetes::kubeadm']
|
||||||
-> Class['::platform::kubernetes::master::init']
|
-> Class['::platform::kubernetes::master::init']
|
||||||
-> Class['::platform::kubernetes::firewall']
|
-> Class['::platform::kubernetes::firewall']
|
||||||
|
|
Loading…
Reference in New Issue