Merge branch 'master' of github.com:rancher/rke-tools into worker_processes

Author: dkeightley

.drone.yml

@@ -7,19 +7,25 @@ platform:
 
 steps:
   - name: build
-    image: rancher/dapper:v0.5.1
+    image: rancher/dapper:v0.5.7
     volumes:
       - name: docker
         path: /var/run/docker.sock
     commands:
       - dapper ci
+    when:
+      refs:
+      - refs/head/master
+      - refs/tags/*
+      event:
+      - push
+      - pull_request
+      - tag
   - name: stage-binaries
-    image: rancher/dapper:v0.5.1
+    image: rancher/dapper:v0.5.7
     commands:
       - cp -r ./bin/* ./
     when:
-      instance:
-      - drone-publish.rancher.io
       refs:
       - refs/head/master
       - refs/tags/*
@@ -37,9 +43,8 @@ steps:
         - ARCH=amd64
       repo: rancher/rke-tools
       tag: "${DRONE_TAG}-linux-amd64"
+      no_cache: true
     when:
-      instance:
-      - drone-publish.rancher.io
       refs:
       - refs/head/master
       - refs/tags/*
@@ -59,19 +64,25 @@ platform:
 
 steps:
   - name: build
-    image: rancher/dapper:v0.5.1
+    image: rancher/dapper:v0.5.7
     volumes:
       - name: docker
         path: /var/run/docker.sock
     commands:
       - dapper ci
+    when:
+      refs:
+      - refs/head/master
+      - refs/tags/*
+      event:
+      - push
+      - pull_request
+      - tag
   - name: stage-binaries
-    image: rancher/dapper:v0.5.1
+    image: rancher/dapper:v0.5.7
     commands:
       - cp -r ./bin/* ./
     when:
-      instance:
-      - drone-publish.rancher.io
       refs:
       - refs/head/master
       - refs/tags/*
@@ -89,9 +100,8 @@ steps:
         - ARCH=arm64
       repo: rancher/rke-tools
       tag: "${DRONE_TAG}-linux-arm64"
+      no_cache: true
     when:
-      instance:
-      - drone-publish.rancher.io
       refs:
       - refs/head/master
       - refs/tags/*
@@ -127,45 +137,6 @@ steps:
       - name: docker_pipe
         path: \\\\.\\pipe\\docker_engine
     when:
-      instance:
-      - drone-publish.rancher.io
-      refs:
-      - refs/head/master
-      - refs/tags/*
-      event:
-      - tag
-volumes:
-  - name: docker_pipe
-    host:
-      path: \\\\.\\pipe\\docker_engine
----
-kind: pipeline
-name: windows-1903
-
-platform:
-  os: windows
-  arch: amd64
-  version: 1903
-
-steps:
-  - name: publish-rke-tools-windows-1903
-    image: plugins/docker
-    settings:
-      username:
-        from_secret: docker_username
-      password:
-        from_secret: docker_password
-      dockerfile: package/Dockerfile.windows
-      build_args:
-        - SERVERCORE_VERSION=1903
-      repo: rancher/rke-tools
-      tag: "${DRONE_TAG}-windows-1903"
-    volumes:
-      - name: docker_pipe
-        path: \\\\.\\pipe\\docker_engine
-    when:
-      instance:
-      - drone-publish.rancher.io
       refs:
       - refs/head/master
       - refs/tags/*
@@ -178,130 +149,6 @@ volumes:
 
 ---
 kind: pipeline
-name: windows-1909
-
-platform:
-  os: windows
-  arch: amd64
-  version: 1909
-
-steps:
-  - name: publish-rke-tools-windows-1909
-    image: plugins/docker
-    settings:
-      username:
-        from_secret: docker_username
-      password:
-        from_secret: docker_password
-      dockerfile: package/Dockerfile.windows
-      build_args:
-        - SERVERCORE_VERSION=1909
-      repo: rancher/rke-tools
-      tag: "${DRONE_TAG}-windows-1909"
-    volumes:
-      - name: docker_pipe
-        path: \\\\.\\pipe\\docker_engine
-    when:
-      instance:
-        - drone-publish.rancher.io
-      refs:
-        - refs/head/master
-        - refs/tags/*
-      event:
-        - tag
-volumes:
-  - name: docker_pipe
-    host:
-      path: \\\\.\\pipe\\docker_engine
----
-kind: pipeline
-name: windows-2004
-
-platform:
-  os: windows
-  arch: amd64
-  version: 2004
-
-# remove this and use upstream images when https://github.com/drone/drone-git/pull/25 is merged
-clone:
-  disable: true
-
-steps:
-  - name: clone
-    image: luthermonson/drone-git:windows-2004-amd64
-  - name: publish-rke-tools-windows-2004
-    image: luthermonson/drone-docker:2004
-    settings:
-      username:
-        from_secret: docker_username
-      password:
-        from_secret: docker_password
-      dockerfile: package/Dockerfile.windows
-      build_args:
-        - SERVERCORE_VERSION=2004
-      repo: rancher/rke-tools
-      tag: "${DRONE_TAG}-windows-2004"
-    volumes:
-      - name: docker_pipe
-        path: \\\\.\\pipe\\docker_engine
-    when:
-      instance:
-        - drone-publish.rancher.io
-      refs:
-        - refs/head/master
-        - refs/tags/*
-      event:
-        - tag
-volumes:
-  - name: docker_pipe
-    host:
-      path: \\\\.\\pipe\\docker_engine
-
----
-kind: pipeline
-name: windows-20H2
-
-platform:
-  os: windows
-  arch: amd64
-  version: 20H2
-
-# remove this and use upstream images when https://github.com/drone/drone-git/pull/25 is merged
-clone:
-  disable: true
-
-steps:
-  - name: clone
-    image: luthermonson/drone-git:windows-20H2-amd64
-  - name: publish-rke-tools-windows-20H2
-    image: luthermonson/drone-docker:20H2
-    settings:
-      username:
-        from_secret: docker_username
-      password:
-        from_secret: docker_password
-      dockerfile: package/Dockerfile.windows.20H2
-      build_args:
-        - SERVERCORE_VERSION=20H2
-      repo: rancher/rke-tools
-      tag: "${DRONE_TAG}-windows-20H2"
-    volumes:
-      - name: docker_pipe
-        path: \\\\.\\pipe\\docker_engine
-    when:
-      instance:
-        - drone-publish.rancher.io
-      refs:
-        - refs/head/master
-        - refs/tags/*
-      event:
-        - tag
-volumes:
-  - name: docker_pipe
-    host:
-      path: \\\\.\\pipe\\docker_engine
----
-kind: pipeline
 name: manifest
 
 steps:
@@ -314,8 +161,6 @@ steps:
         from_secret: docker_password
       spec: manifest.tmpl
     when:
-      instance:
-      - drone-publish.rancher.io
       refs:
       - refs/head/master
       - refs/tags/*
@@ -325,7 +170,17 @@ depends_on:
 - linux-amd64
 - linux-arm64
 - windows-1809
-- windows-1903
-- windows-1909
-- windows-2004
-- windows-20H2
+---
+kind: pipeline
+name: fossa
+
+steps:
+- name: fossa
+  image: rancher/drone-fossa:latest
+  failure: ignore
+  settings:
+    api_key:
+      from_secret: FOSSA_API_KEY
+    when:
+      instance:
+        - drone-publish.rancher.io

Dockerfile.dapper

@@ -1,5 +1,5 @@
-FROM ubuntu:16.04
-# FROM arm=armhf/ubuntu:16.04 arm64=aarch64/ubuntu:16.04
+FROM ubuntu:20.04
+# FROM arm=armhf/ubuntu:20.04 arm64=arm64v8/ubuntu:20.04
 
 ARG DAPPER_HOST_ARCH
 ENV HOST_ARCH=${DAPPER_HOST_ARCH} ARCH=${DAPPER_HOST_ARCH}
@@ -11,7 +11,7 @@ RUN apt-get update && \
 ENV GOLANG_ARCH_amd64=amd64 GOLANG_ARCH_arm=armv6l GOLANG_ARCH_arm64=arm64 GOLANG_ARCH=GOLANG_ARCH_${ARCH} \
     GOPATH=/go PATH=/go/bin:/usr/local/go/bin:${PATH} SHELL=/bin/bash
 
-RUN wget -O - https://dl.google.com/go/go1.14.4.linux-${!GOLANG_ARCH}.tar.gz | tar -xzf - -C /usr/local && \
+RUN wget -O - https://dl.google.com/go/go1.16.4.linux-${!GOLANG_ARCH}.tar.gz | tar -xzf - -C /usr/local && \
     go get golang.org/x/lint/golint
 
 ENV DOCKER_URL_amd64=https://get.docker.com/builds/Linux/x86_64/docker-1.10.3 \

entrypoint.sh

@@ -12,6 +12,13 @@ if echo ${@} | grep -q "cloud-provider=azure"; then
   fi
 fi
 
+if [ "$1" = "kube-proxy" ]; then
+  if echo ${@} | grep -v "hostname-override"; then
+    hostname=$(curl "http://169.254.169.254/latest/meta-data/hostname")
+    set ${@} --hostname-override=$hostname
+  fi
+fi
+
 if [ "$1" = "kubelet" ]; then
     DOCKER_ROOT=$(DOCKER_API_VERSION=1.24 /opt/rke-tools/bin/docker info 2>&1  | grep -i 'docker root dir' | cut -f2 -d:)
     DOCKER_DIRS=$(find -O1 $DOCKER_ROOT -maxdepth 1) # used to exclude mounts that are subdirectories of $DOCKER_ROOT to ensure we don't unmount mounted filesystems on sub directories
@@ -70,8 +77,26 @@ if [ "$1" = "kubelet" ]; then
 
     CGROUPDRIVER=$(/opt/rke-tools/bin/docker info | grep -i 'cgroup driver' | awk '{print $3}')
 
-    # final step for kubelet
-    exec "$@" --cgroup-driver=$CGROUPDRIVER $RESOLVCONF
+    # separate flow for cri-dockerd to minimize change to the existing way we run kubelet
+    if [ "${RKE_KUBELET_CRIDOCKERD}" == "true" ]; then
+        
+        # Get the value of pause image to start cri-dockerd
+        RKE_KUBELET_PAUSEIMAGE=$(echo "$@" | grep -Eo "\-\-pod-infra-container-image+.*" | awk '{print $1}')
+        /opt/rke-tools/bin/cri-dockerd --network-plugin="cni" --cni-conf-dir="/etc/cni/net.d" --cni-bin-dir="/opt/cni/bin" ${RKE_KUBELET_PAUSEIMAGE} &
+
+        # wait for cri-dockerd to start as kubelet depends on it
+        echo "Sleeping 10 waiting for cri-dockerd to start"
+        sleep 10
+
+        # start kubelet
+        exec "$@" --cgroup-driver=$CGROUPDRIVER $RESOLVCONF &
+
+        # waiting for either cri-dockerd or kubelet to crash and exit so it can be restarted
+        wait -n
+    else
+        # start kubelet
+        exec "$@" --cgroup-driver=$CGROUPDRIVER $RESOLVCONF
+    fi
 fi
 
 exec "$@"

go.mod

@@ -1,12 +1,21 @@
 module rke-tools
 
-go 1.14
+go 1.16
 
 require (
-	github.com/minio/minio-go/v6 v6.0.57
-	github.com/sirupsen/logrus v1.5.0
-	github.com/smartystreets/goconvey v1.6.4 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
+	github.com/google/uuid v1.3.0 // indirect
+	github.com/klauspost/compress v1.15.6 // indirect
+	github.com/klauspost/cpuid/v2 v2.0.12 // indirect
+	github.com/minio/md5-simd v1.1.2 // indirect
+	github.com/minio/minio-go/v7 v7.0.27
+	github.com/minio/sha256-simd v1.0.0 // indirect
+	github.com/rs/xid v1.4.0 // indirect
+	github.com/sirupsen/logrus v1.8.1
 	github.com/stretchr/testify v1.6.1 // indirect
-	github.com/urfave/cli v1.18.0
-	golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297 // indirect
+	github.com/urfave/cli v1.22.9
+	golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect
+	golang.org/x/net v0.0.0-20220607020251-c690dde0001d // indirect
+	golang.org/x/sys v0.0.0-20220608164250-635b8c9b7f68 // indirect
+	gopkg.in/ini.v1 v1.66.6 // indirect
 )