From edd1ec41e4dc88f20c630e19bbb931f34ea7653c Mon Sep 17 00:00:00 2001 From: Marcos Lilljedahl Date: Tue, 30 May 2023 01:36:31 -0300 Subject: [PATCH] bump pwk to kube 1.27.2 Signed-off-by: Marcos Lilljedahl --- dockerfiles/dind/Dockerfile | 2 +- dockerfiles/dind/daemon.json | 9 +++++++-- dockerfiles/k8s/.bashrc | 2 ++ dockerfiles/k8s/Dockerfile | 13 +++++++------ dockerfiles/k8s/daemon.json | 18 ++++++++++++------ dockerfiles/k8s/kubelet.env | 7 +++---- dockerfiles/k8s/motd | 4 ++-- dockerfiles/k8s/wrapkubeadm.sh | 6 +++--- 8 files changed, 37 insertions(+), 24 deletions(-) create mode 100644 dockerfiles/k8s/.bashrc diff --git a/dockerfiles/dind/Dockerfile b/dockerfiles/dind/Dockerfile index 2fd4d18..df60c5c 100644 --- a/dockerfiles/dind/Dockerfile +++ b/dockerfiles/dind/Dockerfile @@ -10,7 +10,7 @@ ENV PATH $PATH:$GOPATH ENV DOCKER_TLS_CERTDIR="" ENV DOCKER_CLI_EXPERIMENTAL=enabled -ENV COMPOSE_VERSION=2.6.1 +ENV COMPOSE_VERSION=2.16.0 # Add bash completion and set bash as default shell diff --git a/dockerfiles/dind/daemon.json b/dockerfiles/dind/daemon.json index fc92105..3d36f55 100644 --- a/dockerfiles/dind/daemon.json +++ b/dockerfiles/dind/daemon.json @@ -2,8 +2,13 @@ "experimental": true, "debug": true, "log-level": "info", - "insecure-registries": ["127.0.0.1"], - "hosts": ["unix:///var/run/docker.sock", "tcp://0.0.0.0:2375"], + "insecure-registries": [ + "127.0.0.1" + ], + "hosts": [ + "unix:///var/run/docker.sock", + "tcp://0.0.0.0:2375" + ], "tls": DOCKER_TLSENABLE, "tlscacert": "DOCKER_TLSCACERT", "tlscert": "DOCKER_TLSCERT", diff --git a/dockerfiles/k8s/.bashrc b/dockerfiles/k8s/.bashrc new file mode 100644 index 0000000..b793a44 --- /dev/null +++ b/dockerfiles/k8s/.bashrc @@ -0,0 +1,2 @@ +export PS1="[\h \W]$ " +cat /etc/motd diff --git a/dockerfiles/k8s/Dockerfile b/dockerfiles/k8s/Dockerfile index e028f64..065a754 100644 --- a/dockerfiles/k8s/Dockerfile +++ b/dockerfiles/k8s/Dockerfile @@ -5,7 +5,7 @@ COPY ./kubernetes.repo /etc/yum.repos.d/ -RUN yum install -y kubectl-1.20.1 kubeadm-1.20.1 kubelet-1.20.1 \ +RUN yum install -y kubectl-1.27.2 kubeadm-1.27.2 kubelet-1.27.2 \ #&& 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 install -y docker-ce git bash-completion \ @@ -14,7 +14,7 @@ RUN yum install -y kubectl-1.20.1 kubeadm-1.20.1 kubelet-1.20.1 \ RUN curl -Lf -o /usr/bin/jq https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ && curl -Lf -o /usr/bin/docker-compose https://github.com/docker/compose/releases/download/1.21.0/docker-compose-$(uname -s)-$(uname -m) \ - && chmod +x /usr/bin/jq /usr/bin/docker-compose + && chmod +x /usr/bin/jq /usr/bin/docker-compose VOLUME ["/var/lib/kubelet"] @@ -25,11 +25,10 @@ COPY ./tokens.csv /etc/pki/tokens.csv COPY ./daemon.json /etc/docker/ COPY ./resolv.conf.override /etc/ COPY ./docker.service /usr/lib/systemd/system/ +COPY ./.bashrc /root/ COPY motd /etc/motd -RUN echo $'cat /etc/motd \n\ -export PS1="[\h \W]$ "' >> /root/.bash_profile RUN echo 'source <(kubectl completion bash)' >>~/.bashrc \ && kubectl completion bash >> /etc/bash_completion.d/kubectl @@ -39,5 +38,7 @@ RUN mkdir -p /root/.kube && ln -s /etc/kubernetes/admin.conf /root/.kube/config WORKDIR /root -CMD mount --make-shared / && systemctl start docker && systemctl start kubelet \ - && while true; do bash -l; done +CMD mount --make-shared / \ + && systemctl start docker \ + && systemctl start kubelet \ + && while true; do script -q -c "/bin/bash -l" /dev/null; done diff --git a/dockerfiles/k8s/daemon.json b/dockerfiles/k8s/daemon.json index 127fe9f..b65a922 100644 --- a/dockerfiles/k8s/daemon.json +++ b/dockerfiles/k8s/daemon.json @@ -1,8 +1,14 @@ { - "experimental": true, - "debug": true, - "log-level": "info", - "storage-driver": "vfs", - "insecure-registries": ["127.0.0.1"], - "hosts": ["unix:///var/run/docker.sock", "tcp://0.0.0.0:2375"] + "experimental": true, + "debug": true, + "cri-containerd": true, + "log-level": "info", + "tls": false, + "insecure-registries": [ + "127.0.0.1" + ], + "hosts": [ + "unix:///var/run/docker.sock", + "tcp://0.0.0.0:2375" + ] } diff --git a/dockerfiles/k8s/kubelet.env b/dockerfiles/k8s/kubelet.env index ff607f1..093a47e 100644 --- a/dockerfiles/k8s/kubelet.env +++ b/dockerfiles/k8s/kubelet.env @@ -1,7 +1,6 @@ -KUBELET_KUBECONFIG_ARGS=" --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --kubeconfig=/etc/kubernetes/kubelet.conf" -KUBELET_SYSTEM_PODS_ARGS="--pod-manifest-path=/etc/kubernetes/manifests --pod-infra-container-image=k8s.gcr.io/pause:3.2" -KUBELET_NETWORK_ARGS="--network-plugin=cni --cni-conf-dir=/etc/cni/net.d --cni-bin-dir=/opt/cni/bin" +KUBELET_KUBECONFIG_ARGS="--bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --kubeconfig=/etc/kubernetes/kubelet.conf" +KUBELET_SYSTEM_PODS_ARGS="--pod-manifest-path=/etc/kubernetes/manifests" 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_CGROUP_ARGS="--cgroup-driver=cgroupfs" -KUBELET_EXTRA_ARGS="--fail-swap-on=false --resolv-conf=/etc/resolv.conf.override" +KUBELET_EXTRA_ARGS="--fail-swap-on=false --resolv-conf=/etc/resolv.conf.override --container-runtime-endpoint /run/docker/containerd/containerd.sock " diff --git a/dockerfiles/k8s/motd b/dockerfiles/k8s/motd index eeec37e..348b9c7 100644 --- a/dockerfiles/k8s/motd +++ b/dockerfiles/k8s/motd @@ -10,11 +10,11 @@ 1. Initializes cluster master node: kubeadm init --apiserver-advertise-address $(hostname -i) --pod-network-cidr 10.5.0.0/16 - + 2. Initialize cluster networking: -kubectl apply -f https://raw.githubusercontent.com/cloudnativelabs/kube-router/master/daemonset/kubeadm-kuberouter.yaml + kubectl apply -f https://raw.githubusercontent.com/cloudnativelabs/kube-router/master/daemonset/kubeadm-kuberouter.yaml 3. (Optional) Create an nginx deployment: diff --git a/dockerfiles/k8s/wrapkubeadm.sh b/dockerfiles/k8s/wrapkubeadm.sh index 5c4287b..2a78e44 100755 --- a/dockerfiles/k8s/wrapkubeadm.sh +++ b/dockerfiles/k8s/wrapkubeadm.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash # Copyright 2017 Mirantis # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -138,10 +138,10 @@ fi if [[ "$@" == "init"* || "$@" == "join"* ]]; then # Call kubeadm with params and skip flag - /usr/bin/kubeadm "$@" --ignore-preflight-errors all + /usr/bin/kubeadm "$@" --ignore-preflight-errors all --cri-socket /run/docker/containerd/containerd.sock else # Call kubeadm with params - /usr/bin/kubeadm "$@" + /usr/bin/kubeadm "$@" fi # Frob cluster