epic/play-with-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add support for k8s 1.12.1

Browse Source
This commit is contained in:
Marcos Lilljedahl
2018-10-20 00:12:58 -03:00
parent 1c6e5a7cf7
commit 1de2ca78d5
5 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
dockerfiles/k8s/Dockerfile
View File

@@ -5,7 +5,7 @@ COPY ./kubernetes.repo /etc/yum.repos.d/
RUN yum install -y kubectl-1.8.11-0 kubeadm-1.8.11-0 \ RUN yum install -y kubectl-1.12.1-0 kubeadm-1.12.1-0 \
&& mv -f /etc/systemd/system/kubelet.service.d/10-kubeadm.conf /etc/systemd/system/kubelet.service \ && mv -f /etc/systemd/system/kubelet.service.d/10-kubeadm.conf /etc/systemd/system/kubelet.service \
&& yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo \ && yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo \
&& yum install -y docker-ce git \ && yum install -y docker-ce git \
@@ -21,6 +21,7 @@ COPY ./kube* /etc/systemd/system/
COPY ./wrapkubeadm.sh /usr/local/bin/kubeadm COPY ./wrapkubeadm.sh /usr/local/bin/kubeadm
COPY ./tokens.csv /etc/pki/tokens.csv COPY ./tokens.csv /etc/pki/tokens.csv
COPY ./daemon.json /etc/docker/ COPY ./daemon.json /etc/docker/
COPY ./resolv.conf.override /etc/
COPY motd /etc/motd COPY motd /etc/motd

3
dockerfiles/k8s/kubelet.env
View File

@@ -3,6 +3,5 @@ KUBELET_SYSTEM_PODS_ARGS="--pod-manifest-path=/etc/kubernetes/manifests --allow-
KUBELET_NETWORK_ARGS="--network-plugin=cni --cni-conf-dir=/etc/cni/net.d --cni-bin-dir=/opt/cni/bin" KUBELET_NETWORK_ARGS="--network-plugin=cni --cni-conf-dir=/etc/cni/net.d --cni-bin-dir=/opt/cni/bin"
KUBELET_DNS_ARGS="--cluster-dns=10.96.0.10 --cluster-domain=cluster.local" KUBELET_DNS_ARGS="--cluster-dns=10.96.0.10 --cluster-domain=cluster.local"
KUBELET_AUTHZ_ARGS="--authorization-mode=Webhook --client-ca-file=/etc/kubernetes/pki/ca.crt" KUBELET_AUTHZ_ARGS="--authorization-mode=Webhook --client-ca-file=/etc/kubernetes/pki/ca.crt"
KUBELET_CADVISOR_ARGS="--cadvisor-port=0"
KUBELET_CGROUP_ARGS="--cgroup-driver=cgroupfs" KUBELET_CGROUP_ARGS="--cgroup-driver=cgroupfs"
KUBELET_EXTRA_ARGS="--fail-swap-on=false" KUBELET_EXTRA_ARGS="--fail-swap-on=false --resolv-conf=/etc/resolv.conf.override"

2
dockerfiles/k8s/kubelet.service
View File

@@ -1,4 +1,4 @@
[Service] [Service]
Restart=always Restart=always
EnvironmentFile=/etc/systemd/system/kubelet.env EnvironmentFile=/etc/systemd/system/kubelet.env
ExecStart=/usr/bin/kubelet $KUBELET_KUBECONFIG_ARGS $KUBELET_SYSTEM_PODS_ARGS $KUBELET_NETWORK_ARGS $KUBELET_DNS_ARGS $KUBELET_AUTHZ_ARGS $KUBELET_CADVISOR_ARGS $KUBELET_CGROUP_ARGS $KUBELET_EXTRA_ARGS ExecStart=/usr/bin/kubelet $KUBELET_KUBECONFIG_ARGS $KUBELET_SYSTEM_PODS_ARGS $KUBELET_NETWORK_ARGS $KUBELET_DNS_ARGS $KUBELET_AUTHZ_ARGS $KUBELET_CGROUP_ARGS $KUBELET_EXTRA_ARGS

2
dockerfiles/k8s/systemctl
View File

@@ -147,8 +147,8 @@ function action_restart(){
local UNIT_FILE=$1 local UNIT_FILE=$1
local UNIT_INSTANCE=$2 local UNIT_INSTANCE=$2
action_start $UNIT_FILE $UNIT_INSTANCE
action_stop $UNIT_FILE $UNIT_INSTANCE action_stop $UNIT_FILE $UNIT_INSTANCE
action_start $UNIT_FILE $UNIT_INSTANCE
} }

9
dockerfiles/k8s/wrapkubeadm.sh
View File

@@ -34,6 +34,12 @@ function dind::proxy-cidr-and-no-conntrack {
} }
# Adds route to defualt eth0 interface so 10.96.x.x can go through
function dind::add-route {
route add 10.96.0.0/16 dev eth0
}
function dind::join-filters { function dind::join-filters {
local IFS="|" local IFS="|"
@@ -118,6 +124,7 @@ function dind::frob-cluster {
dind::frob-apiserver dind::frob-apiserver
dind::wait-for-apiserver dind::wait-for-apiserver
dind::frob-proxy dind::frob-proxy
dind::add-route
} }
# Weave depends on /etc/machine-id being unique # Weave depends on /etc/machine-id being unique
@@ -128,7 +135,7 @@ fi
if [[ "$@" == "init"* || "$@" == "join"* ]]; then if [[ "$@" == "init"* || "$@" == "join"* ]]; then
# Call kubeadm with params and skip flag # Call kubeadm with params and skip flag
/usr/bin/kubeadm "$@" --skip-preflight-checks /usr/bin/kubeadm "$@" --ignore-preflight-errors all
else else
# Call kubeadm with params # Call kubeadm with params
/usr/bin/kubeadm "$@" /usr/bin/kubeadm "$@"