Skip to content

K
k3s
Commit 5326baed authored by Brendan Burns's avatar Brendan Burns
Browse files
Options

Merge pull request #5254 from AntonioMeireles/add_docker_caching_to_CoreOS_cluster

Add Docker caching support to CoreOS' clusters.
parents cf68593f b5a50ca9
Show whitespace changes
Inline Side-by-side
Showing with 113 additions and 99 deletions
docs/getting-started-guides/aws/cloud-configs/master.yaml
View file @ 5326baed
...@@ -8,6 +8,9 @@ write_files: ...@@ -8,6 +8,9 @@ write_files:
#! /usr/bin/bash #! /usr/bin/bash
until curl http://127.0.0.1:4001/v2/machines; do sleep 2; done until curl http://127.0.0.1:4001/v2/machines; do sleep 2; done
coreos: coreos:
fleet:
etcd-servers: http://localhost:4001
metadata: "role=master"
units: units:
- name: setup-network-environment.service - name: setup-network-environment.service
command: start command: start
...@@ -48,27 +51,6 @@ coreos: ...@@ -48,27 +51,6 @@ coreos:
--snapshot true --snapshot true
Restart=always Restart=always
RestartSec=10s RestartSec=10s
- name: fleet.socket
command: start
content: |
[Socket]
ListenStream=/var/run/fleet.sock
- name: fleet.service
command: start
content: |
[Unit]
Description=fleet daemon
Wants=etcd.service
After=etcd.service
Wants=fleet.socket
After=fleet.socket
[Service]
Environment="FLEET_ETCD_SERVERS=http://127.0.0.1:4001"
Environment="FLEET_METADATA=role=master"
ExecStart=/usr/bin/fleetd
Restart=always
RestartSec=10s
- name: etcd-waiter.service - name: etcd-waiter.service
command: start command: start
content: | content: |
...@@ -104,6 +86,39 @@ coreos: ...@@ -104,6 +86,39 @@ coreos:
ExecStartPre=/usr/bin/chmod +x /opt/bin/flanneld ExecStartPre=/usr/bin/chmod +x /opt/bin/flanneld
ExecStartPre=-/usr/bin/etcdctl mk /coreos.com/network/config '{"Network":"10.244.0.0/16", "Backend": {"Type": "vxlan"}}' ExecStartPre=-/usr/bin/etcdctl mk /coreos.com/network/config '{"Network":"10.244.0.0/16", "Backend": {"Type": "vxlan"}}'
ExecStart=/opt/bin/flanneld ExecStart=/opt/bin/flanneld
- name: docker-cache.service
command: start
content: |
[Unit]
Description=Docker cache proxy
Requires=early-docker.service
After=early-docker.service
Before=early-docker.target
[Service]
Restart=always
TimeoutStartSec=0
RestartSec=5
Environment="TMPDIR=/var/tmp/"
Environment="DOCKER_HOST=unix:///var/run/early-docker.sock"
ExecStartPre=-/usr/bin/docker kill docker-registry
ExecStartPre=-/usr/bin/docker rm docker-registry
ExecStartPre=/usr/bin/docker pull quay.io/devops/docker-registry:latest
ExecStart=/usr/bin/docker run --rm --net host --name docker-registry \
-e STANDALONE=false \
-e MIRROR_SOURCE=https://registry-1.docker.io \
-e MIRROR_SOURCE_INDEX=https://index.docker.io \
-e MIRROR_TAGS_CACHE_TTL=1800 \
quay.io/devops/docker-registry:latest
- name: docker.service
drop-ins:
- name: 51-docker-mirror.conf
content: |
[Unit]
Requires=docker-cache.service
After=docker-cache.service
[Service]
Environment=DOCKER_OPTS='--registry-mirror=http://$private_ipv4:5000'
- name: kube-apiserver.service - name: kube-apiserver.service
command: start command: start
content: | content: |
......
docs/getting-started-guides/aws/cloud-configs/node.yaml
View file @ 5326baed
#cloud-config #cloud-config
coreos: coreos:
fleet:
etcd-servers: http://<master-private-ip>:4001
metadata: "role=node"
units: units:
- name: etcd.service - name: etcd.service
mask: true mask: true
- name: fleet.service - name: fleet.service
command: start command: start
content: |
[Unit]
Description=fleet daemon
Wants=fleet.socket
After=fleet.socket
[Service]
Environment="FLEET_ETCD_SERVERS=http://<master-private-ip>:4001"
Environment="FLEET_METADATA=role=node"
ExecStart=/usr/bin/fleetd
Restart=always
RestartSec=10s
- name: flannel.service - name: flannel.service
command: start command: start
content: | content: |
...@@ -34,20 +25,11 @@ coreos: ...@@ -34,20 +25,11 @@ coreos:
ExecStart=/opt/bin/flanneld -etcd-endpoints http://<master-private-ip>:4001 ExecStart=/opt/bin/flanneld -etcd-endpoints http://<master-private-ip>:4001
- name: docker.service - name: docker.service
command: start command: start
drop-ins:
- name: 51-docker-mirror.conf
content: | content: |
[Unit]
After=flannel.service
Wants=flannel.service
Description=Docker Application Container Engine
Documentation=http://docs.docker.io
[Service] [Service]
EnvironmentFile=/run/flannel/subnet.env Environment=DOCKER_OPTS='--registry-mirror=http://<master-private-ip>:5000'
ExecStartPre=/bin/mount --make-rprivate /
ExecStart=/usr/bin/docker -d --bip=${FLANNEL_SUBNET} --mtu=${FLANNEL_MTU} -s=overlay -H fd://
[Install]
WantedBy=multi-user.target
- name: setup-network-environment.service - name: setup-network-environment.service
command: start command: start
content: | content: |
......
docs/getting-started-guides/coreos/cloud-configs/master.yaml
View file @ 5326baed
...@@ -8,6 +8,9 @@ write_files: ...@@ -8,6 +8,9 @@ write_files:
#! /usr/bin/bash #! /usr/bin/bash
until curl http://127.0.0.1:4001/v2/machines; do sleep 2; done until curl http://127.0.0.1:4001/v2/machines; do sleep 2; done
coreos: coreos:
fleet:
etcd-servers: http://localhost:4001
metadata: "role=master"
units: units:
- name: setup-network-environment.service - name: setup-network-environment.service
command: start command: start
...@@ -48,27 +51,8 @@ coreos: ...@@ -48,27 +51,8 @@ coreos:
--snapshot true --snapshot true
Restart=always Restart=always
RestartSec=10s RestartSec=10s
- name: fleet.socket
command: start
content: |
[Socket]
ListenStream=/var/run/fleet.sock
- name: fleet.service - name: fleet.service
command: start command: start
content: |
[Unit]
Description=fleet daemon
Wants=etcd.service
After=etcd.service
Wants=fleet.socket
After=fleet.socket
[Service]
Environment="FLEET_ETCD_SERVERS=http://127.0.0.1:4001"
Environment="FLEET_METADATA=role=master"
ExecStart=/usr/bin/fleetd
Restart=always
RestartSec=10s
- name: etcd-waiter.service - name: etcd-waiter.service
command: start command: start
content: | content: |
...@@ -104,6 +88,39 @@ coreos: ...@@ -104,6 +88,39 @@ coreos:
ExecStartPre=/usr/bin/chmod +x /opt/bin/flanneld ExecStartPre=/usr/bin/chmod +x /opt/bin/flanneld
ExecStartPre=-/usr/bin/etcdctl mk /coreos.com/network/config '{"Network":"10.244.0.0/16", "Backend": {"Type": "vxlan"}}' ExecStartPre=-/usr/bin/etcdctl mk /coreos.com/network/config '{"Network":"10.244.0.0/16", "Backend": {"Type": "vxlan"}}'
ExecStart=/opt/bin/flanneld ExecStart=/opt/bin/flanneld
- name: docker-cache.service
command: start
content: |
[Unit]
Description=Docker cache proxy
Requires=early-docker.service
After=early-docker.service
Before=early-docker.target
[Service]
Restart=always
TimeoutStartSec=0
RestartSec=5
Environment="TMPDIR=/var/tmp/"
Environment="DOCKER_HOST=unix:///var/run/early-docker.sock"
ExecStartPre=-/usr/bin/docker kill docker-registry
ExecStartPre=-/usr/bin/docker rm docker-registry
ExecStartPre=/usr/bin/docker pull quay.io/devops/docker-registry:latest
ExecStart=/usr/bin/docker run --rm --net host --name docker-registry \
-e STANDALONE=false \
-e MIRROR_SOURCE=https://registry-1.docker.io \
-e MIRROR_SOURCE_INDEX=https://index.docker.io \
-e MIRROR_TAGS_CACHE_TTL=1800 \
quay.io/devops/docker-registry:latest
- name: docker.service
drop-ins:
- name: 51-docker-mirror.conf
content: |
[Unit]
Requires=docker-cache.service
After=docker-cache.service
[Service]
Environment=DOCKER_OPTS='--registry-mirror=http://$private_ipv4:5000'
- name: kube-apiserver.service - name: kube-apiserver.service
command: start command: start
content: | content: |
......
docs/getting-started-guides/coreos/cloud-configs/node.yaml
View file @ 5326baed
#cloud-config #cloud-config
coreos: coreos:
fleet:
etcd-servers: http://<master-private-ip>:4001
metadata: "role=node"
units: units:
- name: etcd.service - name: etcd.service
mask: true mask: true
- name: fleet.service - name: fleet.service
command: start command: start
content: |
[Unit]
Description=fleet daemon
Wants=fleet.socket
After=fleet.socket
[Service]
Environment="FLEET_ETCD_SERVERS=http://<master-private-ip>:4001"
Environment="FLEET_METADATA=role=node"
ExecStart=/usr/bin/fleetd
Restart=always
RestartSec=10s
- name: flannel.service - name: flannel.service
command: start command: start
content: | content: |
...@@ -34,20 +25,11 @@ coreos: ...@@ -34,20 +25,11 @@ coreos:
ExecStart=/opt/bin/flanneld -etcd-endpoints http://<master-private-ip>:4001 ExecStart=/opt/bin/flanneld -etcd-endpoints http://<master-private-ip>:4001
- name: docker.service - name: docker.service
command: start command: start
drop-ins:
- name: 51-docker-mirror.conf
content: | content: |
[Unit]
After=flannel.service
Wants=flannel.service
Description=Docker Application Container Engine
Documentation=http://docs.docker.io
[Service] [Service]
EnvironmentFile=/run/flannel/subnet.env Environment=DOCKER_OPTS='--registry-mirror=http://<master-private-ip>:5000'
ExecStartPre=/bin/mount --make-rprivate /
ExecStart=/usr/bin/docker -d --bip=${FLANNEL_SUBNET} --mtu=${FLANNEL_MTU} -s=overlay -H fd://
[Install]
WantedBy=multi-user.target
- name: setup-network-environment.service - name: setup-network-environment.service
command: start command: start
content: | content: |
......
docs/getting-started-guides/coreos/cloud-configs/standalone.yaml
View file @ 5326baed
...@@ -49,22 +49,40 @@ coreos: ...@@ -49,22 +49,40 @@ coreos:
ExecStartPre=/usr/bin/chmod +x /opt/bin/flanneld ExecStartPre=/usr/bin/chmod +x /opt/bin/flanneld
ExecStartPre=-/usr/bin/etcdctl mk /coreos.com/network/config '{"Network":"10.244.0.0/16", "Backend": {"Type": "vxlan"}}' ExecStartPre=-/usr/bin/etcdctl mk /coreos.com/network/config '{"Network":"10.244.0.0/16", "Backend": {"Type": "vxlan"}}'
ExecStart=/opt/bin/flanneld ExecStart=/opt/bin/flanneld
- name: docker.service - name: docker-cache.service
command: start command: start
content: | content: |
[Unit] [Unit]
After=flannel.service Description=Docker cache proxy
Wants=flannel.service Requires=early-docker.service
Description=Docker Application Container Engine After=early-docker.service
Documentation=http://docs.docker.io Before=early-docker.target
[Service] [Service]
EnvironmentFile=/run/flannel/subnet.env Restart=always
ExecStartPre=/bin/mount --make-rprivate / TimeoutStartSec=0
ExecStart=/usr/bin/docker -d --bip=${FLANNEL_SUBNET} --mtu=${FLANNEL_MTU} -s=overlay -H fd:// RestartSec=5
Environment="TMPDIR=/var/tmp/"
[Install] Environment="DOCKER_HOST=unix:///var/run/early-docker.sock"
WantedBy=multi-user.target ExecStartPre=-/usr/bin/docker kill docker-registry
ExecStartPre=-/usr/bin/docker rm docker-registry
ExecStartPre=/usr/bin/docker pull quay.io/devops/docker-registry:latest
ExecStart=/usr/bin/docker run --rm --net host --name docker-registry \
-e STANDALONE=false \
-e MIRROR_SOURCE=https://registry-1.docker.io \
-e MIRROR_SOURCE_INDEX=https://index.docker.io \
-e MIRROR_TAGS_CACHE_TTL=1800 \
quay.io/devops/docker-registry:latest
- name: docker.service
command: start
drop-ins:
- name: 51-docker-mirror.conf
content: |
[Unit]
Requires=docker-cache.service
After=docker-cache.service
[Service]
Environment=DOCKER_OPTS='--registry-mirror=http://$private_ipv4:5000'
- name: kube-apiserver.service - name: kube-apiserver.service
command: start command: start
content: | content: |
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment