Skip to content

Update Makefile to support k8s-binaries format #132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 5, 2020
+5 −6
Merged

Update Makefile to support k8s-binaries format #132

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)

Expand Down Expand Up @@ -42,19 +41,19 @@ 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:
rm -rf k8s-tars
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

Expand Down