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

Fix regression caused by registry-proxy
2019-07-18 11:03:10 -07:00 · 2019-07-18 11:03:10 -07:00 · 2e4ee0843c
parent b992c4542a d76d874067
commit 2e4ee0843c
3 changed files with 4 additions and 2 deletions
--- 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:
--- 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:
--- 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