Skip to content

migrate to kubelet config file #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Oct 2, 2018
Merged

migrate to kubelet config file #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions pkg/controller/template/test_data/templates/aws/master/files/-etc-kubernetes-kubelet.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
contents:
source: data:,kind%3A%20KubeletConfiguration%0AapiVersion%3A%20kubelet.config.k8s.io%2Fv1beta1%0AcgroupDriver%3A%20systemd%0AclusterDns%3A%0A%20%20-%2010.3.0.10%0AclusterDomain%3A%20cluster.local%0AruntimeRequestTimeout%3A%2010m%0AserializeImagePulls%3A%20false%0AstaticPodPath%3A%20%2Fetc%2Fkubernetes%2Fmanifests%0A
verification: {}
filesystem: root
mode: 420
path: /etc/kubernetes/kubelet.conf
14 changes: 3 additions & 11 deletions pkg/controller/template/test_data/templates/aws/master/units/kubelet.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,33 +5,25 @@ contents: |

[Service]
ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests
Environment=KUBELET_RUNTIME_REQUEST_TIMEOUT=10m
EnvironmentFile=-/etc/kubernetes/kubelet-workaround
EnvironmentFile=-/etc/kubernetes/kubelet-env

ExecStart=/usr/bin/hyperkube \
kubelet \
--config=/etc/kubernetes/kubelet.conf \
--bootstrap-kubeconfig=/etc/kubernetes/kubeconfig \
--kubeconfig=/var/lib/kubelet/kubeconfig \
--rotate-certificates \
--serialize-image-pulls=false \
--kubeconfig=/var/lib/kubelet/kubeconfig \
--container-runtime=remote \
--container-runtime-endpoint=/var/run/crio/crio.sock \
--runtime-request-timeout=${KUBELET_RUNTIME_REQUEST_TIMEOUT} \
--lock-file=/var/run/lock/kubelet.lock \
--exit-on-lock-contention \
--pod-manifest-path=/etc/kubernetes/manifests \
--allow-privileged \
--node-labels=node-role.kubernetes.io/master \
--minimum-container-ttl-duration=6m0s \
--cluster-dns=10.3.0.10 \
--cluster-domain=cluster.local \
--client-ca-file=/etc/kubernetes/ca.crt \
--cloud-provider=aws \
\
\
--anonymous-auth=false \
--register-with-taints=node-role.kubernetes.io/master=:NoSchedule \
--cgroup-driver=systemd \

Restart=always
RestartSec=10
Expand Down
6 changes: 6 additions & 0 deletions pkg/controller/template/test_data/templates/aws/worker/files/-etc-kubernetes-kubelet.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
contents:
source: data:,kind%3A%20KubeletConfiguration%0AapiVersion%3A%20kubelet.config.k8s.io%2Fv1beta1%0AcgroupDriver%3A%20systemd%0AclusterDns%3A%0A%20%20-%2010.3.0.10%0AclusterDomain%3A%20cluster.local%0ArotateCertificates%3A%20true%0AruntimeRequestTimeout%3A%2010m%0AserializeImagePulls%3A%20false%0AstaticPodPath%3A%20%2Fetc%2Fkubernetes%2Fmanifests%0A
verification: {}
filesystem: root
mode: 420
path: /etc/kubernetes/kubelet.conf
13 changes: 2 additions & 11 deletions pkg/controller/template/test_data/templates/aws/worker/units/kubelet.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,32 +5,23 @@ contents: |

[Service]
ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests
Environment=KUBELET_RUNTIME_REQUEST_TIMEOUT=10m
EnvironmentFile=-/etc/kubernetes/kubelet-workaround
EnvironmentFile=-/etc/kubernetes/kubelet-env

ExecStart=/usr/bin/hyperkube \
kubelet \
--config=/etc/kubernetes/kubelet.conf \
--bootstrap-kubeconfig=/etc/kubernetes/kubeconfig \
--kubeconfig=/var/lib/kubelet/kubeconfig \
--rotate-certificates \
--serialize-image-pulls=false \
--container-runtime=remote \
--container-runtime-endpoint=/var/run/crio/crio.sock \
--runtime-request-timeout=${KUBELET_RUNTIME_REQUEST_TIMEOUT} \
--lock-file=/var/run/lock/kubelet.lock \
--exit-on-lock-contention \
--pod-manifest-path=/etc/kubernetes/manifests \
--allow-privileged \
--node-labels=node-role.kubernetes.io/worker \
--minimum-container-ttl-duration=6m0s \
--cluster-dns=10.3.0.10 \
--cluster-domain=cluster.local \
--client-ca-file=/etc/kubernetes/ca.crt \
--cloud-provider=aws \
\
\
--anonymous-auth=false \
--cgroup-driver=systemd \

