From f33c43b39048bfa75f8151f2faecc3faaffb4832 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 10 Jun 2020 09:14:31 +0200 Subject: [PATCH] Fix typo in configuration comment The files are supposed to be in /etc/crio/crio.conf.d/ not /etc/crio/conf.d/. Also cleanup wording a bit. --- pkg/skuba/actions/cluster/init/manifests.go | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkg/skuba/actions/cluster/init/manifests.go b/pkg/skuba/actions/cluster/init/manifests.go index 5b4b6be2e4..24d735eafb 100644 --- a/pkg/skuba/actions/cluster/init/manifests.go +++ b/pkg/skuba/actions/cluster/init/manifests.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 SUSE LLC. + * Copyright (c) 2019-2020 SUSE LLC. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,9 +18,14 @@ package cluster const ( - CriConfFolderReadme = `This directory contains CRI-O configuration files that are uploaded to CaaSP nodes. All the files (except this README) will be uploaded to the /etc/crio/conf.d/ folder. If it is required user custom files name as 99-custom.conf + CriConfFolderReadme = `This folder provides CRI-O configuration for CaaSP nodes. +All the files (except this README) will be uploaded to the /etc/crio/crio.conf.d/ folder. +If you need any customization, please add a custom files with the name 99-custom.conf ` - criDockerDefaultsConf = `## Path : System/Management + criDockerDefaultsConf = `# PLEASE DON'T EDIT THIS FILE! +# This file is managed by CaaSP skuba. + +## Path : System/Management ## Description : Extra cli switches for crio daemon ## Type : string ## Default : ""