From cba2b66e9b27efc077b89fb5e661b8dffc890fd8 Mon Sep 17 00:00:00 2001 From: Erich Cordoba Date: Thu, 21 Feb 2019 11:21:28 -0600 Subject: [PATCH] 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 --- .../src/modules/platform/manifests/kubernetes.pp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/puppet-manifests/src/modules/platform/manifests/kubernetes.pp b/puppet-manifests/src/modules/platform/manifests/kubernetes.pp index 97bc539674..7b2f22c0b8 100644 --- a/puppet-manifests/src/modules/platform/manifests/kubernetes.pp +++ b/puppet-manifests/src/modules/platform/manifests/kubernetes.pp @@ -16,14 +16,10 @@ 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', @@ -271,6 +267,9 @@ class platform::kubernetes::master Class['::platform::etcd'] -> 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::master::init'] -> Class['::platform::kubernetes::firewall']