Restart=always
RestartSec=10
Expand Down
6 changes: 6 additions & 0 deletions ...controller/template/test_data/templates/libvirt/master/files/-etc-kubernetes-kubelet.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
contents:
source: data:,kind%3A%20KubeletConfiguration%0AapiVersion%3A%20kubelet.config.k8s.io%2Fv1beta1%0AcgroupDriver%3A%20systemd%0AclusterDns%3A%0A%20%20-%2010.3.0.10%0AclusterDomain%3A%20cluster.local%0AruntimeRequestTimeout%3A%2010m%0AserializeImagePulls%3A%20false%0AstaticPodPath%3A%20%2Fetc%2Fkubernetes%2Fmanifests%0A
verification: {}
filesystem: root
mode: 420
path: /etc/kubernetes/kubelet.conf
14 changes: 3 additions & 11 deletions pkg/controller/template/test_data/templates/libvirt/master/units/kubelet.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,33 +5,25 @@ contents: |

[Service]
ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests
Environment=KUBELET_RUNTIME_REQUEST_TIMEOUT=10m
EnvironmentFile=-/etc/kubernetes/kubelet-workaround
EnvironmentFile=-/etc/kubernetes/kubelet-env

ExecStart=/usr/bin/hyperkube \
kubelet \
--config=/etc/kubernetes/kubelet.conf \
--bootstrap-kubeconfig=/etc/kubernetes/kubeconfig \
--kubeconfig=/var/lib/kubelet/kubeconfig \
--rotate-certificates \
--serialize-image-pulls=false \
--kubeconfig=/var/lib/kubelet/kubeconfig \
--container-runtime=remote \
--container-runtime-endpoint=/var/run/crio/crio.sock \
--runtime-request-timeout=${KUBELET_RUNTIME_REQUEST_TIMEOUT} \
--lock-file=/var/run/lock/kubelet.lock \
--exit-on-lock-contention \
--pod-manifest-path=/etc/kubernetes/manifests \
--allow-privileged \
--node-labels=node-role.kubernetes.io/master \
--minimum-container-ttl-duration=6m0s \
--cluster-dns=10.3.0.10 \
--cluster-domain=cluster.local \
--client-ca-file=/etc/kubernetes/ca.crt \
--cloud-provider= \
\
\
--anonymous-auth=false \
--register-with-taints=node-role.kubernetes.io/master=:NoSchedule \
--cgroup-driver=systemd \

Restart=always
RestartSec=10
Expand Down
6 changes: 6 additions & 0 deletions ...controller/template/test_data/templates/libvirt/worker/files/-etc-kubernetes-kubelet.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
contents:
source: data:,kind%3A%20KubeletConfiguration%0AapiVersion%3A%20kubelet.config.k8s.io%2Fv1beta1%0AcgroupDriver%3A%20systemd%0AclusterDns%3A%0A%20%20-%2010.3.0.10%0AclusterDomain%3A%20cluster.local%0ArotateCertificates%3A%20true%0AruntimeRequestTimeout%3A%2010m%0AserializeImagePulls%3A%20false%0AstaticPodPath%3A%20%2Fetc%2Fkubernetes%2Fmanifests%0A
verification: {}
filesystem: root
mode: 420
path: /etc/kubernetes/kubelet.conf
13 changes: 2 additions & 11 deletions pkg/controller/template/test_data/templates/libvirt/worker/units/kubelet.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,32 +5,23 @@ contents: |

[Service]
ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests
Environment=KUBELET_RUNTIME_REQUEST_TIMEOUT=10m
EnvironmentFile=-/etc/kubernetes/kubelet-workaround
EnvironmentFile=-/etc/kubernetes/kubelet-env

ExecStart=/usr/bin/hyperkube \
kubelet \
--config=/etc/kubernetes/kubelet.conf \
--bootstrap-kubeconfig=/etc/kubernetes/kubeconfig \
--kubeconfig=/var/lib/kubelet/kubeconfig \
--rotate-certificates \
--serialize-image-pulls=false \
--container-runtime=remote \
--container-runtime-endpoint=/var/run/crio/crio.sock \
--runtime-request-timeout=${KUBELET_RUNTIME_REQUEST_TIMEOUT} \
--lock-file=/var/run/lock/kubelet.lock \
--exit-on-lock-contention \
--pod-manifest-path=/etc/kubernetes/manifests \
--allow-privileged \
--node-labels=node-role.kubernetes.io/worker \
--minimum-container-ttl-duration=6m0s \
--cluster-dns=10.3.0.10 \
--cluster-domain=cluster.local \
--client-ca-file=/etc/kubernetes/ca.crt \
--cloud-provider= \
\
\
--anonymous-auth=false \
--cgroup-driver=systemd \

