Merge pull request #4805 from kumarom/registry-proxy-fix

Fix regression caused by registry-proxy
kubernetes · Jul 18, 2019 · 2e4ee08 · 2e4ee08
2 parents b992c45 + d76d874
commit 2e4ee08
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/deploy/addons/registry/registry-proxy.yaml.tmpl b/deploy/addons/registry/registry-proxy.yaml.tmpl
@@ -2,15 +2,15 @@ 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
 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
@@ -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
@@ -12,4 +12,5 @@ spec:
   - port: 80
     targetPort: 5000
   selector:
+    actual-registry: "true"
     kubernetes.io/minikube-addons: registry