github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-06 18:54:06 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
cluster/addons/registry/README.md
View File

@ -175,33 +175,44 @@ 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:
containers: template:
- name: kube-registry-proxy metadata:
image: gcr.io/google_containers/kube-registry-proxy:0.4 labels:
resources: k8s-app: kube-registry
limits: kubernetes.io/name: "kube-registry-proxy"
cpu: 100m kubernetes.io/cluster-service: "true"
memory: 50Mi version: v0.4
env: spec:
- name: REGISTRY_HOST containers:
value: kube-registry.kube-system.svc.cluster.local - name: kube-registry-proxy
- name: REGISTRY_PORT image: gcr.io/google_containers/kube-registry-proxy:0.4
value: "5000" resources:
ports: limits:
- name: registry cpu: 100m
containerPort: 80 memory: 50Mi
hostPort: 5000 env:
- name: REGISTRY_HOST
value: kube-registry.kube-system.svc.cluster.local
- name: REGISTRY_PORT
value: "5000"
ports:
- name: registry
containerPort: 80
hostPort: 5000
``` ```
<!-- END MUNGE: EXAMPLE ../../saltbase/salt/kube-registry-proxy/kube-registry-proxy.yaml --> <!-- END MUNGE: EXAMPLE ../../saltbase/salt/kube-registry-proxy/kube-registry-proxy.yaml -->

51
cluster/saltbase/salt/kube-registry-proxy/kube-registry-proxy.yaml
View File

@ -1,24 +1,35 @@
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:
containers: template:
- name: kube-registry-proxy metadata:
image: gcr.io/google_containers/kube-registry-proxy:0.3 labels:
resources: k8s-app: kube-registry
limits: kubernetes.io/name: "kube-registry-proxy"
cpu: 100m kubernetes.io/cluster-service: "true"
memory: 50Mi version: v0.4
env: spec:
- name: REGISTRY_HOST containers:
value: kube-registry.kube-system.svc.cluster.local - name: kube-registry-proxy
- name: REGISTRY_PORT image: gcr.io/google_containers/kube-registry-proxy:0.4
value: "5000" resources:
- name: FORWARD_PORT limits:
value: "5000" cpu: 100m
ports: memory: 50Mi
- name: registry env:
containerPort: 5000 - name: REGISTRY_HOST
hostPort: 5000 value: kube-registry.kube-system.svc.cluster.local
- name: REGISTRY_PORT
value: "5000"
ports:
- name: registry
containerPort: 80
hostPort: 5000