Restart=always
RestartSec=10
Expand Down
14 changes: 14 additions & 0 deletions templates/_base/master/files/kubelet.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
filesystem: "root"
mode: 0644
path: "/etc/kubernetes/kubelet.conf"
contents:
inline: |
kind: KubeletConfiguration
apiVersion: kubelet.config.k8s.io/v1beta1
cgroupDriver: systemd
clusterDns:
- {{.ClusterDNSIP}}
clusterDomain: cluster.local
runtimeRequestTimeout: 10m
serializeImagePulls: false
staticPodPath: /etc/kubernetes/manifests
14 changes: 3 additions & 11 deletions templates/_base/master/units/kubelet.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,33 +7,25 @@ contents: |

[Service]
ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests
Environment=KUBELET_RUNTIME_REQUEST_TIMEOUT=10m
EnvironmentFile=-/etc/kubernetes/kubelet-workaround
EnvironmentFile=-/etc/kubernetes/kubelet-env

ExecStart=/usr/bin/hyperkube \
kubelet \
--config=/etc/kubernetes/kubelet.conf \
--bootstrap-kubeconfig=/etc/kubernetes/kubeconfig \
--kubeconfig=/var/lib/kubelet/kubeconfig \
--rotate-certificates \
--serialize-image-pulls=false \
--kubeconfig=/var/lib/kubelet/kubeconfig \
--container-runtime=remote \
--container-runtime-endpoint=/var/run/crio/crio.sock \
--runtime-request-timeout=${KUBELET_RUNTIME_REQUEST_TIMEOUT} \
--lock-file=/var/run/lock/kubelet.lock \
--exit-on-lock-contention \
--pod-manifest-path=/etc/kubernetes/manifests \
--allow-privileged \
--node-labels=node-role.kubernetes.io/master \
--minimum-container-ttl-duration=6m0s \
--cluster-dns={{.ClusterDNSIP}} \
--cluster-domain=cluster.local \
--client-ca-file=/etc/kubernetes/ca.crt \
--cloud-provider={{cloudProvider .}} \
{{.CloudProviderConfig}} \
{{.CloudProviderConfig -}} \
--anonymous-auth=false \
--register-with-taints=node-role.kubernetes.io/master=:NoSchedule \
--cgroup-driver=systemd \

Restart=always
RestartSec=10
Expand Down
15 changes: 15 additions & 0 deletions templates/_base/worker/files/kubelet.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
filesystem: "root"
mode: 0644
path: "/etc/kubernetes/kubelet.conf"
contents:
inline: |
kind: KubeletConfiguration
apiVersion: kubelet.config.k8s.io/v1beta1
cgroupDriver: systemd
clusterDns:
- {{.ClusterDNSIP}}
clusterDomain: cluster.local
rotateCertificates: true
runtimeRequestTimeout: 10m
serializeImagePulls: false
staticPodPath: /etc/kubernetes/manifests
13 changes: 2 additions & 11 deletions templates/_base/worker/units/kubelet.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,32 +7,23 @@ contents: |

[Service]
ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests
Environment=KUBELET_RUNTIME_REQUEST_TIMEOUT=10m
EnvironmentFile=-/etc/kubernetes/kubelet-workaround
EnvironmentFile=-/etc/kubernetes/kubelet-env

ExecStart=/usr/bin/hyperkube \
kubelet \
--config=/etc/kubernetes/kubelet.conf \
--bootstrap-kubeconfig=/etc/kubernetes/kubeconfig \
--kubeconfig=/var/lib/kubelet/kubeconfig \
--rotate-certificates \
--serialize-image-pulls=false \
--container-runtime=remote \
--container-runtime-endpoint=/var/run/crio/crio.sock \
--runtime-request-timeout=${KUBELET_RUNTIME_REQUEST_TIMEOUT} \
--lock-file=/var/run/lock/kubelet.lock \
--exit-on-lock-contention \
--pod-manifest-path=/etc/kubernetes/manifests \
--allow-privileged \
--node-labels=node-role.kubernetes.io/worker \
--minimum-container-ttl-duration=6m0s \
--cluster-dns={{.ClusterDNSIP}} \
--cluster-domain=cluster.local \
--client-ca-file=/etc/kubernetes/ca.crt \
--cloud-provider={{cloudProvider .}} \
{{.CloudProviderConfig}} \
{{.CloudProviderConfig -}} \
--anonymous-auth=false \
--cgroup-driver=systemd \

Restart=always
RestartSec=10
Expand Down