From 5b9e320e1653d01a17171f6ae68cb3c0f2cabeb7 Mon Sep 17 00:00:00 2001 From: Darren Shepherd Date: Tue, 24 Apr 2018 13:55:55 -0700 Subject: [PATCH 01/84] Initial Commit --- .drone.yml | 11 +++++++++++ package/Dockerfile | 9 +++++++++ package/build-and-push.sh | 6 ++++++ 3 files changed, 26 insertions(+) create mode 100644 .drone.yml create mode 100644 package/Dockerfile create mode 100755 package/build-and-push.sh diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 0000000..56a4b02 --- /dev/null +++ b/.drone.yml @@ -0,0 +1,11 @@ +--- +pipeline: + publish-rke-certs-deployer: + image: plugins/docker + dockerfile: package/Dockerfile + repo: rancher/hyperkube + context: package/ + tag: ${DRONE_TAG} + secrets: [docker_username, docker_password] + when: + event: tag diff --git a/package/Dockerfile b/package/Dockerfile new file mode 100644 index 0000000..d338821 --- /dev/null +++ b/package/Dockerfile @@ -0,0 +1,9 @@ +FROM gcr.io/google_containers/hyperkube:v1.8.11 +RUN clean-install apt-transport-https \ + && echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ wheezy main" > \ + /etc/apt/sources.list.d/azure-cli.list \ + && apt-key adv --keyserver packages.microsoft.com --recv-keys 417A0893 \ + && clean-install \ + xfsprogs \ + open-iscsi \ + azure-cli \ diff --git a/package/build-and-push.sh b/package/build-and-push.sh new file mode 100755 index 0000000..2e5b8b1 --- /dev/null +++ b/package/build-and-push.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +REPO=${REPO:-rancher} + +docker build -t $REPO/hyperkube:dev . +docker push $REPO/hyperkube:dev From b109b5d315e80c7e068042fcd4de7f5a5900a23b Mon Sep 17 00:00:00 2001 From: Darren Shepherd Date: Tue, 24 Apr 2018 13:57:35 -0700 Subject: [PATCH 02/84] Move everything to root --- .drone.yml | 3 +-- package/Dockerfile => Dockerfile | 0 package/build-and-push.sh | 6 ------ 3 files changed, 1 insertion(+), 8 deletions(-) rename package/Dockerfile => Dockerfile (100%) delete mode 100755 package/build-and-push.sh diff --git a/.drone.yml b/.drone.yml index 56a4b02..564fc23 100644 --- a/.drone.yml +++ b/.drone.yml @@ -2,9 +2,8 @@ pipeline: publish-rke-certs-deployer: image: plugins/docker - dockerfile: package/Dockerfile + dockerfile: Dockerfile repo: rancher/hyperkube - context: package/ tag: ${DRONE_TAG} secrets: [docker_username, docker_password] when: diff --git a/package/Dockerfile b/Dockerfile similarity index 100% rename from package/Dockerfile rename to Dockerfile diff --git a/package/build-and-push.sh b/package/build-and-push.sh deleted file mode 100755 index 2e5b8b1..0000000 --- a/package/build-and-push.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -REPO=${REPO:-rancher} - -docker build -t $REPO/hyperkube:dev . -docker push $REPO/hyperkube:dev From bfa50ab7ad64066237b864d738073f0acf79a078 Mon Sep 17 00:00:00 2001 From: Darren Shepherd Date: Tue, 24 Apr 2018 14:14:52 -0700 Subject: [PATCH 03/84] Rename drone task --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 564fc23..7111caa 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,6 +1,6 @@ --- pipeline: - publish-rke-certs-deployer: + publish: image: plugins/docker dockerfile: Dockerfile repo: rancher/hyperkube From 8c08ba863ff7dae92112aa4bc42e15a14b62bbfa Mon Sep 17 00:00:00 2001 From: Darren Shepherd Date: Tue, 24 Apr 2018 14:19:08 -0700 Subject: [PATCH 04/84] v1.8.10 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d338821..ebb359c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM gcr.io/google_containers/hyperkube:v1.8.11 +FROM gcr.io/google_containers/hyperkube:v1.8.10 RUN clean-install apt-transport-https \ && echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ wheezy main" > \ /etc/apt/sources.list.d/azure-cli.list \ From cf7c1d7e2108dbc668ba1d1ea1f623f45b72be27 Mon Sep 17 00:00:00 2001 From: Darren Shepherd Date: Tue, 24 Apr 2018 14:21:02 -0700 Subject: [PATCH 05/84] v1.9.7 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ebb359c..346ce82 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM gcr.io/google_containers/hyperkube:v1.8.10 +FROM gcr.io/google_containers/hyperkube:v1.9.7 RUN clean-install apt-transport-https \ && echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ wheezy main" > \ /etc/apt/sources.list.d/azure-cli.list \ From 267f6a964c0b030f870a0a398c51ff330b6a9525 Mon Sep 17 00:00:00 2001 From: Darren Shepherd Date: Tue, 24 Apr 2018 14:21:51 -0700 Subject: [PATCH 06/84] v1.9.5 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 346ce82..6085e75 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM gcr.io/google_containers/hyperkube:v1.9.7 +FROM gcr.io/google_containers/hyperkube:v1.9.5 RUN clean-install apt-transport-https \ && echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ wheezy main" > \ /etc/apt/sources.list.d/azure-cli.list \ From 1e61be22ef315f5b5e79585436a0006c9572d9f1 Mon Sep 17 00:00:00 2001 From: Darren Shepherd Date: Tue, 24 Apr 2018 14:26:56 -0700 Subject: [PATCH 07/84] Update for stretch --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6085e75..23efc64 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,9 @@ FROM gcr.io/google_containers/hyperkube:v1.9.5 -RUN clean-install apt-transport-https \ - && echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ wheezy main" > \ +RUN clean-install apt-transport-https gnupg1 \ + && echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ stretch main" > \ /etc/apt/sources.list.d/azure-cli.list \ && apt-key adv --keyserver packages.microsoft.com --recv-keys 417A0893 \ + && apt-get purge gnupg \ && clean-install \ xfsprogs \ open-iscsi \ From 5ce2df713c4c0606e076adb0c68682c9505a08e9 Mon Sep 17 00:00:00 2001 From: Darren Shepherd Date: Tue, 24 Apr 2018 14:30:39 -0700 Subject: [PATCH 08/84] v1.9.7 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 23efc64..51f5ce2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM gcr.io/google_containers/hyperkube:v1.9.5 +FROM gcr.io/google_containers/hyperkube:v1.9.7 RUN clean-install apt-transport-https gnupg1 \ && echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ stretch main" > \ /etc/apt/sources.list.d/azure-cli.list \ From dc573f7c5d76994693a45d0580167b0ca7ba4b64 Mon Sep 17 00:00:00 2001 From: Darren Shepherd Date: Tue, 24 Apr 2018 14:34:02 -0700 Subject: [PATCH 09/84] v1.10.0 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 51f5ce2..6aea552 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM gcr.io/google_containers/hyperkube:v1.9.7 +FROM gcr.io/google_containers/hyperkube:v1.10.0 RUN clean-install apt-transport-https gnupg1 \ && echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ stretch main" > \ /etc/apt/sources.list.d/azure-cli.list \ From c9511ab4c32a1af513377890f5b8af40b6339670 Mon Sep 17 00:00:00 2001 From: Darren Shepherd Date: Tue, 24 Apr 2018 14:34:44 -0700 Subject: [PATCH 10/84] v1.10.1 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6aea552..f44d0df 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM gcr.io/google_containers/hyperkube:v1.10.0 +FROM gcr.io/google_containers/hyperkube:v1.10.1 RUN clean-install apt-transport-https gnupg1 \ && echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ stretch main" > \ /etc/apt/sources.list.d/azure-cli.list \ From a772510f100a8d537fd182b6163c79d48138e5f1 Mon Sep 17 00:00:00 2001 From: moelsayed Date: Wed, 25 Apr 2018 02:52:01 +0200 Subject: [PATCH 11/84] Add curl --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index f44d0df..8bc9f4b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,3 +8,4 @@ RUN clean-install apt-transport-https gnupg1 \ xfsprogs \ open-iscsi \ azure-cli \ + curl \ From 07de14bbaa44aece025a4de02787fb48f444231a Mon Sep 17 00:00:00 2001 From: Denise Schannon Date: Fri, 1 Jun 2018 13:53:19 -0700 Subject: [PATCH 12/84] v1.10.3 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8bc9f4b..abf5d0d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM gcr.io/google_containers/hyperkube:v1.10.1 +FROM gcr.io/google_containers/hyperkube:v1.10.3 RUN clean-install apt-transport-https gnupg1 \ && echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ stretch main" > \ /etc/apt/sources.list.d/azure-cli.list \ From dbfc9d3896eab0703db979e3cc95e102046ef255 Mon Sep 17 00:00:00 2001 From: galal-hussein Date: Fri, 1 Jun 2018 23:25:11 +0200 Subject: [PATCH 13/84] Update apt key for azure cli --- Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index abf5d0d..6c8c863 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,10 @@ FROM gcr.io/google_containers/hyperkube:v1.10.3 -RUN clean-install apt-transport-https gnupg1 \ +RUN clean-install apt-transport-https gnupg1 curl \ && echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ stretch main" > \ /etc/apt/sources.list.d/azure-cli.list \ - && apt-key adv --keyserver packages.microsoft.com --recv-keys 417A0893 \ + && curl -L https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \ && apt-get purge gnupg \ && clean-install \ xfsprogs \ open-iscsi \ azure-cli \ - curl \ From 4e4766bdc14e830d4d08387f73aa5e3e5c556b6f Mon Sep 17 00:00:00 2001 From: Denise Schannon Date: Thu, 28 Jun 2018 14:53:48 -0700 Subject: [PATCH 14/84] k8s v1.11.0 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6c8c863..f4040d9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM gcr.io/google_containers/hyperkube:v1.10.3 +FROM gcr.io/google_containers/hyperkube:v1.11.0 RUN clean-install apt-transport-https gnupg1 curl \ && echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ stretch main" > \ /etc/apt/sources.list.d/azure-cli.list \ From 433edcf08bc29ba1fa0f7edd7ca16e3c8447e444 Mon Sep 17 00:00:00 2001 From: Denise Schannon Date: Wed, 18 Jul 2018 13:33:49 -0700 Subject: [PATCH 15/84] k8s v1.11.1 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f4040d9..7317188 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM gcr.io/google_containers/hyperkube:v1.11.0 +FROM gcr.io/google_containers/hyperkube:v1.11.1 RUN clean-install apt-transport-https gnupg1 curl \ && echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ stretch main" > \ /etc/apt/sources.list.d/azure-cli.list \ From a5c3a3f96b2f77a8b00cf5c6fceb0c529d5276a7 Mon Sep 17 00:00:00 2001 From: Denise Schannon Date: Thu, 16 Aug 2018 15:29:32 -0700 Subject: [PATCH 16/84] k8s v1.11.2 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7317188..9135bdd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM gcr.io/google_containers/hyperkube:v1.11.1 +FROM gcr.io/google_containers/hyperkube:v1.11.2 RUN clean-install apt-transport-https gnupg1 curl \ && echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ stretch main" > \ /etc/apt/sources.list.d/azure-cli.list \ From 7a11ca0b8b3ab957cb226cbe8d5a420277eb418b Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Thu, 13 Sep 2018 22:11:42 -0700 Subject: [PATCH 17/84] k8s v1.11.3 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9135bdd..046911d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM gcr.io/google_containers/hyperkube:v1.11.2 +FROM gcr.io/google_containers/hyperkube:v1.11.3 RUN clean-install apt-transport-https gnupg1 curl \ && echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ stretch main" > \ /etc/apt/sources.list.d/azure-cli.list \ From e9d4d13aadc1bbe54faa32a98a9ec4669e598f06 Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Fri, 28 Sep 2018 15:47:44 -0700 Subject: [PATCH 18/84] k8s v1.12.0 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 046911d..5fc422e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM gcr.io/google_containers/hyperkube:v1.11.3 +FROM gcr.io/google_containers/hyperkube:v1.12.0 RUN clean-install apt-transport-https gnupg1 curl \ && echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ stretch main" > \ /etc/apt/sources.list.d/azure-cli.list \ From 0eff725a67a6214db0f5817f5274299cdff378b9 Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Fri, 5 Oct 2018 12:28:13 -0700 Subject: [PATCH 19/84] k8s v1.12.1 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5fc422e..45a5b4c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM gcr.io/google_containers/hyperkube:v1.12.0 +FROM gcr.io/google_containers/hyperkube:v1.12.1 RUN clean-install apt-transport-https gnupg1 curl \ && echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ stretch main" > \ /etc/apt/sources.list.d/azure-cli.list \ From 0759031ba3ebfcada6a17da62beaf83acba64ab6 Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Wed, 7 Nov 2018 12:44:13 -0800 Subject: [PATCH 20/84] k8s v1.12.2 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 45a5b4c..c1d951e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM gcr.io/google_containers/hyperkube:v1.12.1 +FROM gcr.io/google_containers/hyperkube:v1.12.2 RUN clean-install apt-transport-https gnupg1 curl \ && echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ stretch main" > \ /etc/apt/sources.list.d/azure-cli.list \ From f30dcfd95c29c2b3ccbcf5f741c6d5dbe62c0d37 Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Thu, 29 Nov 2018 11:40:00 -0800 Subject: [PATCH 21/84] k8s v1.12.2 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c1d951e..9e92776 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM gcr.io/google_containers/hyperkube:v1.12.2 +FROM gcr.io/google_containers/hyperkube:v1.12.3 RUN clean-install apt-transport-https gnupg1 curl \ && echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ stretch main" > \ /etc/apt/sources.list.d/azure-cli.list \ From 21a3c2976aba03d53367e6ab93d9becdcbacaffc Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Wed, 2 Jan 2019 17:05:49 -0800 Subject: [PATCH 22/84] k8s 1.12.4 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9e92776..7847d9f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM gcr.io/google_containers/hyperkube:v1.12.3 +FROM gcr.io/google_containers/hyperkube:v1.12.4 RUN clean-install apt-transport-https gnupg1 curl \ && echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ stretch main" > \ /etc/apt/sources.list.d/azure-cli.list \ From 84f4de0ae5f33423943539cee625e5b2b40717d1 Mon Sep 17 00:00:00 2001 From: galal-hussein Date: Mon, 7 Jan 2019 21:18:10 +0200 Subject: [PATCH 23/84] Add k8s version 1.13.1 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7847d9f..3588dcc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM gcr.io/google_containers/hyperkube:v1.12.4 +FROM gcr.io/google_containers/hyperkube:v1.13.1 RUN clean-install apt-transport-https gnupg1 curl \ && echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ stretch main" > \ /etc/apt/sources.list.d/azure-cli.list \ From 9aacf7017a6d8931c2f79ccb838dac85f1bb93d8 Mon Sep 17 00:00:00 2001 From: jianghang8421 Date: Tue, 8 Jan 2019 11:36:31 +0800 Subject: [PATCH 24/84] Add multiarch CICD support Add Dockerfile.arm64 file for arm64 docker image build. Add .drone-multiarch.yml file for drone-1.0 multiarch CICD --- .drone.yml | 72 ++++++++++++++++++++++++++++++++++++++++++------ Dockerfile.arm64 | 6 ++++ 2 files changed, 70 insertions(+), 8 deletions(-) create mode 100644 Dockerfile.arm64 diff --git a/.drone.yml b/.drone.yml index 7111caa..eff631c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,10 +1,66 @@ ---- -pipeline: - publish: +kind: pipeline +name: amd64 + +platform: + os: linux + arch: amd64 + +steps: + - name: publish-hyperkube-amd64 image: plugins/docker - dockerfile: Dockerfile - repo: rancher/hyperkube - tag: ${DRONE_TAG} - secrets: [docker_username, docker_password] + settings: + username: + from_secret: dockerhub_username + password: + from_secret: dockerhub_password + dockerfile: Dockerfile + repo: rancher/hyperkube + tag: "${DRONE_TAG}-amd64" + when: + event: + - tag +--- +kind: pipeline +name: arm64 + +platform: + os: linux + arch: arm64 + +steps: + - name: publish-hyperkube-arm64 + image: plugins/docker:linux-arm64 + settings: + username: + from_secret: dockerhub_username + password: + from_secret: dockerhub_password + dockerfile: Dockerfile.arm64 + repo: rancher/hyperkube + tag: "${DRONE_TAG}-arm64" + when: + event: + - tag +--- +kind: pipeline +name: manifest + +steps: + - name: push-manifest + image: plugins/manifest:1.0.2 + settings: + username: + from_secret: dockerhub_username + password: + from_secret: dockerhub_password + target: "rancher/hyperkube:${DRONE_TAG}" + template: "rancher/hyperkube:${DRONE_TAG}-ARCH" + platforms: + - linux/amd64 + - linux/arm64 when: - event: tag + event: + - tag +depends_on: +- amd64 +- arm64 diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 new file mode 100644 index 0000000..eafdc3f --- /dev/null +++ b/Dockerfile.arm64 @@ -0,0 +1,6 @@ +FROM gcr.io/google_containers/hyperkube-arm64:v1.13.1 +RUN clean-install apt-transport-https gnupg1 curl \ + && apt-get purge gnupg \ + && clean-install \ + xfsprogs \ + open-iscsi From bd97e03d348c5869ec43fcae10fe40d6bda26ee9 Mon Sep 17 00:00:00 2001 From: Bill Maxwell Date: Wed, 27 Feb 2019 12:08:22 -0700 Subject: [PATCH 25/84] update drone cred names --- .drone.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.drone.yml b/.drone.yml index eff631c..52e5942 100644 --- a/.drone.yml +++ b/.drone.yml @@ -10,9 +10,9 @@ steps: image: plugins/docker settings: username: - from_secret: dockerhub_username + from_secret: docker_username password: - from_secret: dockerhub_password + from_secret: docker_password dockerfile: Dockerfile repo: rancher/hyperkube tag: "${DRONE_TAG}-amd64" @@ -32,9 +32,9 @@ steps: image: plugins/docker:linux-arm64 settings: username: - from_secret: dockerhub_username + from_secret: docker_username password: - from_secret: dockerhub_password + from_secret: docker_password dockerfile: Dockerfile.arm64 repo: rancher/hyperkube tag: "${DRONE_TAG}-arm64" @@ -50,9 +50,9 @@ steps: image: plugins/manifest:1.0.2 settings: username: - from_secret: dockerhub_username + from_secret: docker_username password: - from_secret: dockerhub_password + from_secret: docker_password target: "rancher/hyperkube:${DRONE_TAG}" template: "rancher/hyperkube:${DRONE_TAG}-ARCH" platforms: From 4f928e1fbf1f2f74336edcd83c7ef0f254cc97e0 Mon Sep 17 00:00:00 2001 From: jianghang8421 Date: Wed, 27 Feb 2019 10:04:00 +0800 Subject: [PATCH 26/84] Add drone instance condition and modify the key of docker account --- .drone.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.drone.yml b/.drone.yml index 52e5942..b1655b3 100644 --- a/.drone.yml +++ b/.drone.yml @@ -17,6 +17,8 @@ steps: repo: rancher/hyperkube tag: "${DRONE_TAG}-amd64" when: + instance: + - drone-publish.rancher.io event: - tag --- @@ -39,6 +41,8 @@ steps: repo: rancher/hyperkube tag: "${DRONE_TAG}-arm64" when: + instance: + - drone-publish.rancher.io event: - tag --- @@ -59,6 +63,8 @@ steps: - linux/amd64 - linux/arm64 when: + instance: + - drone-publish.rancher.io event: - tag depends_on: From 230b3566c1832d0cb85756c37ba21a1ddfc64ada Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Thu, 28 Feb 2019 09:57:15 -0700 Subject: [PATCH 27/84] k8s 1.13.4 support --- Dockerfile | 2 +- Dockerfile.arm64 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3588dcc..3b133a6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM gcr.io/google_containers/hyperkube:v1.13.1 +FROM gcr.io/google_containers/hyperkube:v1.13.4 RUN clean-install apt-transport-https gnupg1 curl \ && echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ stretch main" > \ /etc/apt/sources.list.d/azure-cli.list \ diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index eafdc3f..8cc1090 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -1,4 +1,4 @@ -FROM gcr.io/google_containers/hyperkube-arm64:v1.13.1 +FROM gcr.io/google_containers/hyperkube-arm64:v1.13.4 RUN clean-install apt-transport-https gnupg1 curl \ && apt-get purge gnupg \ && clean-install \ From 349bc824b495dd94350fbd7fc2606029cf6fe0cc Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Tue, 26 Mar 2019 06:10:16 -0700 Subject: [PATCH 28/84] k8s 1.13.5 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3b133a6..ed45c82 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM gcr.io/google_containers/hyperkube:v1.13.4 +FROM gcr.io/google_containers/hyperkube:v1.13.5 RUN clean-install apt-transport-https gnupg1 curl \ && echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ stretch main" > \ /etc/apt/sources.list.d/azure-cli.list \ From 5a64f3a8616f53cfd43a1b75ccd8a39b30b94c3a Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Wed, 27 Mar 2019 09:55:21 -0700 Subject: [PATCH 29/84] k8s 1.14.0 --- Dockerfile | 2 +- Dockerfile.arm64 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index ed45c82..7ce4c86 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM gcr.io/google_containers/hyperkube:v1.13.5 +FROM gcr.io/google_containers/hyperkube:v1.14.0 RUN clean-install apt-transport-https gnupg1 curl \ && echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ stretch main" > \ /etc/apt/sources.list.d/azure-cli.list \ diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index 8cc1090..a1060bb 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -1,4 +1,4 @@ -FROM gcr.io/google_containers/hyperkube-arm64:v1.13.4 +FROM gcr.io/google_containers/hyperkube-arm64:v1.14.0 RUN clean-install apt-transport-https gnupg1 curl \ && apt-get purge gnupg \ && clean-install \ From a9d6bd5918a01e5e41b3344a4cd779745c0952a2 Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Mon, 8 Apr 2019 11:49:01 -0700 Subject: [PATCH 30/84] k8s 1.14.1 --- Dockerfile | 2 +- Dockerfile.arm64 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7ce4c86..3561d1a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM gcr.io/google_containers/hyperkube:v1.14.0 +FROM gcr.io/google_containers/hyperkube:v1.14.1 RUN clean-install apt-transport-https gnupg1 curl \ && echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ stretch main" > \ /etc/apt/sources.list.d/azure-cli.list \ diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index a1060bb..b1da37e 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -1,4 +1,4 @@ -FROM gcr.io/google_containers/hyperkube-arm64:v1.14.0 +FROM gcr.io/google_containers/hyperkube-arm64:v1.14.1 RUN clean-install apt-transport-https gnupg1 curl \ && apt-get purge gnupg \ && clean-install \ From 49def1d86511fb2c7aff63abfbea4a9ddd99cd69 Mon Sep 17 00:00:00 2001 From: Frank Mai Date: Tue, 16 Apr 2019 15:20:28 +0800 Subject: [PATCH 31/84] Patch Linux Drone pipelines with OS info --- .drone.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.drone.yml b/.drone.yml index b1655b3..83160a2 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,12 +1,12 @@ kind: pipeline -name: amd64 +name: linux-amd64 platform: os: linux arch: amd64 steps: - - name: publish-hyperkube-amd64 + - name: publish-hyperkube-linux-amd64 image: plugins/docker settings: username: @@ -15,7 +15,7 @@ steps: from_secret: docker_password dockerfile: Dockerfile repo: rancher/hyperkube - tag: "${DRONE_TAG}-amd64" + tag: "${DRONE_TAG}-linux-amd64" when: instance: - drone-publish.rancher.io @@ -23,15 +23,15 @@ steps: - tag --- kind: pipeline -name: arm64 +name: linux-arm64 platform: os: linux arch: arm64 steps: - - name: publish-hyperkube-arm64 - image: plugins/docker:linux-arm64 + - name: publish-hyperkube-linux-arm64 + image: plugins/docker settings: username: from_secret: docker_username @@ -39,7 +39,7 @@ steps: from_secret: docker_password dockerfile: Dockerfile.arm64 repo: rancher/hyperkube - tag: "${DRONE_TAG}-arm64" + tag: "${DRONE_TAG}-linux-arm64" when: instance: - drone-publish.rancher.io @@ -51,14 +51,14 @@ name: manifest steps: - name: push-manifest - image: plugins/manifest:1.0.2 + image: plugins/manifest:1.1.0 settings: username: from_secret: docker_username password: from_secret: docker_password target: "rancher/hyperkube:${DRONE_TAG}" - template: "rancher/hyperkube:${DRONE_TAG}-ARCH" + template: "rancher/hyperkube:${DRONE_TAG}-OS-ARCH" platforms: - linux/amd64 - linux/arm64 @@ -68,5 +68,5 @@ steps: event: - tag depends_on: -- amd64 -- arm64 +- linux-amd64 +- linux-arm64 From 0536c3d87e276afa36bc7ad8631fc63efedf9d39 Mon Sep 17 00:00:00 2001 From: Frank Mai Date: Wed, 17 Apr 2019 12:40:01 +0800 Subject: [PATCH 32/84] Add Windows 1809 Drone support --- .drone.yml | 43 ++++++++++++++++++++++++++++++----- Dockerfile.windows | 56 ++++++++++++++++++++++++++++++++++++++++++++++ manifest.tmpl | 23 +++++++++++++++++++ windows/copy.ps1 | 34 ++++++++++++++++++++++++++++ 4 files changed, 151 insertions(+), 5 deletions(-) create mode 100644 Dockerfile.windows create mode 100644 manifest.tmpl create mode 100644 windows/copy.ps1 diff --git a/.drone.yml b/.drone.yml index 83160a2..8287c48 100644 --- a/.drone.yml +++ b/.drone.yml @@ -47,6 +47,41 @@ steps: - tag --- kind: pipeline +name: windows-1809 + +platform: + os: windows + arch: amd64 + version: 1809 + +steps: + - name: publish-hyperkube-windows-1809 + image: plugins/docker + settings: + username: + from_secret: docker_username + password: + from_secret: docker_password + dockerfile: Dockerfile.windows + repo: rancher/hyperkube + tag: "${DRONE_TAG}-windows-1809" + build_args: + - SERVERCORE_VERSION=1809 + volumes: + - name: docker_pipe + path: \\\\.\\pipe\\docker_engine + when: + instance: + - drone-publish.rancher.io + event: + - tag + +volumes: + - name: docker_pipe + host: + path: \\\\.\\pipe\\docker_engine +--- +kind: pipeline name: manifest steps: @@ -57,11 +92,8 @@ steps: from_secret: docker_username password: from_secret: docker_password - target: "rancher/hyperkube:${DRONE_TAG}" - template: "rancher/hyperkube:${DRONE_TAG}-OS-ARCH" - platforms: - - linux/amd64 - - linux/arm64 + spec: manifest.tmpl + ignore_missing: true when: instance: - drone-publish.rancher.io @@ -70,3 +102,4 @@ steps: depends_on: - linux-amd64 - linux-arm64 +- windows-1809 diff --git a/Dockerfile.windows b/Dockerfile.windows new file mode 100644 index 0000000..1a5b051 --- /dev/null +++ b/Dockerfile.windows @@ -0,0 +1,56 @@ +ARG SERVERCORE_VERSION + +FROM mcr.microsoft.com/windows/servercore:${SERVERCORE_VERSION} as download +SHELL ["powershell", "-NoLogo", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] +RUN if (-not (Get-Command Expand-7Zip -ErrorAction Ignore)) { \ + Install-PackageProvider -Name NuGet -Force -Verbose; \ + Install-Module -Name 7Zip4Powershell -Repository PSGallery -Force -Verbose; \ + if(-not $?) { \ + Write-Error "Failed to install package"; \ + Exit 1; \ + } \ + } +ENV K8S_VERSION v1.14.1 +RUN $URL = ('https://dl.k8s.io/{0}/kubernetes-node-windows-amd64.tar.gz' -f $env:K8S_VERSION); \ + \ + function Expand-GZip ($inFile, $outFile) { \ + $input = New-Object System.IO.FileStream $inFile, ([IO.FileMode]::Open), ([IO.FileAccess]::Read), ([IO.FileShare]::Read); \ + $output = New-Object System.IO.FileStream $outFile, ([IO.FileMode]::Create), ([IO.FileAccess]::Write), ([IO.FileShare]::None); \ + $gzipStream = New-Object System.IO.Compression.GzipStream $input, ([IO.Compression.CompressionMode]::Decompress); \ + try { \ + if (!$input -or !$output -or !$gzipStream) { \ + Write-Error "Failed to Unzip the archive"; \ + Exit 1; \ + } \ + $buffer = New-Object byte[](1024); \ + while ($true) { \ + $read = $gzipstream.Read($buffer, 0, 1024); \ + if ($read -le 0 ) { \ + break; \ + } \ + $output.Write($buffer, 0, $read); \ + } \ + } finally { \ + $gzipStream.Close(); \ + $output.Close(); \ + $input.Close(); \ + } \ + }; \ + \ + Write-Host ('Downloading Kubernetes from {0} ...' -f $URL); \ + \ + [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ + Invoke-WebRequest -UseBasicParsing -OutFile c:\kubernetes.tar.gz -Uri $URL; \ + \ + Write-Host 'Expanding ...'; \ + \ + Expand-GZip c:\kubernetes.tar.gz c:\kubernetes.tar; \ + Expand-7Zip c:\kubernetes.tar c:\; \ + \ + Write-Host 'Complete.'; + +FROM mcr.microsoft.com/powershell:nanoserver-${SERVERCORE_VERSION} +COPY ["windows/*", "c:/Program Files/runtime/"] +COPY --from=download ["/kubernetes/node/bin/kubelet.exe", "/kubernetes/node/bin/kubectl.exe", "/kubernetes/node/bin/kube-proxy.exe", "c:/Program Files/kubernetes/bin/"] +WORKDIR "c:\\Program Files\\runtime" +CMD ["pwsh", "-f", "copy.ps1"] \ No newline at end of file diff --git a/manifest.tmpl b/manifest.tmpl new file mode 100644 index 0000000..54e9042 --- /dev/null +++ b/manifest.tmpl @@ -0,0 +1,23 @@ +image: rancher/hyperkube:{{build.tag}} +manifests: + - + image: rancher/hyperkube:{{build.tag}}-linux-amd64 + platform: + architecture: amd64 + os: linux + - + image: rancher/hyperkube:{{build.tag}}-linux-arm64 + platform: + architecture: arm64 + os: linux + - + image: rancher/hyperkube:{{build.tag}}-linux-arm + platform: + architecture: arm + os: linux + - + image: rancher/hyperkube:{{build.tag}}-windows-1809 + platform: + architecture: amd64 + os: windows + version: 1809 \ No newline at end of file diff --git a/windows/copy.ps1 b/windows/copy.ps1 new file mode 100644 index 0000000..c7af301 --- /dev/null +++ b/windows/copy.ps1 @@ -0,0 +1,34 @@ +$ErrorActionPreference = "Stop" + +function checkAndCopy($srcBinPath, $dstBinPath) { + if (Test-Path $dstBinPath) { + $dstBinHasher = Get-FileHash -Path $dstBinPath + $srcBinHasher = Get-FileHash -Path $srcBinPath + if ($dstBinHasher.Hash -ne $srcBinHasher.Hash) { + $null = Copy-Item -Force -Path $srcBinPath -Destination $dstBinPath + } + } else { + $null = Copy-Item -Force -Path $srcBinPath -Destination $dstBinPath + } +} + +if (-not (Test-Path "C:\kubernetes")) { + throw "Cannot find `"C:\kubernetes`" to load the Kubernetes binaries." +} + +$dstBinDir = "C:\kubernetes\bin" +$null = New-Item -Type Directory -Path $dstBinDir -ErrorAction Ignore + +try { + $srcBinDir = "$env:ProgramFiles\kubernetes\bin" + + checkAndCopy "$srcBinDir\kubelet.exe" "$dstBinDir\kubelet.exe" + checkAndCopy "$srcBinDir\kube-proxy.exe" "$dstBinDir\kube-proxy.exe" + checkAndCopy "$srcBinDir\kubectl.exe" "$dstBinDir\kubectl.exe" +} catch { + try { + $null = New-Item -Type File -Path "$dstBinDir\need_clean.tip" -ErrorAction Ignore + } catch {} + + throw $_ +} \ No newline at end of file From 867c65208ee86e3412f8359a6710547b0523a64e Mon Sep 17 00:00:00 2001 From: Sascha Dewald Date: Sat, 13 Apr 2019 10:27:08 +0200 Subject: [PATCH 33/84] Add zfs-utils --- Dockerfile | 3 ++- Dockerfile.arm64 | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3561d1a..1192e75 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,6 @@ FROM gcr.io/google_containers/hyperkube:v1.14.1 -RUN clean-install apt-transport-https gnupg1 curl \ +RUN sed -i -e 's!\bmain\b!main contrib!g' /etc/apt/sources.list && \ + clean-install apt-transport-https gnupg1 curl zfsutils-linux \ && echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ stretch main" > \ /etc/apt/sources.list.d/azure-cli.list \ && curl -L https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \ diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index b1da37e..1e6362b 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -1,5 +1,6 @@ FROM gcr.io/google_containers/hyperkube-arm64:v1.14.1 -RUN clean-install apt-transport-https gnupg1 curl \ +RUN sed -i -e 's!\bmain\b!main contrib!g' /etc/apt/sources.list && \ + clean-install apt-transport-https gnupg1 curl zfsutils-linux \ && apt-get purge gnupg \ && clean-install \ xfsprogs \ From c5da50e996b51071c14ffe3a83bd0f4ab469b3e0 Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Tue, 11 Jun 2019 19:54:17 -0700 Subject: [PATCH 34/84] k8s 1.14.3 support --- Dockerfile | 2 +- Dockerfile.arm64 | 2 +- Dockerfile.windows | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1192e75..eba12e9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM gcr.io/google_containers/hyperkube:v1.14.1 +FROM gcr.io/google_containers/hyperkube:v1.14.3 RUN sed -i -e 's!\bmain\b!main contrib!g' /etc/apt/sources.list && \ clean-install apt-transport-https gnupg1 curl zfsutils-linux \ && echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ stretch main" > \ diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index 1e6362b..b1c4665 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -1,4 +1,4 @@ -FROM gcr.io/google_containers/hyperkube-arm64:v1.14.1 +FROM gcr.io/google_containers/hyperkube-arm64:v1.14.3 RUN sed -i -e 's!\bmain\b!main contrib!g' /etc/apt/sources.list && \ clean-install apt-transport-https gnupg1 curl zfsutils-linux \ && apt-get purge gnupg \ diff --git a/Dockerfile.windows b/Dockerfile.windows index 1a5b051..5715714 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -10,7 +10,7 @@ RUN if (-not (Get-Command Expand-7Zip -ErrorAction Ignore)) { \ Exit 1; \ } \ } -ENV K8S_VERSION v1.14.1 +ENV K8S_VERSION v1.14.3 RUN $URL = ('https://dl.k8s.io/{0}/kubernetes-node-windows-amd64.tar.gz' -f $env:K8S_VERSION); \ \ function Expand-GZip ($inFile, $outFile) { \ From 531aa9fa2102404085d28186e439886078bc7706 Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Wed, 19 Jun 2019 13:32:22 -0700 Subject: [PATCH 35/84] k8s 1.15.0 --- Dockerfile | 2 +- Dockerfile.arm64 | 2 +- Dockerfile.windows | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index eba12e9..53c46a0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM gcr.io/google_containers/hyperkube:v1.14.3 +FROM gcr.io/google_containers/hyperkube:v1.15.0 RUN sed -i -e 's!\bmain\b!main contrib!g' /etc/apt/sources.list && \ clean-install apt-transport-https gnupg1 curl zfsutils-linux \ && echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ stretch main" > \ diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index b1c4665..1fadaa3 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -1,4 +1,4 @@ -FROM gcr.io/google_containers/hyperkube-arm64:v1.14.3 +FROM gcr.io/google_containers/hyperkube-arm64:v1.15.0 RUN sed -i -e 's!\bmain\b!main contrib!g' /etc/apt/sources.list && \ clean-install apt-transport-https gnupg1 curl zfsutils-linux \ && apt-get purge gnupg \ diff --git a/Dockerfile.windows b/Dockerfile.windows index 5715714..2c0ca23 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -10,7 +10,7 @@ RUN if (-not (Get-Command Expand-7Zip -ErrorAction Ignore)) { \ Exit 1; \ } \ } -ENV K8S_VERSION v1.14.3 +ENV K8S_VERSION v1.15.0 RUN $URL = ('https://dl.k8s.io/{0}/kubernetes-node-windows-amd64.tar.gz' -f $env:K8S_VERSION); \ \ function Expand-GZip ($inFile, $outFile) { \ From 1a73745cb83c8e03d4ddeadfccbde0c25ac006d5 Mon Sep 17 00:00:00 2001 From: galal-hussein Date: Wed, 31 Jul 2019 21:59:59 +0200 Subject: [PATCH 36/84] Add hyperkube 1.16 --- Dockerfile | 2 +- Dockerfile.arm64 | 2 +- Dockerfile.windows | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 53c46a0..c03d267 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM gcr.io/google_containers/hyperkube:v1.15.0 +FROM gcr.io/google_containers/hyperkube:v1.16.0-alpha.2 RUN sed -i -e 's!\bmain\b!main contrib!g' /etc/apt/sources.list && \ clean-install apt-transport-https gnupg1 curl zfsutils-linux \ && echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ stretch main" > \ diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index 1fadaa3..20a212e 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -1,4 +1,4 @@ -FROM gcr.io/google_containers/hyperkube-arm64:v1.15.0 +FROM gcr.io/google_containers/hyperkube-arm64:v1.16.0-alpha.2 RUN sed -i -e 's!\bmain\b!main contrib!g' /etc/apt/sources.list && \ clean-install apt-transport-https gnupg1 curl zfsutils-linux \ && apt-get purge gnupg \ diff --git a/Dockerfile.windows b/Dockerfile.windows index 2c0ca23..6657598 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -10,7 +10,7 @@ RUN if (-not (Get-Command Expand-7Zip -ErrorAction Ignore)) { \ Exit 1; \ } \ } -ENV K8S_VERSION v1.15.0 +ENV K8S_VERSION v1.16.0-alpha.2 RUN $URL = ('https://dl.k8s.io/{0}/kubernetes-node-windows-amd64.tar.gz' -f $env:K8S_VERSION); \ \ function Expand-GZip ($inFile, $outFile) { \ @@ -53,4 +53,4 @@ FROM mcr.microsoft.com/powershell:nanoserver-${SERVERCORE_VERSION} COPY ["windows/*", "c:/Program Files/runtime/"] COPY --from=download ["/kubernetes/node/bin/kubelet.exe", "/kubernetes/node/bin/kubectl.exe", "/kubernetes/node/bin/kube-proxy.exe", "c:/Program Files/kubernetes/bin/"] WORKDIR "c:\\Program Files\\runtime" -CMD ["pwsh", "-f", "copy.ps1"] \ No newline at end of file +CMD ["pwsh", "-f", "copy.ps1"] From c095cd1fe38b96a7ee593af6a7733162a6f785e4 Mon Sep 17 00:00:00 2001 From: Frank Mai Date: Fri, 16 Aug 2019 08:06:25 +0800 Subject: [PATCH 37/84] Windows refactor - Store the Kubernetes execution binary - Keep the same behavior like Linux: bootstrapping script will be stored in sidekick image - Support 1903 **Issue:** https://github.com/rancher/rancher/issues/16460 --- .drone.yml | 37 +++++++++++++ Dockerfile.windows | 15 +++--- manifest.tmpl | 8 ++- windows/copy.ps1 | 34 ------------ windows/entrypoint.ps1 | 115 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 166 insertions(+), 43 deletions(-) delete mode 100644 windows/copy.ps1 create mode 100644 windows/entrypoint.ps1 diff --git a/.drone.yml b/.drone.yml index 8287c48..80848f5 100644 --- a/.drone.yml +++ b/.drone.yml @@ -76,6 +76,41 @@ steps: 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-hyperkube-windows-1903 + image: plugins/docker + settings: + username: + from_secret: docker_username + password: + from_secret: docker_password + dockerfile: Dockerfile.windows + repo: rancher/hyperkube + tag: "${DRONE_TAG}-windows-1903" + build_args: + - SERVERCORE_VERSION=1903 + volumes: + - name: docker_pipe + path: \\\\.\\pipe\\docker_engine + when: + instance: + - drone-publish.rancher.io + event: + - tag + volumes: - name: docker_pipe host: @@ -103,3 +138,5 @@ depends_on: - linux-amd64 - linux-arm64 - windows-1809 +- windows-1903 + diff --git a/Dockerfile.windows b/Dockerfile.windows index 6657598..093ee63 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -1,6 +1,6 @@ ARG SERVERCORE_VERSION -FROM mcr.microsoft.com/windows/servercore:${SERVERCORE_VERSION} as download +FROM mcr.microsoft.com/windows/servercore:${SERVERCORE_VERSION} as builder SHELL ["powershell", "-NoLogo", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] RUN if (-not (Get-Command Expand-7Zip -ErrorAction Ignore)) { \ Install-PackageProvider -Name NuGet -Force -Verbose; \ @@ -38,19 +38,18 @@ RUN $URL = ('https://dl.k8s.io/{0}/kubernetes-node-windows-amd64.tar.gz' -f $env }; \ \ Write-Host ('Downloading Kubernetes from {0} ...' -f $URL); \ - \ [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ Invoke-WebRequest -UseBasicParsing -OutFile c:\kubernetes.tar.gz -Uri $URL; \ \ Write-Host 'Expanding ...'; \ - \ Expand-GZip c:\kubernetes.tar.gz c:\kubernetes.tar; \ Expand-7Zip c:\kubernetes.tar c:\; \ \ - Write-Host 'Complete.'; + Write-Host 'Complete.' FROM mcr.microsoft.com/powershell:nanoserver-${SERVERCORE_VERSION} -COPY ["windows/*", "c:/Program Files/runtime/"] -COPY --from=download ["/kubernetes/node/bin/kubelet.exe", "/kubernetes/node/bin/kubectl.exe", "/kubernetes/node/bin/kube-proxy.exe", "c:/Program Files/kubernetes/bin/"] -WORKDIR "c:\\Program Files\\runtime" -CMD ["pwsh", "-f", "copy.ps1"] +USER ContainerAdministrator +COPY --from=builder /Windows/System32/netapi32.dll /Windows/System32/ +COPY --from=builder /kubernetes/node/bin/kubectl.exe /Windows +COPY --from=builder /kubernetes/node/bin/kubelet.exe /kubernetes/node/bin/kube-proxy.exe /etc/kubernetes/bin/ +COPY windows/entrypoint.ps1 /usr/bin/ diff --git a/manifest.tmpl b/manifest.tmpl index 54e9042..f3cf6d9 100644 --- a/manifest.tmpl +++ b/manifest.tmpl @@ -20,4 +20,10 @@ manifests: platform: architecture: amd64 os: windows - version: 1809 \ No newline at end of file + version: 1809 + - + image: rancher/hyperkube:{{build.tag}}-windows-1903 + platform: + architecture: amd64 + os: windows + version: 1903 \ No newline at end of file diff --git a/windows/copy.ps1 b/windows/copy.ps1 deleted file mode 100644 index c7af301..0000000 --- a/windows/copy.ps1 +++ /dev/null @@ -1,34 +0,0 @@ -$ErrorActionPreference = "Stop" - -function checkAndCopy($srcBinPath, $dstBinPath) { - if (Test-Path $dstBinPath) { - $dstBinHasher = Get-FileHash -Path $dstBinPath - $srcBinHasher = Get-FileHash -Path $srcBinPath - if ($dstBinHasher.Hash -ne $srcBinHasher.Hash) { - $null = Copy-Item -Force -Path $srcBinPath -Destination $dstBinPath - } - } else { - $null = Copy-Item -Force -Path $srcBinPath -Destination $dstBinPath - } -} - -if (-not (Test-Path "C:\kubernetes")) { - throw "Cannot find `"C:\kubernetes`" to load the Kubernetes binaries." -} - -$dstBinDir = "C:\kubernetes\bin" -$null = New-Item -Type Directory -Path $dstBinDir -ErrorAction Ignore - -try { - $srcBinDir = "$env:ProgramFiles\kubernetes\bin" - - checkAndCopy "$srcBinDir\kubelet.exe" "$dstBinDir\kubelet.exe" - checkAndCopy "$srcBinDir\kube-proxy.exe" "$dstBinDir\kube-proxy.exe" - checkAndCopy "$srcBinDir\kubectl.exe" "$dstBinDir\kubectl.exe" -} catch { - try { - $null = New-Item -Type File -Path "$dstBinDir\need_clean.tip" -ErrorAction Ignore - } catch {} - - throw $_ -} \ No newline at end of file diff --git a/windows/entrypoint.ps1 b/windows/entrypoint.ps1 new file mode 100644 index 0000000..0bb029d --- /dev/null +++ b/windows/entrypoint.ps1 @@ -0,0 +1,115 @@ +<# + watch the sentinel `c:\opt\rke-tools\entrypoint.ps1` is ready or not +#> + +$ErrorActionPreference = 'Stop' +$WarningPreference = 'SilentlyContinue' +$VerbosePreference = 'SilentlyContinue' +$DebugPreference = 'SilentlyContinue' +$InformationPreference = 'SilentlyContinue' + +function Log-Info +{ + Write-Host -NoNewline -ForegroundColor Blue "INFO: " + Write-Host -ForegroundColor Gray ("{0,-44}" -f ($args -join " ")) +} + +function Log-Fatal +{ + Write-Host -NoNewline -ForegroundColor DarkRed "FATA: " + Write-Host -ForegroundColor Gray ("{0,-44}" -f ($args -join " ")) + + exit 1 +} + +function Wait-Ready +{ + param( + [parameter(Mandatory = $true)] $Path + ) + + $count = 600 + while ($count -gt 0) + { + Start-Sleep -s 1 + + if (Test-Path $Path -ErrorAction Ignore) + { + Start-Sleep -s 5 + break + } + + Start-Sleep -s 1 + $count -= 1 + } + + if ($count -le 0) + { + Log-Fatal "Timeout, could not found $Path" + } +} + +function Fix-LegacyArgument +{ + param ( + [parameter(Mandatory = $false)] [string[]]$ArgumentList + ) + + $argList = @() + $legacy = $null + for ($i = $ArgumentList.Length; $i -ge 0; $i--) { + $arg = $ArgumentList[$i] + switch -regex ($arg) + { + "^-{2}.*" { + if ($legacy) { + $arg = '{0}:{1}' -f $arg, $legacy + $legacy = $null + } + $argList += $arg + } + default { + $legacy = $arg + } + } + } + + return $argList +} + +function Run-PowerShell +{ + param ( + [parameter(Mandatory = $false)] [string[]]$ArgumentList + ) + + try { + if ($ArgumentList) { + Start-Process -NoNewWindow -Wait -FilePath "powershell" -ArgumentList $ArgumentList + } else { + Start-Process -NoNewWindow -Wait -FilePath "powershell" + } + } catch { + $errMsg = $_.Exception.Message + if ($errMsg -like "*This command cannot be run due to the error: *") { + if ($ArgumentList) { + Start-Process -NoNewWindow -Wait -FilePath "pwsh" -ArgumentList $ArgumentList + } else { + Start-Process -NoNewWindow -Wait -FilePath "pwsh" + } + } else { + throw $_ + } + } +} + +# the bootstrap arguments for kubernetes components are formatted by `component-name --key1=val1 --key2=val2 ...`, +# when passing `--pod-infra-container-image=rancher/kubelet-pause:v0.1.2` via windows docker, +# powershell would recognize it as `--pod-infra-container-image=rancher/kubelet-pause` and `v0.0.2` +$argList = Fix-LegacyArgument -ArgumentList $args[1..$args.Length] + +# waiting for the sentinel ready, which provided by servcie-sidekick +Log-Info "Waiting for servcie-sidekick to prepare the entrypoint.ps1 ..." +Wait-Ready -Path "c:\opt\rke-tools\entrypoint.ps1" +$entryArgs = @("-NoLogo", "-NonInteractive", "-File", "c:\opt\rke-tools\entrypoint.ps1", $args[0]) + $argList +Run-PowerShell -ArgumentList $entryArgs From 73201ec4cc7a24620ffaabcda8e433a89d8bd2ca Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Wed, 21 Aug 2019 11:12:55 -0700 Subject: [PATCH 38/84] k8s v1.16.0-beta.1 --- Dockerfile | 2 +- Dockerfile.arm64 | 2 +- Dockerfile.windows | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index c03d267..7e6808c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM gcr.io/google_containers/hyperkube:v1.16.0-alpha.2 +FROM gcr.io/google_containers/hyperkube:v1.16.0-beta.1 RUN sed -i -e 's!\bmain\b!main contrib!g' /etc/apt/sources.list && \ clean-install apt-transport-https gnupg1 curl zfsutils-linux \ && echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ stretch main" > \ diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index 20a212e..287ff90 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -1,4 +1,4 @@ -FROM gcr.io/google_containers/hyperkube-arm64:v1.16.0-alpha.2 +FROM gcr.io/google_containers/hyperkube-arm64:v1.16.0-beta.1 RUN sed -i -e 's!\bmain\b!main contrib!g' /etc/apt/sources.list && \ clean-install apt-transport-https gnupg1 curl zfsutils-linux \ && apt-get purge gnupg \ diff --git a/Dockerfile.windows b/Dockerfile.windows index 093ee63..04b192d 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -10,7 +10,7 @@ RUN if (-not (Get-Command Expand-7Zip -ErrorAction Ignore)) { \ Exit 1; \ } \ } -ENV K8S_VERSION v1.16.0-alpha.2 +ENV K8S_VERSION v1.16.0-beta.1 RUN $URL = ('https://dl.k8s.io/{0}/kubernetes-node-windows-amd64.tar.gz' -f $env:K8S_VERSION); \ \ function Expand-GZip ($inFile, $outFile) { \ From 51d6b009e6a0735042e9edfa65082d87aa2ce66c Mon Sep 17 00:00:00 2001 From: Frank Mai Date: Sun, 25 Aug 2019 21:05:25 +0800 Subject: [PATCH 39/84] Download Azure client on Windows --- Dockerfile.windows | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Dockerfile.windows b/Dockerfile.windows index 04b192d..eb65662 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -49,6 +49,18 @@ RUN $URL = ('https://dl.k8s.io/{0}/kubernetes-node-windows-amd64.tar.gz' -f $env FROM mcr.microsoft.com/powershell:nanoserver-${SERVERCORE_VERSION} USER ContainerAdministrator +SHELL ["pwsh.exe", "-NoLogo", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] +RUN $URL = 'https://github.com/thxCode/rancher-azure-cli/releases/download/v2.0.69/azure-cli.zip'; \ + \ + Write-Host ('Downloading azure-cli from {0} ...' -f $URL); \ + [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ + Invoke-WebRequest -UseBasicParsing -OutFile c:\azure-cli.zip -Uri $URL; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive -Force -Path c:\azure-cli.zip -DestinationPath c:\azure-cli; \ + Remove-Item -Force -Path c:\azure-cli.zip; \ + \ + Write-Host 'Complete.' COPY --from=builder /Windows/System32/netapi32.dll /Windows/System32/ COPY --from=builder /kubernetes/node/bin/kubectl.exe /Windows COPY --from=builder /kubernetes/node/bin/kubelet.exe /kubernetes/node/bin/kube-proxy.exe /etc/kubernetes/bin/ From 07dea3903ffd351663d489462b8d99d29102cfc2 Mon Sep 17 00:00:00 2001 From: loganhz Date: Wed, 28 Aug 2019 13:04:26 +0800 Subject: [PATCH 40/84] Update azure cli download url --- Dockerfile.windows | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.windows b/Dockerfile.windows index eb65662..890b083 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -50,7 +50,7 @@ RUN $URL = ('https://dl.k8s.io/{0}/kubernetes-node-windows-amd64.tar.gz' -f $env FROM mcr.microsoft.com/powershell:nanoserver-${SERVERCORE_VERSION} USER ContainerAdministrator SHELL ["pwsh.exe", "-NoLogo", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -RUN $URL = 'https://github.com/thxCode/rancher-azure-cli/releases/download/v2.0.69/azure-cli.zip'; \ +RUN $URL = 'https://github.com/rancher/azure-cli/releases/download/v0.0.2/dist.azure-cli.zip'; \ \ Write-Host ('Downloading azure-cli from {0} ...' -f $URL); \ [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ From 1c8e60a66d58a1585db7943b69de752235b93f00 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Steenis Date: Thu, 12 Sep 2019 23:39:04 +0200 Subject: [PATCH 41/84] k8s v1.16.0-rc.1 --- Dockerfile | 2 +- Dockerfile.arm64 | 2 +- Dockerfile.windows | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7e6808c..af96784 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM gcr.io/google_containers/hyperkube:v1.16.0-beta.1 +FROM gcr.io/google_containers/hyperkube:v1.16.0-rc.1 RUN sed -i -e 's!\bmain\b!main contrib!g' /etc/apt/sources.list && \ clean-install apt-transport-https gnupg1 curl zfsutils-linux \ && echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ stretch main" > \ diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index 287ff90..ce52679 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -1,4 +1,4 @@ -FROM gcr.io/google_containers/hyperkube-arm64:v1.16.0-beta.1 +FROM gcr.io/google_containers/hyperkube-arm64:v1.16.0-rc.1 RUN sed -i -e 's!\bmain\b!main contrib!g' /etc/apt/sources.list && \ clean-install apt-transport-https gnupg1 curl zfsutils-linux \ && apt-get purge gnupg \ diff --git a/Dockerfile.windows b/Dockerfile.windows index 890b083..01a1c97 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -10,7 +10,7 @@ RUN if (-not (Get-Command Expand-7Zip -ErrorAction Ignore)) { \ Exit 1; \ } \ } -ENV K8S_VERSION v1.16.0-beta.1 +ENV K8S_VERSION v1.16.0-rc.1 RUN $URL = ('https://dl.k8s.io/{0}/kubernetes-node-windows-amd64.tar.gz' -f $env:K8S_VERSION); \ \ function Expand-GZip ($inFile, $outFile) { \ From b3b1292056d2776f68b01743c9ce9893709755f0 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Steenis Date: Fri, 13 Sep 2019 19:14:19 +0200 Subject: [PATCH 42/84] k8s v1.16.0-rc.2 --- Dockerfile | 2 +- Dockerfile.arm64 | 2 +- Dockerfile.windows | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index af96784..49b79d9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM gcr.io/google_containers/hyperkube:v1.16.0-rc.1 +FROM gcr.io/google_containers/hyperkube:v1.16.0-rc.2 RUN sed -i -e 's!\bmain\b!main contrib!g' /etc/apt/sources.list && \ clean-install apt-transport-https gnupg1 curl zfsutils-linux \ && echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ stretch main" > \ diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index ce52679..998283b 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -1,4 +1,4 @@ -FROM gcr.io/google_containers/hyperkube-arm64:v1.16.0-rc.1 +FROM gcr.io/google_containers/hyperkube-arm64:v1.16.0-rc.2 RUN sed -i -e 's!\bmain\b!main contrib!g' /etc/apt/sources.list && \ clean-install apt-transport-https gnupg1 curl zfsutils-linux \ && apt-get purge gnupg \ diff --git a/Dockerfile.windows b/Dockerfile.windows index 01a1c97..e906d2d 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -10,7 +10,7 @@ RUN if (-not (Get-Command Expand-7Zip -ErrorAction Ignore)) { \ Exit 1; \ } \ } -ENV K8S_VERSION v1.16.0-rc.1 +ENV K8S_VERSION v1.16.0-rc.2 RUN $URL = ('https://dl.k8s.io/{0}/kubernetes-node-windows-amd64.tar.gz' -f $env:K8S_VERSION); \ \ function Expand-GZip ($inFile, $outFile) { \ From 874a77c226011244d6babfd81259ab38ab9392dd Mon Sep 17 00:00:00 2001 From: Sebastiaan van Steenis Date: Wed, 18 Sep 2019 18:00:45 +0200 Subject: [PATCH 43/84] k8s v1.16.0 --- Dockerfile | 2 +- Dockerfile.arm64 | 2 +- Dockerfile.windows | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 49b79d9..bbd66bc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM gcr.io/google_containers/hyperkube:v1.16.0-rc.2 +FROM gcr.io/google_containers/hyperkube:v1.16.0 RUN sed -i -e 's!\bmain\b!main contrib!g' /etc/apt/sources.list && \ clean-install apt-transport-https gnupg1 curl zfsutils-linux \ && echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ stretch main" > \ diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index 998283b..f03bf69 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -1,4 +1,4 @@ -FROM gcr.io/google_containers/hyperkube-arm64:v1.16.0-rc.2 +FROM gcr.io/google_containers/hyperkube-arm64:v1.16.0 RUN sed -i -e 's!\bmain\b!main contrib!g' /etc/apt/sources.list && \ clean-install apt-transport-https gnupg1 curl zfsutils-linux \ && apt-get purge gnupg \ diff --git a/Dockerfile.windows b/Dockerfile.windows index e906d2d..624a094 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -10,7 +10,7 @@ RUN if (-not (Get-Command Expand-7Zip -ErrorAction Ignore)) { \ Exit 1; \ } \ } -ENV K8S_VERSION v1.16.0-rc.2 +ENV K8S_VERSION v1.16.0 RUN $URL = ('https://dl.k8s.io/{0}/kubernetes-node-windows-amd64.tar.gz' -f $env:K8S_VERSION); \ \ function Expand-GZip ($inFile, $outFile) { \ From bed09e112e7d5e2c40e77057b3ba831d4eb6d2d3 Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Wed, 2 Oct 2019 14:26:07 -0700 Subject: [PATCH 44/84] k8s 1.16.1 --- Dockerfile | 2 +- Dockerfile.arm64 | 2 +- Dockerfile.windows | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index bbd66bc..8ae67da 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM gcr.io/google_containers/hyperkube:v1.16.0 +FROM gcr.io/google_containers/hyperkube:v1.16.1 RUN sed -i -e 's!\bmain\b!main contrib!g' /etc/apt/sources.list && \ clean-install apt-transport-https gnupg1 curl zfsutils-linux \ && echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ stretch main" > \ diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index f03bf69..7f2b767 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -1,4 +1,4 @@ -FROM gcr.io/google_containers/hyperkube-arm64:v1.16.0 +FROM gcr.io/google_containers/hyperkube-arm64:v1.16.1 RUN sed -i -e 's!\bmain\b!main contrib!g' /etc/apt/sources.list && \ clean-install apt-transport-https gnupg1 curl zfsutils-linux \ && apt-get purge gnupg \ diff --git a/Dockerfile.windows b/Dockerfile.windows index 624a094..2ca2b10 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -10,7 +10,7 @@ RUN if (-not (Get-Command Expand-7Zip -ErrorAction Ignore)) { \ Exit 1; \ } \ } -ENV K8S_VERSION v1.16.0 +ENV K8S_VERSION v1.16.1 RUN $URL = ('https://dl.k8s.io/{0}/kubernetes-node-windows-amd64.tar.gz' -f $env:K8S_VERSION); \ \ function Expand-GZip ($inFile, $outFile) { \ From ea1159aeba671532206659fe6eb489fd4895e008 Mon Sep 17 00:00:00 2001 From: moelsayed Date: Thu, 3 Oct 2019 23:33:00 +0200 Subject: [PATCH 45/84] update to latest during build --- Dockerfile | 1 + Dockerfile.arm64 | 1 + 2 files changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 8ae67da..db77e61 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,6 @@ FROM gcr.io/google_containers/hyperkube:v1.16.1 RUN sed -i -e 's!\bmain\b!main contrib!g' /etc/apt/sources.list && \ + apt-get update && apt-get upgrade -y && apt-get clean && \ clean-install apt-transport-https gnupg1 curl zfsutils-linux \ && echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ stretch main" > \ /etc/apt/sources.list.d/azure-cli.list \ diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index 7f2b767..dfecba5 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -1,5 +1,6 @@ FROM gcr.io/google_containers/hyperkube-arm64:v1.16.1 RUN sed -i -e 's!\bmain\b!main contrib!g' /etc/apt/sources.list && \ + apt-get update && apt-get upgrade -y && apt-get clean && \ clean-install apt-transport-https gnupg1 curl zfsutils-linux \ && apt-get purge gnupg \ && clean-install \ From 68c8aa7e01aa4a5f079443729d4659840f86e1ea Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Tue, 15 Oct 2019 11:10:52 -0700 Subject: [PATCH 46/84] k8s 1.16.2 --- Dockerfile | 2 +- Dockerfile.arm64 | 2 +- Dockerfile.windows | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index db77e61..5f69859 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM gcr.io/google_containers/hyperkube:v1.16.1 +FROM gcr.io/google_containers/hyperkube:v1.16.2 RUN sed -i -e 's!\bmain\b!main contrib!g' /etc/apt/sources.list && \ apt-get update && apt-get upgrade -y && apt-get clean && \ clean-install apt-transport-https gnupg1 curl zfsutils-linux \ diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index dfecba5..7f59c2e 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -1,4 +1,4 @@ -FROM gcr.io/google_containers/hyperkube-arm64:v1.16.1 +FROM gcr.io/google_containers/hyperkube-arm64:v1.16.2 RUN sed -i -e 's!\bmain\b!main contrib!g' /etc/apt/sources.list && \ apt-get update && apt-get upgrade -y && apt-get clean && \ clean-install apt-transport-https gnupg1 curl zfsutils-linux \ diff --git a/Dockerfile.windows b/Dockerfile.windows index 2ca2b10..82ad9f0 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -10,7 +10,7 @@ RUN if (-not (Get-Command Expand-7Zip -ErrorAction Ignore)) { \ Exit 1; \ } \ } -ENV K8S_VERSION v1.16.1 +ENV K8S_VERSION v1.16.2 RUN $URL = ('https://dl.k8s.io/{0}/kubernetes-node-windows-amd64.tar.gz' -f $env:K8S_VERSION); \ \ function Expand-GZip ($inFile, $outFile) { \ From db88437e4543fd45ada388db192950423b681ee3 Mon Sep 17 00:00:00 2001 From: moelsayed Date: Tue, 8 Oct 2019 02:22:38 +0200 Subject: [PATCH 47/84] Install glusterfs client from stretch-backports --- Dockerfile | 6 +++++- Dockerfile.arm64 | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5f69859..d3f4dcc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,4 +9,8 @@ RUN sed -i -e 's!\bmain\b!main contrib!g' /etc/apt/sources.list && \ && clean-install \ xfsprogs \ open-iscsi \ - azure-cli \ + azure-cli + +RUN echo "deb http://deb.debian.org/debian stretch-backports main" >> \ + /etc/apt/sources.list.d/backports.list \ + && clean-install -t stretch-backports glusterfs-client glusterfs-common diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index 7f59c2e..7469933 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -6,3 +6,7 @@ RUN sed -i -e 's!\bmain\b!main contrib!g' /etc/apt/sources.list && \ && clean-install \ xfsprogs \ open-iscsi + +RUN echo "deb http://deb.debian.org/debian stretch-backports main" >> \ + /etc/apt/sources.list.d/backports.list \ + && clean-install -t stretch-backports glusterfs-client glusterfs-common From 5ebfef51ddeea5d6b0b2da6e677eda7b1971dbc4 Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Fri, 15 Nov 2019 10:50:21 -0800 Subject: [PATCH 48/84] k8s 1.16.3 support --- Dockerfile | 2 +- Dockerfile.arm64 | 2 +- Dockerfile.windows | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index d3f4dcc..3c3e6e4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM gcr.io/google_containers/hyperkube:v1.16.2 +FROM gcr.io/google_containers/hyperkube:v1.16.3 RUN sed -i -e 's!\bmain\b!main contrib!g' /etc/apt/sources.list && \ apt-get update && apt-get upgrade -y && apt-get clean && \ clean-install apt-transport-https gnupg1 curl zfsutils-linux \ diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index 7469933..5dab0e4 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -1,4 +1,4 @@ -FROM gcr.io/google_containers/hyperkube-arm64:v1.16.2 +FROM gcr.io/google_containers/hyperkube-arm64:v1.16.3 RUN sed -i -e 's!\bmain\b!main contrib!g' /etc/apt/sources.list && \ apt-get update && apt-get upgrade -y && apt-get clean && \ clean-install apt-transport-https gnupg1 curl zfsutils-linux \ diff --git a/Dockerfile.windows b/Dockerfile.windows index 82ad9f0..00939ef 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -10,7 +10,7 @@ RUN if (-not (Get-Command Expand-7Zip -ErrorAction Ignore)) { \ Exit 1; \ } \ } -ENV K8S_VERSION v1.16.2 +ENV K8S_VERSION v1.16.3 RUN $URL = ('https://dl.k8s.io/{0}/kubernetes-node-windows-amd64.tar.gz' -f $env:K8S_VERSION); \ \ function Expand-GZip ($inFile, $outFile) { \ From 656b911a2f1413702e5444489e32cca0a18fd770 Mon Sep 17 00:00:00 2001 From: Dan Ramich Date: Fri, 15 Nov 2019 14:09:46 -0700 Subject: [PATCH 49/84] hyperkube v1.17.0-alpha.1 --- Dockerfile | 2 +- Dockerfile.arm64 | 2 +- Dockerfile.windows | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3c3e6e4..4d3f0c0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM gcr.io/google_containers/hyperkube:v1.16.3 +FROM gcr.io/google_containers/hyperkube:v1.17.0-alpha.1 RUN sed -i -e 's!\bmain\b!main contrib!g' /etc/apt/sources.list && \ apt-get update && apt-get upgrade -y && apt-get clean && \ clean-install apt-transport-https gnupg1 curl zfsutils-linux \ diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index 5dab0e4..12b9920 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -1,4 +1,4 @@ -FROM gcr.io/google_containers/hyperkube-arm64:v1.16.3 +FROM gcr.io/google_containers/hyperkube:v1.17.0-alpha.1 RUN sed -i -e 's!\bmain\b!main contrib!g' /etc/apt/sources.list && \ apt-get update && apt-get upgrade -y && apt-get clean && \ clean-install apt-transport-https gnupg1 curl zfsutils-linux \ diff --git a/Dockerfile.windows b/Dockerfile.windows index 00939ef..ac04a75 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -10,7 +10,7 @@ RUN if (-not (Get-Command Expand-7Zip -ErrorAction Ignore)) { \ Exit 1; \ } \ } -ENV K8S_VERSION v1.16.3 +ENV K8S_VERSION v1.17.0-alpha.1 RUN $URL = ('https://dl.k8s.io/{0}/kubernetes-node-windows-amd64.tar.gz' -f $env:K8S_VERSION); \ \ function Expand-GZip ($inFile, $outFile) { \ From c80aacaef38e879f265166d37d00d9cdfd770bc1 Mon Sep 17 00:00:00 2001 From: Dan Ramich Date: Mon, 18 Nov 2019 15:39:30 -0700 Subject: [PATCH 50/84] Update to beta.2 --- Dockerfile | 2 +- Dockerfile.arm64 | 2 +- Dockerfile.windows | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4d3f0c0..97ae9b8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM gcr.io/google_containers/hyperkube:v1.17.0-alpha.1 +FROM gcr.io/google_containers/hyperkube:v1.17.0-beta.2 RUN sed -i -e 's!\bmain\b!main contrib!g' /etc/apt/sources.list && \ apt-get update && apt-get upgrade -y && apt-get clean && \ clean-install apt-transport-https gnupg1 curl zfsutils-linux \ diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index 12b9920..900d9f4 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -1,4 +1,4 @@ -FROM gcr.io/google_containers/hyperkube:v1.17.0-alpha.1 +FROM gcr.io/google_containers/hyperkube:v1.17.0-beta.2 RUN sed -i -e 's!\bmain\b!main contrib!g' /etc/apt/sources.list && \ apt-get update && apt-get upgrade -y && apt-get clean && \ clean-install apt-transport-https gnupg1 curl zfsutils-linux \ diff --git a/Dockerfile.windows b/Dockerfile.windows index ac04a75..596937b 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -10,7 +10,7 @@ RUN if (-not (Get-Command Expand-7Zip -ErrorAction Ignore)) { \ Exit 1; \ } \ } -ENV K8S_VERSION v1.17.0-alpha.1 +ENV K8S_VERSION v1.17.0-beta.2 RUN $URL = ('https://dl.k8s.io/{0}/kubernetes-node-windows-amd64.tar.gz' -f $env:K8S_VERSION); \ \ function Expand-GZip ($inFile, $outFile) { \ From cc3ff8d28813af42648dd7e59e975e49143bd267 Mon Sep 17 00:00:00 2001 From: Brenda Rearden Date: Mon, 9 Dec 2019 16:17:06 -0700 Subject: [PATCH 51/84] k8s v1.17.0 --- Dockerfile | 2 +- Dockerfile.arm64 | 2 +- Dockerfile.windows | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 97ae9b8..198653a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM gcr.io/google_containers/hyperkube:v1.17.0-beta.2 +FROM gcr.io/google_containers/hyperkube:v1.17.0 RUN sed -i -e 's!\bmain\b!main contrib!g' /etc/apt/sources.list && \ apt-get update && apt-get upgrade -y && apt-get clean && \ clean-install apt-transport-https gnupg1 curl zfsutils-linux \ diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index 900d9f4..0cf6b8c 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -1,4 +1,4 @@ -FROM gcr.io/google_containers/hyperkube:v1.17.0-beta.2 +FROM gcr.io/google_containers/hyperkube:v1.17.0 RUN sed -i -e 's!\bmain\b!main contrib!g' /etc/apt/sources.list && \ apt-get update && apt-get upgrade -y && apt-get clean && \ clean-install apt-transport-https gnupg1 curl zfsutils-linux \ diff --git a/Dockerfile.windows b/Dockerfile.windows index 596937b..adb8441 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -10,7 +10,7 @@ RUN if (-not (Get-Command Expand-7Zip -ErrorAction Ignore)) { \ Exit 1; \ } \ } -ENV K8S_VERSION v1.17.0-beta.2 +ENV K8S_VERSION v1.17.0 RUN $URL = ('https://dl.k8s.io/{0}/kubernetes-node-windows-amd64.tar.gz' -f $env:K8S_VERSION); \ \ function Expand-GZip ($inFile, $outFile) { \ From e3c753d7f6b79bdb6c2d3e9d64a9156e752ed122 Mon Sep 17 00:00:00 2001 From: Chris Kim Date: Tue, 21 Jan 2020 14:49:50 -0800 Subject: [PATCH 52/84] K8s v1.17.2 --- Dockerfile | 2 +- Dockerfile.arm64 | 2 +- Dockerfile.windows | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 198653a..bb02eda 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM gcr.io/google_containers/hyperkube:v1.17.0 +FROM gcr.io/google_containers/hyperkube:v1.17.2 RUN sed -i -e 's!\bmain\b!main contrib!g' /etc/apt/sources.list && \ apt-get update && apt-get upgrade -y && apt-get clean && \ clean-install apt-transport-https gnupg1 curl zfsutils-linux \ diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index 0cf6b8c..d13c51f 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -1,4 +1,4 @@ -FROM gcr.io/google_containers/hyperkube:v1.17.0 +FROM gcr.io/google_containers/hyperkube:v1.17.2 RUN sed -i -e 's!\bmain\b!main contrib!g' /etc/apt/sources.list && \ apt-get update && apt-get upgrade -y && apt-get clean && \ clean-install apt-transport-https gnupg1 curl zfsutils-linux \ diff --git a/Dockerfile.windows b/Dockerfile.windows index adb8441..39fa57e 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -10,7 +10,7 @@ RUN if (-not (Get-Command Expand-7Zip -ErrorAction Ignore)) { \ Exit 1; \ } \ } -ENV K8S_VERSION v1.17.0 +ENV K8S_VERSION v1.17.2 RUN $URL = ('https://dl.k8s.io/{0}/kubernetes-node-windows-amd64.tar.gz' -f $env:K8S_VERSION); \ \ function Expand-GZip ($inFile, $outFile) { \ From a8e889c2b1e55b171b355eef7a87240ce836634f Mon Sep 17 00:00:00 2001 From: Daishan Date: Fri, 21 Feb 2020 11:02:25 -0700 Subject: [PATCH 53/84] Update kubernete v1.18.0-beta.0 --- Dockerfile | 2 +- Dockerfile.arm64 | 2 +- Dockerfile.windows | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index bb02eda..4b118e7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM gcr.io/google_containers/hyperkube:v1.17.2 +FROM gcr.io/google_containers/hyperkube:v1.18.0-beta.0 RUN sed -i -e 's!\bmain\b!main contrib!g' /etc/apt/sources.list && \ apt-get update && apt-get upgrade -y && apt-get clean && \ clean-install apt-transport-https gnupg1 curl zfsutils-linux \ diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index d13c51f..77c2a88 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -1,4 +1,4 @@ -FROM gcr.io/google_containers/hyperkube:v1.17.2 +FROM gcr.io/google_containers/hyperkube:v1.18.0-beta.0 RUN sed -i -e 's!\bmain\b!main contrib!g' /etc/apt/sources.list && \ apt-get update && apt-get upgrade -y && apt-get clean && \ clean-install apt-transport-https gnupg1 curl zfsutils-linux \ diff --git a/Dockerfile.windows b/Dockerfile.windows index 39fa57e..91b71c3 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -10,7 +10,7 @@ RUN if (-not (Get-Command Expand-7Zip -ErrorAction Ignore)) { \ Exit 1; \ } \ } -ENV K8S_VERSION v1.17.2 +ENV K8S_VERSION v1.18.0-beta.0 RUN $URL = ('https://dl.k8s.io/{0}/kubernetes-node-windows-amd64.tar.gz' -f $env:K8S_VERSION); \ \ function Expand-GZip ($inFile, $outFile) { \ From 9c43be4175740a1a089d9487dccdb318ada687da Mon Sep 17 00:00:00 2001 From: Arvind Iyengar Date: Thu, 23 Apr 2020 20:12:02 -0700 Subject: [PATCH 54/84] Update kubernetes v1.18.2 --- Dockerfile | 2 +- Dockerfile.arm64 | 2 +- Dockerfile.windows | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4b118e7..75bc650 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM gcr.io/google_containers/hyperkube:v1.18.0-beta.0 +FROM gcr.io/google_containers/hyperkube:v1.18.2 RUN sed -i -e 's!\bmain\b!main contrib!g' /etc/apt/sources.list && \ apt-get update && apt-get upgrade -y && apt-get clean && \ clean-install apt-transport-https gnupg1 curl zfsutils-linux \ diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index 77c2a88..c2b0ef4 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -1,4 +1,4 @@ -FROM gcr.io/google_containers/hyperkube:v1.18.0-beta.0 +FROM gcr.io/google_containers/hyperkube:v1.18.2 RUN sed -i -e 's!\bmain\b!main contrib!g' /etc/apt/sources.list && \ apt-get update && apt-get upgrade -y && apt-get clean && \ clean-install apt-transport-https gnupg1 curl zfsutils-linux \ diff --git a/Dockerfile.windows b/Dockerfile.windows index 91b71c3..9f0c5ba 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -10,7 +10,7 @@ RUN if (-not (Get-Command Expand-7Zip -ErrorAction Ignore)) { \ Exit 1; \ } \ } -ENV K8S_VERSION v1.18.0-beta.0 +ENV K8S_VERSION v1.18.2 RUN $URL = ('https://dl.k8s.io/{0}/kubernetes-node-windows-amd64.tar.gz' -f $env:K8S_VERSION); \ \ function Expand-GZip ($inFile, $outFile) { \ From dbc01f9db41e938c1aa7fa1509973fec0423699d Mon Sep 17 00:00:00 2001 From: Arvind Iyengar Date: Wed, 20 May 2020 12:57:09 -0700 Subject: [PATCH 55/84] Update kubernetes v1.18.3 --- Dockerfile | 2 +- Dockerfile.arm64 | 2 +- Dockerfile.windows | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 75bc650..4ed0cd2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM gcr.io/google_containers/hyperkube:v1.18.2 +FROM gcr.io/google_containers/hyperkube:v1.18.3 RUN sed -i -e 's!\bmain\b!main contrib!g' /etc/apt/sources.list && \ apt-get update && apt-get upgrade -y && apt-get clean && \ clean-install apt-transport-https gnupg1 curl zfsutils-linux \ diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index c2b0ef4..6ff3a65 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -1,4 +1,4 @@ -FROM gcr.io/google_containers/hyperkube:v1.18.2 +FROM gcr.io/google_containers/hyperkube:v1.18.3 RUN sed -i -e 's!\bmain\b!main contrib!g' /etc/apt/sources.list && \ apt-get update && apt-get upgrade -y && apt-get clean && \ clean-install apt-transport-https gnupg1 curl zfsutils-linux \ diff --git a/Dockerfile.windows b/Dockerfile.windows index 9f0c5ba..aa493cf 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -10,7 +10,7 @@ RUN if (-not (Get-Command Expand-7Zip -ErrorAction Ignore)) { \ Exit 1; \ } \ } -ENV K8S_VERSION v1.18.2 +ENV K8S_VERSION v1.18.3 RUN $URL = ('https://dl.k8s.io/{0}/kubernetes-node-windows-amd64.tar.gz' -f $env:K8S_VERSION); \ \ function Expand-GZip ($inFile, $outFile) { \ From 0c0f2208882f300ff0c3c1857ed42d3b6e9bd2a9 Mon Sep 17 00:00:00 2001 From: Luther Date: Wed, 27 May 2020 14:27:34 -0700 Subject: [PATCH 56/84] adding windows 1909 --- .drone.yml | 40 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 37 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index 80848f5..4c745a7 100644 --- a/.drone.yml +++ b/.drone.yml @@ -111,6 +111,41 @@ steps: event: - tag +volumes: + - name: docker_pipe + host: + path: \\\\.\\pipe\\docker_engine +--- +kind: pipeline +name: windows-1909 + +platform: + os: windows + arch: amd64 + version: 1909 + +steps: + - name: publish-hyperkube-windows-1909 + image: plugins/docker + settings: + username: + from_secret: docker_username + password: + from_secret: docker_password + dockerfile: Dockerfile.windows + repo: rancher/hyperkube + tag: "${DRONE_TAG}-windows-1909" + build_args: + - SERVERCORE_VERSION=1909 + volumes: + - name: docker_pipe + path: \\\\.\\pipe\\docker_engine + when: + instance: + - drone-publish.rancher.io + event: + - tag + volumes: - name: docker_pipe host: @@ -121,14 +156,13 @@ name: manifest steps: - name: push-manifest - image: plugins/manifest:1.1.0 + image: ibuildthecloud/manifest:v1.2.3-patch1 settings: username: from_secret: docker_username password: from_secret: docker_password spec: manifest.tmpl - ignore_missing: true when: instance: - drone-publish.rancher.io @@ -139,4 +173,4 @@ depends_on: - linux-arm64 - windows-1809 - windows-1903 - +- windows-1909 \ No newline at end of file From e84ee072d87998bf1e9948cc3645fb7d0112717f Mon Sep 17 00:00:00 2001 From: Denise Schannon Date: Wed, 27 May 2020 17:22:09 -0700 Subject: [PATCH 57/84] Remove unnecessary arm build --- manifest.tmpl | 5 ----- 1 file changed, 5 deletions(-) diff --git a/manifest.tmpl b/manifest.tmpl index f3cf6d9..af592c4 100644 --- a/manifest.tmpl +++ b/manifest.tmpl @@ -10,11 +10,6 @@ manifests: platform: architecture: arm64 os: linux - - - image: rancher/hyperkube:{{build.tag}}-linux-arm - platform: - architecture: arm - os: linux - image: rancher/hyperkube:{{build.tag}}-windows-1809 platform: From d4bad0a6d622774c2557b090b40d372907a46a29 Mon Sep 17 00:00:00 2001 From: Denise Schannon Date: Wed, 27 May 2020 17:25:36 -0700 Subject: [PATCH 58/84] Add Windows 1909 into manifest.tmpl --- manifest.tmpl | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/manifest.tmpl b/manifest.tmpl index af592c4..1b805a8 100644 --- a/manifest.tmpl +++ b/manifest.tmpl @@ -21,4 +21,10 @@ manifests: platform: architecture: amd64 os: windows - version: 1903 \ No newline at end of file + version: 1903 + - + image: rancher/hyperkube:{{build.tag}}-windows-1909 + platform: + architecture: amd64 + os: windows + version: 1909 From 56bf4a5b911f87d2a677b6c714b924c8a1e55526 Mon Sep 17 00:00:00 2001 From: Ryan Sanna Date: Wed, 17 Jun 2020 14:17:40 -0700 Subject: [PATCH 59/84] update to k8s v1.18.4 --- Dockerfile | 2 +- Dockerfile.arm64 | 2 +- Dockerfile.windows | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4ed0cd2..0918e4f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM gcr.io/google_containers/hyperkube:v1.18.3 +FROM gcr.io/google_containers/hyperkube:v1.18.4 RUN sed -i -e 's!\bmain\b!main contrib!g' /etc/apt/sources.list && \ apt-get update && apt-get upgrade -y && apt-get clean && \ clean-install apt-transport-https gnupg1 curl zfsutils-linux \ diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index 6ff3a65..4002212 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -1,4 +1,4 @@ -FROM gcr.io/google_containers/hyperkube:v1.18.3 +FROM gcr.io/google_containers/hyperkube:v1.18.4 RUN sed -i -e 's!\bmain\b!main contrib!g' /etc/apt/sources.list && \ apt-get update && apt-get upgrade -y && apt-get clean && \ clean-install apt-transport-https gnupg1 curl zfsutils-linux \ diff --git a/Dockerfile.windows b/Dockerfile.windows index aa493cf..46aba42 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -10,7 +10,7 @@ RUN if (-not (Get-Command Expand-7Zip -ErrorAction Ignore)) { \ Exit 1; \ } \ } -ENV K8S_VERSION v1.18.3 +ENV K8S_VERSION v1.18.4 RUN $URL = ('https://dl.k8s.io/{0}/kubernetes-node-windows-amd64.tar.gz' -f $env:K8S_VERSION); \ \ function Expand-GZip ($inFile, $outFile) { \ From befd4801388fe6eeb5afec63858489583cfe2149 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Steenis Date: Thu, 18 Jun 2020 12:56:11 +0200 Subject: [PATCH 60/84] Update Dockerfiles for stretch -> buster change --- Dockerfile | 18 +++++++++++++----- Dockerfile.arm64 | 20 ++++++++++++++++---- 2 files changed, 29 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0918e4f..ec5170c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,15 +2,23 @@ FROM gcr.io/google_containers/hyperkube:v1.18.4 RUN sed -i -e 's!\bmain\b!main contrib!g' /etc/apt/sources.list && \ apt-get update && apt-get upgrade -y && apt-get clean && \ clean-install apt-transport-https gnupg1 curl zfsutils-linux \ - && echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ stretch main" > \ + && echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ buster main" > \ /etc/apt/sources.list.d/azure-cli.list \ && curl -L https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \ && apt-get purge gnupg \ && clean-install \ xfsprogs \ open-iscsi \ - azure-cli + azure-cli \ + iproute2 \ + iputils-ping \ + procps \ + glusterfs-client \ + glusterfs-common \ + samba-common \ + arptables -RUN echo "deb http://deb.debian.org/debian stretch-backports main" >> \ - /etc/apt/sources.list.d/backports.list \ - && clean-install -t stretch-backports glusterfs-client glusterfs-common +RUN update-alternatives --set iptables /usr/sbin/iptables-legacy && \ + update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy && \ + update-alternatives --set arptables /usr/sbin/arptables-legacy && \ + update-alternatives --set ebtables /usr/sbin/ebtables-legacy diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index 4002212..c4aa98a 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -2,11 +2,23 @@ FROM gcr.io/google_containers/hyperkube:v1.18.4 RUN sed -i -e 's!\bmain\b!main contrib!g' /etc/apt/sources.list && \ apt-get update && apt-get upgrade -y && apt-get clean && \ clean-install apt-transport-https gnupg1 curl zfsutils-linux \ + && echo "deb [arch=arm64] https://packages.microsoft.com/repos/azure-cli/ buster main" > \ + /etc/apt/sources.list.d/azure-cli.list \ + && curl -L https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \ && apt-get purge gnupg \ && clean-install \ xfsprogs \ - open-iscsi + open-iscsi \ + azure-cli \ + iproute2 \ + iputils-ping \ + procps \ + glusterfs-client \ + glusterfs-common \ + samba-common \ + arptables -RUN echo "deb http://deb.debian.org/debian stretch-backports main" >> \ - /etc/apt/sources.list.d/backports.list \ - && clean-install -t stretch-backports glusterfs-client glusterfs-common +RUN update-alternatives --set iptables /usr/sbin/iptables-legacy && \ + update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy && \ + update-alternatives --set arptables /usr/sbin/arptables-legacy && \ + update-alternatives --set ebtables /usr/sbin/ebtables-legacy From 73c0a04f76d425d4cfdc42e75b01fa088f9263a5 Mon Sep 17 00:00:00 2001 From: Ryan Sanna Date: Thu, 9 Jul 2020 12:31:23 -0700 Subject: [PATCH 61/84] version bumps from v1.18.4 to v1.18.5 --- Dockerfile | 2 +- Dockerfile.arm64 | 2 +- Dockerfile.windows | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index ec5170c..3654958 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM gcr.io/google_containers/hyperkube:v1.18.4 +FROM gcr.io/google_containers/hyperkube:v1.18.5 RUN sed -i -e 's!\bmain\b!main contrib!g' /etc/apt/sources.list && \ apt-get update && apt-get upgrade -y && apt-get clean && \ clean-install apt-transport-https gnupg1 curl zfsutils-linux \ diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index c4aa98a..83ef9af 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -1,4 +1,4 @@ -FROM gcr.io/google_containers/hyperkube:v1.18.4 +FROM gcr.io/google_containers/hyperkube:v1.18.5 RUN sed -i -e 's!\bmain\b!main contrib!g' /etc/apt/sources.list && \ apt-get update && apt-get upgrade -y && apt-get clean && \ clean-install apt-transport-https gnupg1 curl zfsutils-linux \ diff --git a/Dockerfile.windows b/Dockerfile.windows index 46aba42..a0a64e8 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -10,7 +10,7 @@ RUN if (-not (Get-Command Expand-7Zip -ErrorAction Ignore)) { \ Exit 1; \ } \ } -ENV K8S_VERSION v1.18.4 +ENV K8S_VERSION v1.18.5 RUN $URL = ('https://dl.k8s.io/{0}/kubernetes-node-windows-amd64.tar.gz' -f $env:K8S_VERSION); \ \ function Expand-GZip ($inFile, $outFile) { \ From cd827308a69fc4cd80e6588cd416999487f52307 Mon Sep 17 00:00:00 2001 From: Ryan Sanna Date: Thu, 9 Jul 2020 15:06:19 -0700 Subject: [PATCH 62/84] remove update-alternatives as new base image includes iptables-wrapper to determine mode --- Dockerfile | 5 ----- Dockerfile.arm64 | 5 ----- 2 files changed, 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3654958..2b17da7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,8 +17,3 @@ RUN sed -i -e 's!\bmain\b!main contrib!g' /etc/apt/sources.list && \ glusterfs-common \ samba-common \ arptables - -RUN update-alternatives --set iptables /usr/sbin/iptables-legacy && \ - update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy && \ - update-alternatives --set arptables /usr/sbin/arptables-legacy && \ - update-alternatives --set ebtables /usr/sbin/ebtables-legacy diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index 83ef9af..44fdfa7 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -17,8 +17,3 @@ RUN sed -i -e 's!\bmain\b!main contrib!g' /etc/apt/sources.list && \ glusterfs-common \ samba-common \ arptables - -RUN update-alternatives --set iptables /usr/sbin/iptables-legacy && \ - update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy && \ - update-alternatives --set arptables /usr/sbin/arptables-legacy && \ - update-alternatives --set ebtables /usr/sbin/ebtables-legacy From e74996b379cb9b1117e56ff5ec6d11cf6bd89f55 Mon Sep 17 00:00:00 2001 From: kinarashah Date: Wed, 15 Jul 2020 10:03:23 -0700 Subject: [PATCH 63/84] v1.18.6 --- Dockerfile | 2 +- Dockerfile.arm64 | 2 +- Dockerfile.windows | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2b17da7..65a255c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM gcr.io/google_containers/hyperkube:v1.18.5 +FROM gcr.io/google_containers/hyperkube:v1.18.6 RUN sed -i -e 's!\bmain\b!main contrib!g' /etc/apt/sources.list && \ apt-get update && apt-get upgrade -y && apt-get clean && \ clean-install apt-transport-https gnupg1 curl zfsutils-linux \ diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index 44fdfa7..180cdad 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -1,4 +1,4 @@ -FROM gcr.io/google_containers/hyperkube:v1.18.5 +FROM gcr.io/google_containers/hyperkube:v1.18.6 RUN sed -i -e 's!\bmain\b!main contrib!g' /etc/apt/sources.list && \ apt-get update && apt-get upgrade -y && apt-get clean && \ clean-install apt-transport-https gnupg1 curl zfsutils-linux \ diff --git a/Dockerfile.windows b/Dockerfile.windows index a0a64e8..a5e2641 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -10,7 +10,7 @@ RUN if (-not (Get-Command Expand-7Zip -ErrorAction Ignore)) { \ Exit 1; \ } \ } -ENV K8S_VERSION v1.18.5 +ENV K8S_VERSION v1.18.6 RUN $URL = ('https://dl.k8s.io/{0}/kubernetes-node-windows-amd64.tar.gz' -f $env:K8S_VERSION); \ \ function Expand-GZip ($inFile, $outFile) { \ From ed3775ab977de049f124502cec2b519416b60718 Mon Sep 17 00:00:00 2001 From: Chris Kim Date: Wed, 5 Aug 2020 14:46:04 -0700 Subject: [PATCH 64/84] Add Kubernetes 1.19.0-rc.4 Signed-off-by: Chris Kim --- .drone.yml | 24 +++++++++++++++++- .gitignore | 2 ++ Dockerfile | 22 +++-------------- Dockerfile.arm64 | 19 --------------- Dockerfile.windows | 2 +- Makefile | 61 ++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 90 insertions(+), 40 deletions(-) create mode 100644 .gitignore delete mode 100644 Dockerfile.arm64 create mode 100644 Makefile diff --git a/.drone.yml b/.drone.yml index 4c745a7..13d5971 100644 --- a/.drone.yml +++ b/.drone.yml @@ -6,6 +6,17 @@ platform: arch: amd64 steps: + - name: prepare-amd64-binaries + image: ubuntu:20.04 + commands: + - apt-get -y update && apt-get -y install make curl tar + - make k8s-binaries + when: + instance: + - drone-publish.rancher.io + event: + - tag + - name: publish-hyperkube-linux-amd64 image: plugins/docker settings: @@ -30,6 +41,17 @@ platform: arch: arm64 steps: + - name: prepare-arm64-binaries + image: ubuntu:20.04 + commands: + - apt-get -y update && apt-get -y install make curl tar + - make ARCH=arm64 k8s-binaries + when: + instance: + - drone-publish.rancher.io + event: + - tag + - name: publish-hyperkube-linux-arm64 image: plugins/docker settings: @@ -37,7 +59,7 @@ steps: from_secret: docker_username password: from_secret: docker_password - dockerfile: Dockerfile.arm64 + dockerfile: Dockerfile repo: rancher/hyperkube tag: "${DRONE_TAG}-linux-arm64" when: diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..8aee2bc --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +k8s-tars/ +k8s-binaries/ \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 65a255c..0ca4965 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,19 +1,3 @@ -FROM gcr.io/google_containers/hyperkube:v1.18.6 -RUN sed -i -e 's!\bmain\b!main contrib!g' /etc/apt/sources.list && \ - apt-get update && apt-get upgrade -y && apt-get clean && \ - clean-install apt-transport-https gnupg1 curl zfsutils-linux \ - && echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ buster main" > \ - /etc/apt/sources.list.d/azure-cli.list \ - && curl -L https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \ - && apt-get purge gnupg \ - && clean-install \ - xfsprogs \ - open-iscsi \ - azure-cli \ - iproute2 \ - iputils-ping \ - procps \ - glusterfs-client \ - glusterfs-common \ - samba-common \ - arptables +FROM rancher/hyperkube-base:v0.0.1-rc3 + +COPY k8s-binaries/kube* /usr/local/bin/ \ No newline at end of file diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 deleted file mode 100644 index 180cdad..0000000 --- a/Dockerfile.arm64 +++ /dev/null @@ -1,19 +0,0 @@ -FROM gcr.io/google_containers/hyperkube:v1.18.6 -RUN sed -i -e 's!\bmain\b!main contrib!g' /etc/apt/sources.list && \ - apt-get update && apt-get upgrade -y && apt-get clean && \ - clean-install apt-transport-https gnupg1 curl zfsutils-linux \ - && echo "deb [arch=arm64] https://packages.microsoft.com/repos/azure-cli/ buster main" > \ - /etc/apt/sources.list.d/azure-cli.list \ - && curl -L https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \ - && apt-get purge gnupg \ - && clean-install \ - xfsprogs \ - open-iscsi \ - azure-cli \ - iproute2 \ - iputils-ping \ - procps \ - glusterfs-client \ - glusterfs-common \ - samba-common \ - arptables diff --git a/Dockerfile.windows b/Dockerfile.windows index a5e2641..7cacde5 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -10,7 +10,7 @@ RUN if (-not (Get-Command Expand-7Zip -ErrorAction Ignore)) { \ Exit 1; \ } \ } -ENV K8S_VERSION v1.18.6 +ENV K8S_VERSION v1.19.0-rc.4 RUN $URL = ('https://dl.k8s.io/{0}/kubernetes-node-windows-amd64.tar.gz' -f $env:K8S_VERSION); \ \ function Expand-GZip ($inFile, $outFile) { \ diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..d90ebfe --- /dev/null +++ b/Makefile @@ -0,0 +1,61 @@ +K8S_VERSION?=v1.19.0-rc.4 +BASEIMAGE?=docker.io/rancher/hyperkube-base:v0.0.1-rc3 + +ARCH?=amd64 +ALL_ARCH=amd64 arm64 + +IMAGE?=docker.io/rancher/hyperkube +TAG?=v1.19.0-rc.4-rancher1 + +K8S_STAGING:=$(shell mktemp -d) + +K8S_SERVER_TARBALL=kubernetes-server-linux-$(ARCH).tar.gz + +all: all-push + +sub-build-%: + $(MAKE) ARCH=$* build + +all-build: $(addprefix sub-build-,$(ALL_ARCH)) + +sub-push-image-%: + $(MAKE) ARCH=$* push + +all-push-images: $(addprefix sub-push-image-,$(ALL_ARCH)) + +all-push: all-push-images push-manifest + +k8s-tars/${K8S_VERSION}/${ARCH}/${K8S_SERVER_TARBALL}: + mkdir -p k8s-tars/${K8S_VERSION}/${ARCH} + cd k8s-tars/${K8S_VERSION}/${ARCH} && curl -sSLO --retry 5 https://dl.k8s.io/${K8S_VERSION}/${K8S_SERVER_TARBALL} + +k8s-binaries: k8s-tars/${K8S_VERSION}/${ARCH}/$(K8S_SERVER_TARBALL) + mkdir -p ${K8S_STAGING}/k8s-server-untarred + tar -xz -C ${K8S_STAGING}/k8s-server-untarred -f "k8s-tars/${K8S_VERSION}/${ARCH}/${K8S_SERVER_TARBALL}" + + mkdir -p ${K8S_STAGING}/k8s-binaries + + cp ${K8S_STAGING}/k8s-server-untarred/kubernetes/server/bin/kube-apiserver ${K8S_STAGING}/k8s-binaries + cp ${K8S_STAGING}/k8s-server-untarred/kubernetes/server/bin/kube-controller-manager ${K8S_STAGING}/k8s-binaries + cp ${K8S_STAGING}/k8s-server-untarred/kubernetes/server/bin/kube-proxy ${K8S_STAGING}/k8s-binaries + cp ${K8S_STAGING}/k8s-server-untarred/kubernetes/server/bin/kube-scheduler ${K8S_STAGING}/k8s-binaries + cp ${K8S_STAGING}/k8s-server-untarred/kubernetes/server/bin/kubectl ${K8S_STAGING}/k8s-binaries + cp ${K8S_STAGING}/k8s-server-untarred/kubernetes/server/bin/kubelet ${K8S_STAGING}/k8s-binaries + + mkdir -p k8s-binaries/${K8S_VERSION}/${ARCH} + cp -r ${K8S_STAGING}/k8s-binaries k8s-binaries/${K8S_VERSION}/${ARCH} + rm -rf ${K8S_STAGING} + +clean: + rm -rf k8s-tars + rm -rf k8s-binaries + +build: k8s-binaries + docker build --pull -t $(IMAGE):$(TAG)-$(ARCH) -f Dockerfile . + +push: build + docker push $(IMAGE):$(TAG)-$(ARCH) + +.PHONY: all build push clean all-build all-push-images all-push push-manifest k8s-binaries + +.DEFAULT_GOAL := build \ No newline at end of file From 37fbba0603a11e3720de502be98dee43a2287020 Mon Sep 17 00:00:00 2001 From: Chris Kim Date: Wed, 5 Aug 2020 16:10:28 -0700 Subject: [PATCH 65/84] Update Makefile to support k8s-binaries format Signed-off-by: Chris Kim --- Makefile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index d90ebfe..bf99b97 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,10 @@ K8S_VERSION?=v1.19.0-rc.4 -BASEIMAGE?=docker.io/rancher/hyperkube-base:v0.0.1-rc3 ARCH?=amd64 ALL_ARCH=amd64 arm64 IMAGE?=docker.io/rancher/hyperkube -TAG?=v1.19.0-rc.4-rancher1 +TAGEND?=rancher1 K8S_STAGING:=$(shell mktemp -d) @@ -42,8 +41,8 @@ k8s-binaries: k8s-tars/${K8S_VERSION}/${ARCH}/$(K8S_SERVER_TARBALL) cp ${K8S_STAGING}/k8s-server-untarred/kubernetes/server/bin/kubectl ${K8S_STAGING}/k8s-binaries cp ${K8S_STAGING}/k8s-server-untarred/kubernetes/server/bin/kubelet ${K8S_STAGING}/k8s-binaries - mkdir -p k8s-binaries/${K8S_VERSION}/${ARCH} - cp -r ${K8S_STAGING}/k8s-binaries k8s-binaries/${K8S_VERSION}/${ARCH} + mkdir -p k8s-binaries + cp -r ${K8S_STAGING}/k8s-binaries/* k8s-binaries/ rm -rf ${K8S_STAGING} clean: @@ -51,10 +50,10 @@ clean: rm -rf k8s-binaries build: k8s-binaries - docker build --pull -t $(IMAGE):$(TAG)-$(ARCH) -f Dockerfile . + docker build --pull -t ${IMAGE}:${K8S_VERSION}-${TAGEND}-${ARCH} -f Dockerfile . push: build - docker push $(IMAGE):$(TAG)-$(ARCH) + docker push ${IMAGE}:${K8S_VERSION}-${TAGEND}-${ARCH} .PHONY: all build push clean all-build all-push-images all-push push-manifest k8s-binaries From 0778667b7b38d0682ed21a3cb3e4b153f577ad79 Mon Sep 17 00:00:00 2001 From: Chris Kim Date: Mon, 31 Aug 2020 11:53:09 -0700 Subject: [PATCH 66/84] Bump to v1.19.0 and use v0.0.1 of rancher/hyperkube-base Signed-off-by: Chris Kim --- Dockerfile | 4 ++-- Dockerfile.windows | 2 +- Makefile | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0ca4965..ccad2bf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,3 @@ -FROM rancher/hyperkube-base:v0.0.1-rc3 +FROM rancher/hyperkube-base:v0.0.1 -COPY k8s-binaries/kube* /usr/local/bin/ \ No newline at end of file +COPY k8s-binaries/kube* /usr/local/bin/ diff --git a/Dockerfile.windows b/Dockerfile.windows index 7cacde5..5813ef0 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -10,7 +10,7 @@ RUN if (-not (Get-Command Expand-7Zip -ErrorAction Ignore)) { \ Exit 1; \ } \ } -ENV K8S_VERSION v1.19.0-rc.4 +ENV K8S_VERSION v1.19.0 RUN $URL = ('https://dl.k8s.io/{0}/kubernetes-node-windows-amd64.tar.gz' -f $env:K8S_VERSION); \ \ function Expand-GZip ($inFile, $outFile) { \ diff --git a/Makefile b/Makefile index bf99b97..e21a602 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -K8S_VERSION?=v1.19.0-rc.4 +K8S_VERSION?=v1.19.0 ARCH?=amd64 ALL_ARCH=amd64 arm64 @@ -57,4 +57,4 @@ push: build .PHONY: all build push clean all-build all-push-images all-push push-manifest k8s-binaries -.DEFAULT_GOAL := build \ No newline at end of file +.DEFAULT_GOAL := build From 0f6eba5c96a733a57f294c9ac1689735cbf54477 Mon Sep 17 00:00:00 2001 From: Luther Monson Date: Fri, 4 Sep 2020 14:58:39 -0700 Subject: [PATCH 67/84] Adding Windows 2004 Support --- .drone.yml | 44 +++++++++++++++++++++++++++++++++++++++++++- manifest.tmpl | 6 ++++++ 2 files changed, 49 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 13d5971..242c192 100644 --- a/.drone.yml +++ b/.drone.yml @@ -168,6 +168,47 @@ steps: 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-hyperkube-windows-2004 + image: luthermonson/drone-docker:2004 + settings: + username: + from_secret: docker_username + password: + from_secret: docker_password + dockerfile: Dockerfile.windows + repo: rancher/hyperkube + tag: "${DRONE_TAG}-windows-2004" + build_args: + - SERVERCORE_VERSION=2004 + volumes: + - name: docker_pipe + path: \\\\.\\pipe\\docker_engine + when: + instance: + - drone-publish.rancher.io + event: + - tag + volumes: - name: docker_pipe host: @@ -195,4 +236,5 @@ depends_on: - linux-arm64 - windows-1809 - windows-1903 -- windows-1909 \ No newline at end of file +- windows-1909 +- windows-2004 \ No newline at end of file diff --git a/manifest.tmpl b/manifest.tmpl index 1b805a8..89722af 100644 --- a/manifest.tmpl +++ b/manifest.tmpl @@ -28,3 +28,9 @@ manifests: architecture: amd64 os: windows version: 1909 + - + image: rancher/hyperkube:{{build.tag}}-windows-2004 + platform: + architecture: amd64 + os: windows + version: 2004 From 8aa6cbcae8f233a23540bb8e55d361d5cfe099db Mon Sep 17 00:00:00 2001 From: Chris Kim Date: Wed, 9 Sep 2020 10:05:28 -0700 Subject: [PATCH 68/84] Add Kubernetes v1.19.1 Signed-off-by: Chris Kim --- Dockerfile.windows | 2 +- Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.windows b/Dockerfile.windows index 5813ef0..1cdaac1 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -10,7 +10,7 @@ RUN if (-not (Get-Command Expand-7Zip -ErrorAction Ignore)) { \ Exit 1; \ } \ } -ENV K8S_VERSION v1.19.0 +ENV K8S_VERSION v1.19.1 RUN $URL = ('https://dl.k8s.io/{0}/kubernetes-node-windows-amd64.tar.gz' -f $env:K8S_VERSION); \ \ function Expand-GZip ($inFile, $outFile) { \ diff --git a/Makefile b/Makefile index e21a602..1bf20c3 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -K8S_VERSION?=v1.19.0 +K8S_VERSION?=v1.19.1 ARCH?=amd64 ALL_ARCH=amd64 arm64 From 7354a6233243eeba4e1a3e71bdd3355f309a8d81 Mon Sep 17 00:00:00 2001 From: Steven Crespo Date: Wed, 16 Sep 2020 17:29:31 -0700 Subject: [PATCH 69/84] Update hyperkube to 1.19.2 --- Dockerfile.windows | 2 +- Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.windows b/Dockerfile.windows index 1cdaac1..48e10c1 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -10,7 +10,7 @@ RUN if (-not (Get-Command Expand-7Zip -ErrorAction Ignore)) { \ Exit 1; \ } \ } -ENV K8S_VERSION v1.19.1 +ENV K8S_VERSION v1.19.2 RUN $URL = ('https://dl.k8s.io/{0}/kubernetes-node-windows-amd64.tar.gz' -f $env:K8S_VERSION); \ \ function Expand-GZip ($inFile, $outFile) { \ diff --git a/Makefile b/Makefile index 1bf20c3..1574ab8 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -K8S_VERSION?=v1.19.1 +K8S_VERSION?=v1.19.2 ARCH?=amd64 ALL_ARCH=amd64 arm64 From ed8c5dda328c7a8d2a976b60b831f7fd9d18dd09 Mon Sep 17 00:00:00 2001 From: Ryan Sanna Date: Wed, 14 Oct 2020 11:13:43 -0700 Subject: [PATCH 70/84] Add k8s v1.19.3 --- Dockerfile.windows | 2 +- Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.windows b/Dockerfile.windows index 48e10c1..a301f4a 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -10,7 +10,7 @@ RUN if (-not (Get-Command Expand-7Zip -ErrorAction Ignore)) { \ Exit 1; \ } \ } -ENV K8S_VERSION v1.19.2 +ENV K8S_VERSION v1.19.3 RUN $URL = ('https://dl.k8s.io/{0}/kubernetes-node-windows-amd64.tar.gz' -f $env:K8S_VERSION); \ \ function Expand-GZip ($inFile, $outFile) { \ diff --git a/Makefile b/Makefile index 1574ab8..71947dc 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -K8S_VERSION?=v1.19.2 +K8S_VERSION?=v1.19.3 ARCH?=amd64 ALL_ARCH=amd64 arm64 From 6550a41900f8e60aa7bb44789b26ea79eff12d6a Mon Sep 17 00:00:00 2001 From: Sebastiaan van Steenis Date: Thu, 12 Nov 2020 13:40:36 +0100 Subject: [PATCH 71/84] Add k8s v1.19.4 --- Dockerfile.windows | 2 +- Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.windows b/Dockerfile.windows index a301f4a..7d8db20 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -10,7 +10,7 @@ RUN if (-not (Get-Command Expand-7Zip -ErrorAction Ignore)) { \ Exit 1; \ } \ } -ENV K8S_VERSION v1.19.3 +ENV K8S_VERSION v1.19.4 RUN $URL = ('https://dl.k8s.io/{0}/kubernetes-node-windows-amd64.tar.gz' -f $env:K8S_VERSION); \ \ function Expand-GZip ($inFile, $outFile) { \ diff --git a/Makefile b/Makefile index 71947dc..c64ca40 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -K8S_VERSION?=v1.19.3 +K8S_VERSION?=v1.19.4 ARCH?=amd64 ALL_ARCH=amd64 arm64 From e135ee72e0c0933c801f9c13396bf1c489e3b6d5 Mon Sep 17 00:00:00 2001 From: Steven Crespo Date: Wed, 9 Dec 2020 12:39:39 -0800 Subject: [PATCH 72/84] Add k8s v1.19.5 --- Dockerfile.windows | 2 +- Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.windows b/Dockerfile.windows index 7d8db20..7a3834f 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -10,7 +10,7 @@ RUN if (-not (Get-Command Expand-7Zip -ErrorAction Ignore)) { \ Exit 1; \ } \ } -ENV K8S_VERSION v1.19.4 +ENV K8S_VERSION v1.19.5 RUN $URL = ('https://dl.k8s.io/{0}/kubernetes-node-windows-amd64.tar.gz' -f $env:K8S_VERSION); \ \ function Expand-GZip ($inFile, $outFile) { \ diff --git a/Makefile b/Makefile index c64ca40..8b1c884 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -K8S_VERSION?=v1.19.4 +K8S_VERSION?=v1.19.5 ARCH?=amd64 ALL_ARCH=amd64 arm64 From b64ce93e88d32fe210ff2efdc3874acb00a354ee Mon Sep 17 00:00:00 2001 From: Steven Crespo Date: Fri, 18 Dec 2020 09:35:38 -0800 Subject: [PATCH 73/84] Add k8s v1.19.6 --- Dockerfile.windows | 2 +- Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.windows b/Dockerfile.windows index 7a3834f..d7e1777 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -10,7 +10,7 @@ RUN if (-not (Get-Command Expand-7Zip -ErrorAction Ignore)) { \ Exit 1; \ } \ } -ENV K8S_VERSION v1.19.5 +ENV K8S_VERSION v1.19.6 RUN $URL = ('https://dl.k8s.io/{0}/kubernetes-node-windows-amd64.tar.gz' -f $env:K8S_VERSION); \ \ function Expand-GZip ($inFile, $outFile) { \ diff --git a/Makefile b/Makefile index 8b1c884..e823134 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -K8S_VERSION?=v1.19.5 +K8S_VERSION?=v1.19.6 ARCH?=amd64 ALL_ARCH=amd64 arm64 From b7dd349a0c3c0deaf8ae353df7bc89ef176a7d72 Mon Sep 17 00:00:00 2001 From: Ryan Sanna Date: Wed, 13 Jan 2021 12:08:46 -0700 Subject: [PATCH 74/84] k8s v1.19.7 --- Dockerfile.windows | 2 +- Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.windows b/Dockerfile.windows index d7e1777..7fa063b 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -10,7 +10,7 @@ RUN if (-not (Get-Command Expand-7Zip -ErrorAction Ignore)) { \ Exit 1; \ } \ } -ENV K8S_VERSION v1.19.6 +ENV K8S_VERSION v1.19.7 RUN $URL = ('https://dl.k8s.io/{0}/kubernetes-node-windows-amd64.tar.gz' -f $env:K8S_VERSION); \ \ function Expand-GZip ($inFile, $outFile) { \ diff --git a/Makefile b/Makefile index e823134..34fd5ef 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -K8S_VERSION?=v1.19.6 +K8S_VERSION?=v1.19.7 ARCH?=amd64 ALL_ARCH=amd64 arm64 From 09d5b6216eb87a4c3bd027e12284ab8eea058d2e Mon Sep 17 00:00:00 2001 From: Luther Monson Date: Tue, 19 Jan 2021 17:35:57 -0700 Subject: [PATCH 75/84] Adding Windows 20H2 Builds --- .drone.yml | 47 +++++++++++++++++++++++++-- Dockerfile.windows.20H2 | 70 +++++++++++++++++++++++++++++++++++++++++ manifest.tmpl | 6 ++++ 3 files changed, 121 insertions(+), 2 deletions(-) create mode 100644 Dockerfile.windows.20H2 diff --git a/.drone.yml b/.drone.yml index 242c192..8cdf1c0 100644 --- a/.drone.yml +++ b/.drone.yml @@ -209,6 +209,48 @@ steps: 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-hyperkube-windows-20H2 + image: luthermonson/drone-docker:20H2 + settings: + username: + from_secret: docker_username + password: + from_secret: docker_password + dockerfile: Dockerfile.windows.20H2 + repo: rancher/hyperkube + tag: "${DRONE_TAG}-windows-20H2" + build_args: + - SERVERCORE_VERSION=20H2 + volumes: + - name: docker_pipe + path: \\\\.\\pipe\\docker_engine + when: + instance: + - drone-publish.rancher.io + event: + - tag + volumes: - name: docker_pipe host: @@ -219,7 +261,7 @@ name: manifest steps: - name: push-manifest - image: ibuildthecloud/manifest:v1.2.3-patch1 + image: plugins/manifest settings: username: from_secret: docker_username @@ -237,4 +279,5 @@ depends_on: - windows-1809 - windows-1903 - windows-1909 -- windows-2004 \ No newline at end of file +- windows-2004 +- windows-20H2 \ No newline at end of file diff --git a/Dockerfile.windows.20H2 b/Dockerfile.windows.20H2 new file mode 100644 index 0000000..d4b0d97 --- /dev/null +++ b/Dockerfile.windows.20H2 @@ -0,0 +1,70 @@ +ARG SERVERCORE_VERSION + +FROM mcr.microsoft.com/windows/servercore:${SERVERCORE_VERSION} as builder +SHELL ["powershell", "-NoLogo", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] +RUN if (-not (Get-Command Expand-7Zip -ErrorAction Ignore)) { \ + Install-PackageProvider -Name NuGet -Force -Verbose; \ + Install-Module -Name 7Zip4Powershell -Repository PSGallery -Force -Verbose; \ + if(-not $?) { \ + Write-Error "Failed to install package"; \ + Exit 1; \ + } \ + } +ENV K8S_VERSION v1.19.7 +RUN $URL = ('https://dl.k8s.io/{0}/kubernetes-node-windows-amd64.tar.gz' -f $env:K8S_VERSION); \ + \ + function Expand-GZip ($inFile, $outFile) { \ + $input = New-Object System.IO.FileStream $inFile, ([IO.FileMode]::Open), ([IO.FileAccess]::Read), ([IO.FileShare]::Read); \ + $output = New-Object System.IO.FileStream $outFile, ([IO.FileMode]::Create), ([IO.FileAccess]::Write), ([IO.FileShare]::None); \ + $gzipStream = New-Object System.IO.Compression.GzipStream $input, ([IO.Compression.CompressionMode]::Decompress); \ + try { \ + if (!$input -or !$output -or !$gzipStream) { \ + Write-Error "Failed to Unzip the archive"; \ + Exit 1; \ + } \ + $buffer = New-Object byte[](1024); \ + while ($true) { \ + $read = $gzipstream.Read($buffer, 0, 1024); \ + if ($read -le 0 ) { \ + break; \ + } \ + $output.Write($buffer, 0, $read); \ + } \ + } finally { \ + $gzipStream.Close(); \ + $output.Close(); \ + $input.Close(); \ + } \ + }; \ + \ + Write-Host ('Downloading Kubernetes from {0} ...' -f $URL); \ + [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ + Invoke-WebRequest -UseBasicParsing -OutFile c:\kubernetes.tar.gz -Uri $URL; \ + \ + Write-Host 'Expanding ...'; \ + Expand-GZip c:\kubernetes.tar.gz c:\kubernetes.tar; \ + Expand-7Zip c:\kubernetes.tar c:\; \ + \ + Write-Host 'Complete.' + +# FROM mcr.microsoft.com/powershell:nanoserver-${SERVERCORE_VERSION} +# USER ContainerAdministrator +# SHELL ["pwsh.exe", "-NoLogo", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] +RUN $URL = 'https://github.com/rancher/azure-cli/releases/download/v0.0.2/dist.azure-cli.zip'; \ + \ + Write-Host ('Downloading azure-cli from {0} ...' -f $URL); \ + [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ + Invoke-WebRequest -UseBasicParsing -OutFile c:\azure-cli.zip -Uri $URL; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive -Force -Path c:\azure-cli.zip -DestinationPath c:\azure-cli; \ + Remove-Item -Force -Path c:\azure-cli.zip; \ + \ + Write-Host 'Complete.' +# COPY --from=builder /Windows/System32/netapi32.dll /Windows/System32/ +RUN Move-Item -Path /kubernetes/node/bin/kubectl.exe -Destination /Windows +RUN New-Item -Force -ItemType Directory -Path /etc; \ + New-Item -Force -ItemType Directory -Path /etc/kubernetes; \ + New-Item -Force -ItemType Directory -Path /etc/kubernetes/bin; \ + Move-Item -Path /kubernetes/node/bin/*.exe -Destination /etc/kubernetes/bin/ +COPY windows/entrypoint.ps1 /usr/bin/ diff --git a/manifest.tmpl b/manifest.tmpl index 89722af..2dcd1aa 100644 --- a/manifest.tmpl +++ b/manifest.tmpl @@ -34,3 +34,9 @@ manifests: architecture: amd64 os: windows version: 2004 + - + image: rancher/hyperkube:{{build.tag}}-windows-20H2 + platform: + architecture: amd64 + os: windows + version: 20H2 From aed2202182b0acb36111de859492306dd394f868 Mon Sep 17 00:00:00 2001 From: Daishan Date: Mon, 25 Jan 2021 11:36:28 -0700 Subject: [PATCH 76/84] Add k8s 1.20.2 --- Dockerfile.windows | 2 +- Dockerfile.windows.20H2 | 2 +- Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile.windows b/Dockerfile.windows index 7fa063b..54fc891 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -10,7 +10,7 @@ RUN if (-not (Get-Command Expand-7Zip -ErrorAction Ignore)) { \ Exit 1; \ } \ } -ENV K8S_VERSION v1.19.7 +ENV K8S_VERSION v1.20.2 RUN $URL = ('https://dl.k8s.io/{0}/kubernetes-node-windows-amd64.tar.gz' -f $env:K8S_VERSION); \ \ function Expand-GZip ($inFile, $outFile) { \ diff --git a/Dockerfile.windows.20H2 b/Dockerfile.windows.20H2 index d4b0d97..f39a562 100644 --- a/Dockerfile.windows.20H2 +++ b/Dockerfile.windows.20H2 @@ -10,7 +10,7 @@ RUN if (-not (Get-Command Expand-7Zip -ErrorAction Ignore)) { \ Exit 1; \ } \ } -ENV K8S_VERSION v1.19.7 +ENV K8S_VERSION v1.20.2 RUN $URL = ('https://dl.k8s.io/{0}/kubernetes-node-windows-amd64.tar.gz' -f $env:K8S_VERSION); \ \ function Expand-GZip ($inFile, $outFile) { \ diff --git a/Makefile b/Makefile index 34fd5ef..a2900b4 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -K8S_VERSION?=v1.19.7 +K8S_VERSION?=v1.20.2 ARCH?=amd64 ALL_ARCH=amd64 arm64 From acdf03da683f5ea719c0515df9a88288cd79bf71 Mon Sep 17 00:00:00 2001 From: Daishan Date: Thu, 28 Jan 2021 13:03:29 -0700 Subject: [PATCH 77/84] Update hyperkube base to v0.0.2 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ccad2bf..80b2c71 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,3 @@ -FROM rancher/hyperkube-base:v0.0.1 +FROM rancher/hyperkube-base:v0.0.2 COPY k8s-binaries/kube* /usr/local/bin/ From 5a2340780482b33ee5e3b5ecd490e938c0fa0fda Mon Sep 17 00:00:00 2001 From: Luther Monson Date: Sun, 31 Jan 2021 13:17:41 -0700 Subject: [PATCH 78/84] adding pwsh symlink --- Dockerfile.windows.20H2 | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile.windows.20H2 b/Dockerfile.windows.20H2 index f39a562..65949a1 100644 --- a/Dockerfile.windows.20H2 +++ b/Dockerfile.windows.20H2 @@ -50,6 +50,7 @@ RUN $URL = ('https://dl.k8s.io/{0}/kubernetes-node-windows-amd64.tar.gz' -f $env # FROM mcr.microsoft.com/powershell:nanoserver-${SERVERCORE_VERSION} # USER ContainerAdministrator # SHELL ["pwsh.exe", "-NoLogo", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] +RUN New-Item -ItemType SymbolicLink -Target "C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe" -Path "C:\Windows\System32\WindowsPowerShell\v1.0\pwsh.exe" RUN $URL = 'https://github.com/rancher/azure-cli/releases/download/v0.0.2/dist.azure-cli.zip'; \ \ Write-Host ('Downloading azure-cli from {0} ...' -f $URL); \ From bbc07e9a2cca4eb4d993394c3751b8a6dd41e16f Mon Sep 17 00:00:00 2001 From: Steven Crespo Date: Thu, 11 Feb 2021 16:55:33 -0800 Subject: [PATCH 79/84] Add k8s v1.20.3 --- Dockerfile.windows | 2 +- Dockerfile.windows.20H2 | 2 +- Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile.windows b/Dockerfile.windows index 54fc891..428286d 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -10,7 +10,7 @@ RUN if (-not (Get-Command Expand-7Zip -ErrorAction Ignore)) { \ Exit 1; \ } \ } -ENV K8S_VERSION v1.20.2 +ENV K8S_VERSION v1.20.3 RUN $URL = ('https://dl.k8s.io/{0}/kubernetes-node-windows-amd64.tar.gz' -f $env:K8S_VERSION); \ \ function Expand-GZip ($inFile, $outFile) { \ diff --git a/Dockerfile.windows.20H2 b/Dockerfile.windows.20H2 index 65949a1..2ed28a8 100644 --- a/Dockerfile.windows.20H2 +++ b/Dockerfile.windows.20H2 @@ -10,7 +10,7 @@ RUN if (-not (Get-Command Expand-7Zip -ErrorAction Ignore)) { \ Exit 1; \ } \ } -ENV K8S_VERSION v1.20.2 +ENV K8S_VERSION v1.20.3 RUN $URL = ('https://dl.k8s.io/{0}/kubernetes-node-windows-amd64.tar.gz' -f $env:K8S_VERSION); \ \ function Expand-GZip ($inFile, $outFile) { \ diff --git a/Makefile b/Makefile index a2900b4..f07d52e 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -K8S_VERSION?=v1.20.2 +K8S_VERSION?=v1.20.3 ARCH?=amd64 ALL_ARCH=amd64 arm64 From 68e863f4b393934423766e0bb4ca942ebc2cea08 Mon Sep 17 00:00:00 2001 From: Steven Crespo Date: Thu, 18 Feb 2021 12:39:09 -0800 Subject: [PATCH 80/84] Add k8s v1.20.4 --- Dockerfile.windows | 2 +- Dockerfile.windows.20H2 | 2 +- Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile.windows b/Dockerfile.windows index 428286d..3c9f4f3 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -10,7 +10,7 @@ RUN if (-not (Get-Command Expand-7Zip -ErrorAction Ignore)) { \ Exit 1; \ } \ } -ENV K8S_VERSION v1.20.3 +ENV K8S_VERSION v1.20.4 RUN $URL = ('https://dl.k8s.io/{0}/kubernetes-node-windows-amd64.tar.gz' -f $env:K8S_VERSION); \ \ function Expand-GZip ($inFile, $outFile) { \ diff --git a/Dockerfile.windows.20H2 b/Dockerfile.windows.20H2 index 2ed28a8..3b1a96d 100644 --- a/Dockerfile.windows.20H2 +++ b/Dockerfile.windows.20H2 @@ -10,7 +10,7 @@ RUN if (-not (Get-Command Expand-7Zip -ErrorAction Ignore)) { \ Exit 1; \ } \ } -ENV K8S_VERSION v1.20.3 +ENV K8S_VERSION v1.20.4 RUN $URL = ('https://dl.k8s.io/{0}/kubernetes-node-windows-amd64.tar.gz' -f $env:K8S_VERSION); \ \ function Expand-GZip ($inFile, $outFile) { \ diff --git a/Makefile b/Makefile index f07d52e..15f28e7 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -K8S_VERSION?=v1.20.3 +K8S_VERSION?=v1.20.4 ARCH?=amd64 ALL_ARCH=amd64 arm64 From f07a9a8e3a377d00c5d2a39c6e8f6d63df835ada Mon Sep 17 00:00:00 2001 From: Kinara Shah Date: Fri, 26 Mar 2021 14:46:18 -0700 Subject: [PATCH 81/84] Add k8s 1.20.5 --- Dockerfile.windows | 2 +- Dockerfile.windows.20H2 | 2 +- Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile.windows b/Dockerfile.windows index 3c9f4f3..b943848 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -10,7 +10,7 @@ RUN if (-not (Get-Command Expand-7Zip -ErrorAction Ignore)) { \ Exit 1; \ } \ } -ENV K8S_VERSION v1.20.4 +ENV K8S_VERSION v1.20.5 RUN $URL = ('https://dl.k8s.io/{0}/kubernetes-node-windows-amd64.tar.gz' -f $env:K8S_VERSION); \ \ function Expand-GZip ($inFile, $outFile) { \ diff --git a/Dockerfile.windows.20H2 b/Dockerfile.windows.20H2 index 3b1a96d..18443c0 100644 --- a/Dockerfile.windows.20H2 +++ b/Dockerfile.windows.20H2 @@ -10,7 +10,7 @@ RUN if (-not (Get-Command Expand-7Zip -ErrorAction Ignore)) { \ Exit 1; \ } \ } -ENV K8S_VERSION v1.20.4 +ENV K8S_VERSION v1.20.5 RUN $URL = ('https://dl.k8s.io/{0}/kubernetes-node-windows-amd64.tar.gz' -f $env:K8S_VERSION); \ \ function Expand-GZip ($inFile, $outFile) { \ diff --git a/Makefile b/Makefile index 15f28e7..ba82087 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -K8S_VERSION?=v1.20.4 +K8S_VERSION?=v1.20.5 ARCH?=amd64 ALL_ARCH=amd64 arm64 From 3c8e51d663c773ee46960af81926beefc4588c6c Mon Sep 17 00:00:00 2001 From: Bharat Kunwar Date: Fri, 16 Apr 2021 15:55:22 +0000 Subject: [PATCH 82/84] Release v1.21.0 --- Dockerfile | 2 +- Makefile | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 80b2c71..04f0019 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,3 @@ -FROM rancher/hyperkube-base:v0.0.2 +FROM harbor.cumulus.openstack.hpc.cam.ac.uk/magnum/hyperkube-base:v0.0.1-linux-amd64 COPY k8s-binaries/kube* /usr/local/bin/ diff --git a/Makefile b/Makefile index ba82087..fc7cce0 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ -K8S_VERSION?=v1.20.5 +K8S_VERSION?=v1.21.0 ARCH?=amd64 ALL_ARCH=amd64 arm64 -IMAGE?=docker.io/rancher/hyperkube -TAGEND?=rancher1 +IMAGE?=harbor.cumulus.openstack.hpc.cam.ac.uk/magnum/hyperkube +TAGEND?=0 K8S_STAGING:=$(shell mktemp -d) @@ -50,10 +50,10 @@ clean: rm -rf k8s-binaries build: k8s-binaries - docker build --pull -t ${IMAGE}:${K8S_VERSION}-${TAGEND}-${ARCH} -f Dockerfile . + docker build --pull -t ${IMAGE}:${K8S_VERSION}-${TAGEND} -f Dockerfile . push: build - docker push ${IMAGE}:${K8S_VERSION}-${TAGEND}-${ARCH} + docker push ${IMAGE}:${K8S_VERSION}-${TAGEND} .PHONY: all build push clean all-build all-push-images all-push push-manifest k8s-binaries From 12efe85b070cd8349fc07f9ccf3422e2dba8cc20 Mon Sep 17 00:00:00 2001 From: Bharat Kunwar Date: Tue, 20 Apr 2021 09:14:38 +0000 Subject: [PATCH 83/84] Add github action --- .github/workflows/build-push-image.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 .github/workflows/build-push-image.yml diff --git a/.github/workflows/build-push-image.yml b/.github/workflows/build-push-image.yml new file mode 100644 index 0000000..a4b6a34 --- /dev/null +++ b/.github/workflows/build-push-image.yml @@ -0,0 +1,21 @@ +name: Publish Docker image +on: + release: + types: [published] +jobs: + push_to_registry: + name: Push Docker image to GitHub Packages + runs-on: ubuntu-latest + steps: + - name: Check out the repo + uses: actions/checkout@v2 + - name: Unpack binaries + run: "make k8s-binaries" + - name: Push to GitHub Packages + uses: docker/build-push-action@v1 + with: + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + registry: ghcr.io + repository: stackhpc/hyperkube + tag_with_ref: true From d7ff3fd0944c8f61a9dff1dd3e8758a4f7337698 Mon Sep 17 00:00:00 2001 From: Bharat Kunwar Date: Tue, 20 Apr 2021 13:25:14 +0000 Subject: [PATCH 84/84] Use ghcr.io/stackhpc/hyperkube-base:v0.1.0 --- .github/workflows/build-push-image.yml | 2 +- Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-push-image.yml b/.github/workflows/build-push-image.yml index a4b6a34..746f483 100644 --- a/.github/workflows/build-push-image.yml +++ b/.github/workflows/build-push-image.yml @@ -10,7 +10,7 @@ jobs: - name: Check out the repo uses: actions/checkout@v2 - name: Unpack binaries - run: "make k8s-binaries" + run: make k8s-binaries K8S_VERSION=${GITHUB_REF#refs/*/} - name: Push to GitHub Packages uses: docker/build-push-action@v1 with: diff --git a/Dockerfile b/Dockerfile index 04f0019..b6f8069 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,3 @@ -FROM harbor.cumulus.openstack.hpc.cam.ac.uk/magnum/hyperkube-base:v0.0.1-linux-amd64 +FROM ghcr.io/stackhpc/hyperkube-base:v0.1.0 COPY k8s-binaries/kube* /usr/local/bin/