Skip to content
This repository was archived by the owner on Jul 30, 2021. It is now read-only.

Commit dc23312

Browse files
author
Yifan Gu
committed
hack/*: GC kubelet rkt images after run.
This PR changes the cloud-config data in the hack dir so that it stores the rkt UUID for the kubelet pod, and gc the stopped ones. Fix #218
1 parent 5853643 commit dc23312

File tree

4 files changed

+17
-2
lines changed

4 files changed

+17
-2
lines changed

hack/multi-node/user-data.sample

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,15 @@ coreos:
1010
EnvironmentFile=/etc/environment
1111
Environment=KUBELET_ACI=quay.io/coreos/hyperkube
1212
Environment=KUBELET_VERSION=v1.5.3_coreos.0
13-
Environment="RKT_OPTS=--volume var-lib-cni,kind=host,source=/var/lib/cni --mount volume=var-lib-cni,target=/var/lib/cni"
13+
Environment="RKT_OPTS=--uuid-file-save=/var/run/kubelet-pod.uuid \
14+
--volume var-lib-cni,kind=host,source=/var/lib/cni \
15+
--mount volume=var-lib-cni,target=/var/lib/cni"
1416
ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests
1517
ExecStartPre=/bin/mkdir -p /etc/kubernetes/cni/net.d
1618
ExecStartPre=/bin/mkdir -p /etc/kubernetes/checkpoint-secrets
1719
ExecStartPre=/bin/mkdir -p /srv/kubernetes/manifests
1820
ExecStartPre=/bin/mkdir -p /var/lib/cni
21+
ExecStartPre=-/usr/bin/rkt rm --uuid-file=/var/run/kubelet-pod.uuid
1922
ExecStart=/usr/lib/coreos/kubelet-wrapper \
2023
--kubeconfig=/etc/kubernetes/kubeconfig \
2124
--experimental-bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubeconfig \
@@ -31,6 +34,8 @@ coreos:
3134
--node-labels=master=true \
3235
--cluster_dns=10.3.0.10 \
3336
--cluster_domain=cluster.local
37+
38+
ExecStop=-/usr/bin/rkt stop --uuid-file=/var/run/kubelet-pod.uuid
3439
Restart=always
3540
RestartSec=5
3641

hack/quickstart/kubelet.master

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
Environment=KUBELET_ACI=quay.io/coreos/hyperkube
33
Environment=KUBELET_VERSION=v1.5.3_coreos.0
44
Environment="RKT_OPTS=\
5+
--uuid-file-save=/var/run/kubelet-pod.uuid \
56
--volume etc-resolv,kind=host,source=/etc/resolv.conf --mount volume=etc-resolv,target=/etc/resolv.conf \
67
--volume var-lib-cni,kind=host,source=/var/lib/cni --mount volume=var-lib-cni,target=/var/lib/cni"
78
EnvironmentFile=/etc/environment
@@ -10,6 +11,7 @@ ExecStartPre=/bin/mkdir -p /etc/kubernetes/cni/net.d
1011
ExecStartPre=/bin/mkdir -p /etc/kubernetes/checkpoint-secrets
1112
ExecStartPre=/bin/mkdir -p /srv/kubernetes/manifests
1213
ExecStartPre=/bin/mkdir -p /var/lib/cni
14+
ExecStartPre=-/usr/bin/rkt rm --uuid-file=/var/run/kubelet-pod.uuid
1315
ExecStart=/usr/lib/coreos/kubelet-wrapper \
1416
--kubeconfig=/etc/kubernetes/kubeconfig \
1517
--experimental-bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubeconfig \
@@ -27,6 +29,7 @@ ExecStart=/usr/lib/coreos/kubelet-wrapper \
2729
--cluster_domain=cluster.local \
2830
--config=/etc/kubernetes/manifests
2931

32+
ExecStop=-/usr/bin/rkt stop --uuid-file=/var/run/kubelet-pod.uuid
3033
Restart=always
3134
RestartSec=5
3235

hack/quickstart/kubelet.worker

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@
22
Environment=KUBELET_ACI=quay.io/coreos/hyperkube
33
Environment=KUBELET_VERSION=v1.5.3_coreos.0
44
Environment="RKT_OPTS=\
5+
--uuid-file-save=/var/run/kubelet-pod.uuid \
56
--volume etc-resolv,kind=host,source=/etc/resolv.conf --mount volume=etc-resolv,target=/etc/resolv.conf \
67
--volume var-lib-cni,kind=host,source=/var/lib/cni --mount volume=var-lib-cni,target=/var/lib/cni"
78
EnvironmentFile=/etc/environment
89
ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests
910
ExecStartPre=/bin/mkdir -p /etc/kubernetes/cni/net.d
1011
ExecStartPre=/bin/mkdir -p /var/lib/cni
12+
ExecStartPre=-/usr/bin/rkt rm --uuid-file=/var/run/kubelet-pod.uuid
1113
ExecStart=/usr/lib/coreos/kubelet-wrapper \
1214
--kubeconfig=/etc/kubernetes/kubeconfig \
1315
--experimental-bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubeconfig \
@@ -24,6 +26,7 @@ ExecStart=/usr/lib/coreos/kubelet-wrapper \
2426
--cluster_domain=cluster.local \
2527
--config=/etc/kubernetes/manifests
2628

29+
ExecStop=-/usr/bin/rkt stop --uuid-file=/var/run/kubelet-pod.uuid
2730
Restart=always
2831
RestartSec=5
2932

hack/single-node/user-data.sample

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,15 @@ coreos:
1818
EnvironmentFile=/etc/environment
1919
Environment=KUBELET_ACI=quay.io/coreos/hyperkube
2020
Environment=KUBELET_VERSION=v1.5.3_coreos.0
21-
Environment="RKT_OPTS=--volume var-lib-cni,kind=host,source=/var/lib/cni --mount volume=var-lib-cni,target=/var/lib/cni"
21+
Environment="RKT_OPTS=--uuid-file-save=/var/run/kubelet-pod.uuid \
22+
--volume var-lib-cni,kind=host,source=/var/lib/cni \
23+
--mount volume=var-lib-cni,target=/var/lib/cni"
2224
ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests
2325
ExecStartPre=/bin/mkdir -p /etc/kubernetes/cni/net.d
2426
ExecStartPre=/bin/mkdir -p /etc/kubernetes/checkpoint-secrets
2527
ExecStartPre=/bin/mkdir -p /srv/kubernetes/manifests
2628
ExecStartPre=/bin/mkdir -p /var/lib/cni
29+
ExecStartPre=-/usr/bin/rkt rm --uuid-file=/var/run/kubelet-pod.uuid
2730
ExecStart=/usr/lib/coreos/kubelet-wrapper \
2831
--kubeconfig=/etc/kubernetes/kubeconfig \
2932
--experimental-bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubeconfig \
@@ -40,6 +43,7 @@ coreos:
4043
--cluster_dns=10.3.0.10 \
4144
--cluster_domain=cluster.local
4245

46+
ExecStop=-/usr/bin/rkt stop --uuid-file=/var/run/kubelet-pod.uuid
4347
Restart=always
4448
RestartSec=5
4549

0 commit comments

Comments
 (0)