From c7a14390ef72f272f3790a7a6fe180fd2baf37fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Str=C3=B6mberg?= Date: Fri, 19 Jul 2019 07:55:20 -0700 Subject: [PATCH] Revert "Fix regression caused by registry-proxy" --- 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, 2 insertions(+), 4 deletions(-) diff --git a/deploy/addons/registry/registry-proxy.yaml.tmpl b/deploy/addons/registry/registry-proxy.yaml.tmpl index 0a818fd9cb0a..2131be382629 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 + kubernetes.io/minikube-addons: registry-proxy addonmanager.kubernetes.io/mode: Reconcile name: registry-proxy namespace: kube-system @@ -10,7 +10,7 @@ spec: template: metadata: labels: - kubernetes.io/minikube-addons: registry + kubernetes.io/minikube-addons: registry-proxy 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 7fe07e8392b3..b39641aa47d4 100644 --- a/deploy/addons/registry/registry-rc.yaml.tmpl +++ b/deploy/addons/registry/registry-rc.yaml.tmpl @@ -13,7 +13,6 @@ 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 c48daefec0eb..e9f618ae256d 100644 --- a/deploy/addons/registry/registry-svc.yaml.tmpl +++ b/deploy/addons/registry/registry-svc.yaml.tmpl @@ -12,5 +12,4 @@ spec: - port: 80 targetPort: 5000 selector: - actual-registry: "true" kubernetes.io/minikube-addons: registry