From 51cf8cf9a8a27bb01155e67c988c9468fdeeec07 Mon Sep 17 00:00:00 2001 From: Matthew Fisher Date: Fri, 16 Jun 2017 14:25:31 -0700 Subject: [PATCH] fix registry addon labels In a last-minute fix, I accidentally changed the pod labels all to the minikube add-on reconciliation mode label instead of the add-on name. This is causing the registry service to be unable to forward requests over to the pods due to mismatched label selectors. --- cmd/minikube/cmd/start.go | 2 +- deploy/addons/registry/registry-rc.yaml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go index 60eb76a170..bc27e9b86b 100644 --- a/cmd/minikube/cmd/start.go +++ b/cmd/minikube/cmd/start.go @@ -293,7 +293,7 @@ func init() { startCmd.Flags().StringArrayVar(&dockerOpt, "docker-opt", nil, "Specify arbitrary flags to pass to the Docker daemon. (format: key=value)") startCmd.Flags().String(apiServerName, constants.APIServerName, "The apiserver name which is used in the generated certificate for localkube/kubernetes. This can be used if you want to make the apiserver available from outside the machine") startCmd.Flags().String(dnsDomain, constants.ClusterDNSDomain, "The cluster dns domain name used in the kubernetes cluster") - startCmd.Flags().StringSliceVar(&insecureRegistry, "insecure-registry", []string{constants.DefaultInsecureRegistry}, "Insecure Docker registries to pass to the Docker daemon") + startCmd.Flags().StringSliceVar(&insecureRegistry, "insecure-registry", []string{pkgutil.DefaultInsecureRegistry}, "Insecure Docker registries to pass to the Docker daemon") startCmd.Flags().StringSliceVar(®istryMirror, "registry-mirror", nil, "Registry mirrors to pass to the Docker daemon") startCmd.Flags().String(kubernetesVersion, constants.DefaultKubernetesVersion, "The kubernetes version that the minikube VM will use (ex: v1.2.3) \n OR a URI which contains a localkube binary (ex: https://storage.googleapis.com/minikube/k8sReleases/v1.3.0/localkube-linux-amd64)") startCmd.Flags().String(containerRuntime, "", "The container runtime to be used") diff --git a/deploy/addons/registry/registry-rc.yaml b/deploy/addons/registry/registry-rc.yaml index cef4319fea..aaee5dd90f 100644 --- a/deploy/addons/registry/registry-rc.yaml +++ b/deploy/addons/registry/registry-rc.yaml @@ -9,10 +9,11 @@ metadata: spec: replicas: 1 selector: - addonmanager.kubernetes.io/mode: Reconcile + kubernetes.io/minikube-addons: registry template: metadata: labels: + kubernetes.io/minikube-addons: registry addonmanager.kubernetes.io/mode: Reconcile spec: containers: