Skip to content

Revert "migrate to kubelet config file" #105

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

Closed
rphillips wants to merge 1 commit into from
Closed

Revert "migrate to kubelet config file" #105

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: 0 additions & 6 deletions pkg/controller/template/test_data/templates/aws/master/files/-etc-kubernetes-kubelet.conf
View file
Open in desktop

This file was deleted.

14 changes: 11 additions & 3 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,25 +5,33 @@ 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 \
--rotate-certificates \
--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/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: 0 additions & 6 deletions pkg/controller/template/test_data/templates/aws/worker/files/-etc-kubernetes-kubelet.conf
View file
Open in desktop

This file was deleted.

13 changes: 11 additions & 2 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,23 +5,32 @@ 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: 0 additions & 6 deletions ...controller/template/test_data/templates/libvirt/master/files/-etc-kubernetes-kubelet.conf
View file
Open in desktop

This file was deleted.

14 changes: 11 additions & 3 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,25 +5,33 @@ 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 \
--rotate-certificates \
--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/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: 0 additions & 6 deletions ...controller/template/test_data/templates/libvirt/worker/files/-etc-kubernetes-kubelet.conf
View file
Open in desktop

This file was deleted.

13 changes: 11 additions & 2 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,23 +5,32 @@ 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: 0 additions & 14 deletions templates/_base/master/files/kubelet.yaml
View file
Open in desktop

This file was deleted.

14 changes: 11 additions & 3 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,25 +7,33 @@ 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 \
--rotate-certificates \
--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/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: 0 additions & 15 deletions templates/_base/worker/files/kubelet.yaml
View file
Open in desktop

This file was deleted.

13 changes: 11 additions & 2 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,23 +7,32 @@ 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