From d76d87406713338ca18fcf6fae5a909ebcb9035c Mon Sep 17 00:00:00 2001
From: Om Kumar <om.kumar@hpe.com>
Date: Thu, 18 Jul 2019 17:41:50 +0530
Subject: [PATCH] Fix regression caused by registry-proxy

This PR addresses #4604 by adding a new selector to concerned svc/rc only.
This also reverts `kubernetes.io/minikube-addons` to `registy` for registry-proxy
so that addon manager can deploy registry-proxy when registry addon is enabled.
---
 deploy/addons/registry/registry-proxy.yaml.tmpl | 4 ++--
 deploy/addons/registry/registry-rc.yaml.tmpl    | 1 +
 deploy/addons/registry/registry-svc.yaml.tmpl   | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/deploy/addons/registry/registry-proxy.yaml.tmpl b/deploy/addons/registry/registry-proxy.yaml.tmpl
index 2131be382629..0a818fd9cb0a 100644
--- a/deploy/addons/registry/registry-proxy.yaml.tmpl
+++ b/deploy/addons/registry/registry-proxy.yaml.tmpl
@@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1
 kind: DaemonSet
 metadata:
   labels:
-    kubernetes.io/minikube-addons: registry-proxy
+    kubernetes.io/minikube-addons: registry
     addonmanager.kubernetes.io/mode: Reconcile
   name: registry-proxy
   namespace: kube-system
@@ -10,7 +10,7 @@ spec:
   template:
     metadata:
       labels:
-        kubernetes.io/minikube-addons: registry-proxy
+        kubernetes.io/minikube-addons: registry
         addonmanager.kubernetes.io/mode: Reconcile
     spec:
       containers:
diff --git a/deploy/addons/registry/registry-rc.yaml.tmpl b/deploy/addons/registry/registry-rc.yaml.tmpl
index b39641aa47d4..7fe07e8392b3 100644
--- a/deploy/addons/registry/registry-rc.yaml.tmpl
+++ b/deploy/addons/registry/registry-rc.yaml.tmpl
@@ -13,6 +13,7 @@ spec:
   template:
     metadata:
       labels:
+        actual-registry: "true"
         kubernetes.io/minikube-addons: registry
         addonmanager.kubernetes.io/mode: Reconcile
     spec:
diff --git a/deploy/addons/registry/registry-svc.yaml.tmpl b/deploy/addons/registry/registry-svc.yaml.tmpl
index e9f618ae256d..c48daefec0eb 100644
--- a/deploy/addons/registry/registry-svc.yaml.tmpl
+++ b/deploy/addons/registry/registry-svc.yaml.tmpl
@@ -12,4 +12,5 @@ spec:
   - port: 80
     targetPort: 5000
   selector:
+    actual-registry: "true"
     kubernetes.io/minikube-addons: registry