Alexandros Kosiaris has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/343797 )
Change subject: Make HostPathAutomounter work for files with . in them
......................................................................
Make HostPathAutomounter work for files with . in them
Also don't swallow '/' but change them into '-'
Change-Id: I3d148637c1898bc92fccbbbb15035c4b6ce71ca2
---
M debian/changelog
M debian/patches/admission_controllers
2 files changed, 7 insertions(+), 1 deletion(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
BryanDavis: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/debian/changelog b/debian/changelog
index 6e1c990..684fc2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+kubernetes (1.4.6-4) unstable; urgency=medium
+
+ * Fix HostPathAutoMounter to work for paths with '.' in them
+
+ -- Yuvi Pand <yuvipa...@gmail.com> Mon, 20 Mar 2016 14:23:15 +0000
+
kubernetes (1.4.6-3) unstable; urgency=medium
* Depend on docker-engine as well, as an alternative to docker.io
diff --git a/debian/patches/admission_controllers
b/debian/patches/admission_controllers
index 9ad3342..c6ecf7d 100644
--- a/debian/patches/admission_controllers
+++ b/debian/patches/admission_controllers
@@ -150,7 +150,7 @@
+
+ for volumePath := range s.mounts {
+ if _, exists := volumeNameMap[volumePath]; !exists {
-+ volumeName :=
api.SimpleNameGenerator.GenerateName(fmt.Sprintf("%s-",
strings.Replace(volumePath, "/", "", -1)))
++ volumeName :=
api.SimpleNameGenerator.GenerateName(fmt.Sprintf("%s-",
strings.Replace(strings.Replace(volumePath, ".", "-"), "/", "-", -1)))
+ volumeNameMap[volumePath] = volumeName
+ volume := api.Volume{
+ Name: volumeName,
--
To view, visit https://gerrit.wikimedia.org/r/343797
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3d148637c1898bc92fccbbbb15035c4b6ce71ca2
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/kubernetes
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda <yuvipa...@wikimedia.org>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
