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

Commit 0eac9df

Browse files
authored
Merge pull request #169 from kenan435/deploy-checkpointer-independently
Deploy checkpointer independently from api-server
2 parents b287a82 + 67092cb commit 0eac9df

File tree

3 files changed

+31
-10
lines changed

3 files changed

+31
-10
lines changed

pkg/asset/asset.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ const (
2727
AssetPathProxy = "manifests/kube-proxy.yaml"
2828
AssetPathAPIServerSecret = "manifests/kube-apiserver-secret.yaml"
2929
AssetPathAPIServer = "manifests/kube-apiserver.yaml"
30+
AssetPathCheckpointer = "manifests/kube-api-checkpointer.yaml"
3031
AssetPathControllerManager = "manifests/kube-controller-manager.yaml"
3132
AssetPathControllerManagerSecret = "manifests/kube-controller-manager-secret.yaml"
3233
AssetPathScheduler = "manifests/kube-scheduler.yaml"

pkg/asset/internal/templates.go

Lines changed: 29 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -123,13 +123,6 @@ spec:
123123
master: "true"
124124
hostNetwork: true
125125
containers:
126-
- name: checkpoint-installer
127-
image: quay.io/coreos/pod-checkpointer:f226b70d3a863a5dbcc5846ccd818296c30e703f
128-
command:
129-
- /checkpoint-installer.sh
130-
volumeMounts:
131-
- mountPath: /etc/kubernetes/manifests
132-
name: etc-k8s-manifests
133126
- name: kube-apiserver
134127
image: quay.io/coreos/hyperkube:v1.4.5_coreos.0
135128
command:
@@ -164,12 +157,38 @@ spec:
164157
- name: ssl-certs-host
165158
hostPath:
166159
path: /usr/share/ca-certificates
167-
- name: etc-k8s-manifests
168-
hostPath:
169-
path: /etc/kubernetes/manifests
170160
- name: secrets
171161
secret:
172162
secretName: kube-apiserver
163+
`)
164+
CheckpointerTemplate = []byte(`apiVersion: "extensions/v1beta1"
165+
kind: DaemonSet
166+
metadata:
167+
name: checkpoint-installer
168+
namespace: kube-system
169+
labels:
170+
k8s-app: kube-api-checkpointer
171+
spec:
172+
template:
173+
metadata:
174+
labels:
175+
k8s-app: kube-api-checkpointer
176+
spec:
177+
nodeSelector:
178+
master: "true"
179+
hostNetwork: true
180+
containers:
181+
- name: checkpoint-installer
182+
image: quay.io/coreos/pod-checkpointer:f226b70d3a863a5dbcc5846ccd818296c30e703f
183+
command:
184+
- /checkpoint-installer.sh
185+
volumeMounts:
186+
- mountPath: /etc/kubernetes/manifests
187+
name: etc-k8s-manifests
188+
volumes:
189+
- name: etc-k8s-manifests
190+
hostPath:
191+
path: /etc/kubernetes/manifests
173192
`)
174193
ControllerManagerTemplate = []byte(`apiVersion: extensions/v1beta1
175194
kind: Deployment

pkg/asset/k8s.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ func newStaticAssets(selfHostKubelet bool) Assets {
2525
mustCreateAssetFromTemplate(AssetPathProxy, internal.ProxyTemplate, noData),
2626
mustCreateAssetFromTemplate(AssetPathKubeDNSDeployment, internal.DNSDeploymentTemplate, noData),
2727
mustCreateAssetFromTemplate(AssetPathKubeDNSSvc, internal.DNSSvcTemplate, noData),
28+
mustCreateAssetFromTemplate(AssetPathCheckpointer, internal.CheckpointerTemplate, noData),
2829
}
2930
if selfHostKubelet {
3031
assets = append(assets, mustCreateAssetFromTemplate(AssetPathKubelet, internal.KubeletTemplate, noData))

0 commit comments

Comments
 (0)