From 1b8a344edd3c69c671ecce7c65a3c6822fff91f8 Mon Sep 17 00:00:00 2001
From: Bart Wensley <barton.wensley@windriver.com>
Date: Tue, 15 Jan 2019 09:46:51 -0600
Subject: [PATCH] Ensure /etc/kubernetes/manifests directory exists

Ensure the /etc/kubernetes/manifests directory exists before
starting kubelet. This will avoid repeating kubelet logs on
worker nodes, complaining that the directory does not exist.

Also removing an unused yum config file for the kubernetes
repo.

Change-Id: Id63287481f9fe063f1b8c993d973a4b4517abd81
Story: 2004520
Task: 28908
Signed-off-by: Bart Wensley <barton.wensley@windriver.com>
---
 .../modules/platform/manifests/kubernetes.pp  | 27 ++++++-------------
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/puppet-manifests/src/modules/platform/manifests/kubernetes.pp b/puppet-manifests/src/modules/platform/manifests/kubernetes.pp
index d132dd8766..b6b6a74b15 100644
--- a/puppet-manifests/src/modules/platform/manifests/kubernetes.pp
+++ b/puppet-manifests/src/modules/platform/manifests/kubernetes.pp
@@ -13,31 +13,13 @@ class platform::kubernetes::params (
 ) { }
 
 class platform::kubernetes::kubeadm {
-  $repo_file = "[kubernetes]
-    name=Kubernetes
-    baseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64
-    enabled=1
-    gpgcheck=1
-    repo_gpgcheck=1
-    gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg"
   $iptables_file = "net.bridge.bridge-nf-call-ip6tables = 1
     net.bridge.bridge-nf-call-iptables = 1"
 
-  # Configure the kubernetes repo to allow us to download docker images for
-  # the kubernetes components. This will disappear once we have our own
-  # repo.
-  file { '/etc/yum.repos.d/kubernetes.repo':
-    ensure  => file,
-    content => $repo_file,
-    owner   => 'root',
-    group   => 'root',
-    mode    => '0644',
-  }
-
   # 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',
@@ -48,6 +30,13 @@ class platform::kubernetes::kubeadm {
     command => 'sysctl --system',
   }
 
+  # Create manifests directory required by kubelet
+  -> file { '/etc/kubernetes/manifests':
+    ensure => directory,
+    owner  => 'root',
+    group  => 'root',
+    mode   => '0700',
+  }
   # Start kubelet.
   -> service { 'kubelet':
     ensure => 'running',