Skip to content

Commit

Permalink
Added 1.15 support and removed --allow-privileged flag from all EKS s…
Browse files Browse the repository at this point in the history
…upported versions (1.12+). (#428)
  • Loading branch information
abeer91 authored Mar 10, 2020
1 parent 7a53fbb commit b98cec2
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 29 deletions.
8 changes: 6 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ T_YELLOW := \e[0;33m
T_RESET := \e[0m

.PHONY: all
all: 1.12 1.13 1.14
all: 1.12 1.13 1.14 1.15

.PHONY: validate
validate:
Expand All @@ -47,4 +47,8 @@ k8s: validate

.PHONY: 1.14
1.14:
$(MAKE) k8s kubernetes_version=1.14.9 kubernetes_build_date=2020-01-22
$(MAKE) k8s kubernetes_version=1.14.9 kubernetes_build_date=2020-01-22

.PHONY: 1.15
1.15:
$(MAKE) k8s kubernetes_version=1.15.10 kubernetes_build_date=2020-02-14
21 changes: 0 additions & 21 deletions files/1.14/kubelet.service

This file was deleted.

1 change: 0 additions & 1 deletion files/kubelet.service
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ Requires=docker.service
ExecStartPre=/sbin/iptables -P FORWARD ACCEPT -w 5
ExecStart=/usr/bin/kubelet --cloud-provider aws \
--config /etc/kubernetes/kubelet/kubelet-config.json \
--allow-privileged=true \
--kubeconfig /var/lib/kubelet/kubeconfig \
--container-runtime docker \
--network-plugin cni $KUBELET_ARGS $KUBELET_EXTRA_ARGS
Expand Down
6 changes: 1 addition & 5 deletions scripts/install-worker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -190,11 +190,7 @@ sudo mkdir -p /etc/kubernetes/kubelet
sudo mkdir -p /etc/systemd/system/kubelet.service.d
sudo mv $TEMPLATE_DIR/kubelet-kubeconfig /var/lib/kubelet/kubeconfig
sudo chown root:root /var/lib/kubelet/kubeconfig
if [ "$KUBERNETES_MINOR_VERSION" = "1.14" ]; then
sudo mv $TEMPLATE_DIR/1.14/kubelet.service /etc/systemd/system/kubelet.service
else
sudo mv $TEMPLATE_DIR/kubelet.service /etc/systemd/system/kubelet.service
fi
sudo mv $TEMPLATE_DIR/kubelet.service /etc/systemd/system/kubelet.service
sudo chown root:root /etc/systemd/system/kubelet.service
sudo mv $TEMPLATE_DIR/kubelet-config.json /etc/kubernetes/kubelet/kubelet-config.json
sudo chown root:root /etc/kubernetes/kubelet/kubelet-config.json
Expand Down

0 comments on commit b98cec2

Please sign in to comment.