From 600cc3009661c3d1761cfec5d095b40d66adb658 Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Thu, 26 May 2022 13:11:20 -0700 Subject: [PATCH] add automation for uploading cri-dockerd binaries --- Makefile | 5 ++ hack/update/cri_dockerd/update_cri_dockerd.sh | 49 +++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100755 hack/update/cri_dockerd/update_cri_dockerd.sh diff --git a/Makefile b/Makefile index 18d2db14cd..951b274319 100644 --- a/Makefile +++ b/Makefile @@ -702,6 +702,11 @@ KICBASE_IMAGE_GCR ?= $(REGISTRY)/kicbase:$(KIC_VERSION) KICBASE_IMAGE_HUB ?= kicbase/stable:$(KIC_VERSION) KICBASE_IMAGE_REGISTRIES ?= $(KICBASE_IMAGE_GCR) $(KICBASE_IMAGE_HUB) +CRI_DOCKERD_VERSION ?= $(shell egrep "CRI_DOCKERD_VERSION=" deploy/kicbase/Dockerfile | cut -d \" -f2) +.PHONY: update-cri-dockerd +update-cri-dockerd: + hack/update/cri_dockerd/update_cri_dockerd.sh $(CRI_DOCKERD_VERSION) $(KICBASE_ARCH) + .PHONY: local-kicbase local-kicbase: ## Builds the kicbase image and tags it local/kicbase:latest and local/kicbase:$(KIC_VERSION)-$(COMMIT_SHORT) docker build -f ./deploy/kicbase/Dockerfile -t local/kicbase:$(KIC_VERSION) --build-arg COMMIT_SHA=${VERSION}-$(COMMIT) --cache-from $(KICBASE_IMAGE_GCR) . diff --git a/hack/update/cri_dockerd/update_cri_dockerd.sh b/hack/update/cri_dockerd/update_cri_dockerd.sh new file mode 100755 index 0000000000..05a7c8903a --- /dev/null +++ b/hack/update/cri_dockerd/update_cri_dockerd.sh @@ -0,0 +1,49 @@ +#!/bin/bash + +# Copyright 2022 The Kubernetes Authors All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +set -eux -o pipefail + +if [ "$#" -ne 2 ]; then + echo "Usage: update_cri_dockerd.sh " >&2 + exit 1 +fi + +readonly version=$1 +archlist=$2 + +IFS=, read -a archarray <<< "$archlist" + +tmpdir=$(mktemp -d) +pushd $tmpdir +git clone -n https://github.com/Mirantis/cri-dockerd +cd cri-dockerd +git checkout $version +cd src + +for (( i=0; i < ${#archarray[*]}; i++ )) +do + arch=${archarray[i]#"linux/"} + env GOOS=linux GOARCH=$arch CGO_ENABLED=0 go build -ldflags '-X github.com/Mirantis/cri-dockerd/version.GitCommit=a4d1895' -o cri-dockerd-$arch + gsutil cp cri-dockerd-$arch gs://kicbase-artifacts/cri-dockerd/$version/$arch/cri-dockerd + +done + +cd .. +gsutil cp ./packaging/systemd/cri-docker.service gs://kicbase-artifacts/cri-dockerd/$version/cri-docker.service +gsutil cp ./packaging/systemd/cri-docker.socket gs://kicbase-artifacts/cri-dockerd/$version/cri-docker.socket + +popd +rm -rf $tmpdir