Yuvipanda has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/338470 )
Change subject: k8s: Fix puppet resource conflict that is absolutely stupid
......................................................................
k8s: Fix puppet resource conflict that is absolutely stupid
WHY CAN PUPPET NOT JUST DO mkdir -p
Change-Id: Ia7e18d2e31926815452fe691c28694bd73f20670
---
M modules/k8s/manifests/apiserver.pp
1 file changed, 8 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/70/338470/1
diff --git a/modules/k8s/manifests/apiserver.pp
b/modules/k8s/manifests/apiserver.pp
index 5bf8970..24a2321 100644
--- a/modules/k8s/manifests/apiserver.pp
+++ b/modules/k8s/manifests/apiserver.pp
@@ -24,11 +24,14 @@
) {
include ::k8s::users
- file { '/etc/kubernetes':
- ensure => directory,
- owner => 'kubernetes',
- group => 'kubernetes',
- mode => '0700',
+ if !defined(File['/etc/kubernetes']) {
+ # because base::expose_puppet_certs also does this
+ file { '/etc/kubernetes':
+ ensure => directory,
+ owner => 'kubernetes',
+ group => 'kubernetes',
+ mode => '0700',
+ }
}
if $use_package {
--
To view, visit https://gerrit.wikimedia.org/r/338470
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia7e18d2e31926815452fe691c28694bd73f20670
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <yuvipa...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
