Merge pull request #35582 from surajssd/use-daemonset-registry-proxy

Automatic merge from submit-queue

Use daemonset in docker registry add on

When using registry add on with kubernetes cluster it will be right to use `daemonset` to bring up a pod on each node of cluster, right now the docs suggests to bring up a pod on each node manually by dropping the pod manifests into directory `/etc/kubernetes/manifests`.
This commit is contained in:
Kubernetes Submit Queue 2016-12-16 12:29:46 -08:00 committed by GitHub
commit e3c6ab1c8f
2 changed files with 62 additions and 40 deletions

View File

@ -175,17 +175,28 @@ spec:
Now that we have a running `Service`, we need to expose it onto each Kubernetes Now that we have a running `Service`, we need to expose it onto each Kubernetes
`Node` so that Docker will see it as `localhost`. We can load a `Pod` on every `Node` so that Docker will see it as `localhost`. We can load a `Pod` on every
node by dropping a YAML file into the kubelet config directory node by creating following daemonset.
(/etc/kubernetes/manifests by default).
<!-- BEGIN MUNGE: EXAMPLE ../../saltbase/salt/kube-registry-proxy/kube-registry-proxy.yaml --> <!-- BEGIN MUNGE: EXAMPLE ../../saltbase/salt/kube-registry-proxy/kube-registry-proxy.yaml -->
```yaml ```yaml
apiVersion: v1 apiVersion: extensions/v1beta1
kind: Pod kind: DaemonSet
metadata: metadata:
name: kube-registry-proxy name: kube-registry-proxy
namespace: kube-system namespace: kube-system
labels:
k8s-app: kube-registry
kubernetes.io/cluster-service: "true"
version: v0.4
spec: spec:
template:
metadata:
labels:
k8s-app: kube-registry
kubernetes.io/name: "kube-registry-proxy"
kubernetes.io/cluster-service: "true"
version: v0.4
spec:
containers: containers:
- name: kube-registry-proxy - name: kube-registry-proxy
image: gcr.io/google_containers/kube-registry-proxy:0.4 image: gcr.io/google_containers/kube-registry-proxy:0.4

View File

@ -1,12 +1,24 @@
apiVersion: v1 apiVersion: extensions/v1beta1
kind: Pod kind: DaemonSet
metadata: metadata:
name: kube-registry-proxy name: kube-registry-proxy
namespace: kube-system namespace: kube-system
labels:
k8s-app: kube-registry
kubernetes.io/cluster-service: "true"
version: v0.4
spec: spec:
template:
metadata:
labels:
k8s-app: kube-registry
kubernetes.io/name: "kube-registry-proxy"
kubernetes.io/cluster-service: "true"
version: v0.4
spec:
containers: containers:
- name: kube-registry-proxy - name: kube-registry-proxy
image: gcr.io/google_containers/kube-registry-proxy:0.3 image: gcr.io/google_containers/kube-registry-proxy:0.4
resources: resources:
limits: limits:
cpu: 100m cpu: 100m
@ -16,9 +28,8 @@ spec:
value: kube-registry.kube-system.svc.cluster.local value: kube-registry.kube-system.svc.cluster.local
- name: REGISTRY_PORT - name: REGISTRY_PORT
value: "5000" value: "5000"
- name: FORWARD_PORT
value: "5000"
ports: ports:
- name: registry - name: registry
containerPort: 5000 containerPort: 80
hostPort: 5000 hostPort: 5000