Skip to content

Commit

Permalink
Fix regression caused by registry-proxy
Browse files Browse the repository at this point in the history
This PR fixes #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.
  • Loading branch information
kumarom committed Jul 18, 2019
1 parent 3a93e45 commit 743c64f
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
4 changes: 2 additions & 2 deletions deploy/addons/registry/registry-proxy.yaml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 2 additions & 0 deletions deploy/addons/registry/registry-rc.yaml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ apiVersion: v1
kind: ReplicationController
metadata:
labels:
actual-registry: true
kubernetes.io/minikube-addons: registry
addonmanager.kubernetes.io/mode: Reconcile
name: registry
Expand All @@ -13,6 +14,7 @@ spec:
template:
metadata:
labels:
actual-registry: true
kubernetes.io/minikube-addons: registry
addonmanager.kubernetes.io/mode: Reconcile
spec:
Expand Down
2 changes: 2 additions & 0 deletions deploy/addons/registry/registry-svc.yaml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ apiVersion: v1
kind: Service
metadata:
labels:
actual-registry: true
kubernetes.io/minikube-addons: registry
addonmanager.kubernetes.io/mode: Reconcile
name: registry
Expand All @@ -12,4 +13,5 @@ spec:
- port: 80
targetPort: 5000
selector:
actual-registry: true
kubernetes.io/minikube-addons: registry

0 comments on commit 743c64f

Please sign in to comment.