From c934df29a8a96841c9a15a0a7718343bc1257469 Mon Sep 17 00:00:00 2001
From: Muhammed Uluyol <uluyol@google.com>
Date: Wed, 19 Aug 2015 15:47:55 -0700
Subject: [PATCH] Use a persistent volume for the docker registry.

---
 init.sls             | 19 ++++++++++++++++++-
 kube-addon-update.sh |  8 +++++---
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/init.sls b/init.sls
index 5d744fb386..b03ab98069 100644
--- a/init.sls
+++ b/init.sls
@@ -115,7 +115,24 @@ addon-dir-create:
 
 /etc/kubernetes/addons/registry/registry-rc.yaml:
   file.managed:
-    - source: salt://kube-addons/registry/registry-rc.yaml.in
+    - source: salt://kube-addons/registry/registry-rc.yaml
+    - user: root
+    - group: root
+    - file_mode: 644
+    - makedirs: True
+
+/etc/kubernetes/addons/registry/registry-pv.yaml:
+  file.managed:
+    - source: salt://kube-addons/registry/registry-pv.yaml.in
+    - template: jinja
+    - user: root
+    - group: root
+    - file_mode: 644
+    - makedirs: True
+
+/etc/kubernetes/addons/registry/registry-pvc.yaml:
+  file.managed:
+    - source: salt://kube-addons/registry/registry-pvc.yaml.in
     - template: jinja
     - user: root
     - group: root
diff --git a/kube-addon-update.sh b/kube-addon-update.sh
index c04815ff21..0caa4c0a8b 100755
--- a/kube-addon-update.sh
+++ b/kube-addon-update.sh
@@ -470,12 +470,14 @@ function update-addons() {
     # be careful, reconcile-objects uses global variables
     reconcile-objects ${addon_path} ReplicationController "-" &
 
-    # We don't expect service names to be versioned, so
-    # we match entire name, ignoring version suffix.
+    # We don't expect names to be versioned for the following kinds, so
+    # we match the entire name, ignoring version suffix.
     # That's why we pass an empty string as the version separator.
-    # If the service description differs on disk, the service should be recreated.
+    # If the description differs on disk, the object should be recreated.
     # This is not implemented in this version.
     reconcile-objects ${addon_path} Service "" &
+    reconcile-objects ${addon_path} PersistentVolume "" &
+    reconcile-objects ${addon_path} PersistentVolumeClaim "" &
 
     wait-for-jobs
     if [[ $? -eq 0 ]]; then