mirror of
https://github.com/optim-enterprises-bv/kubernetes.git
synced 2025-12-07 16:45:35 +00:00
9e3fc8de9e
Automatic merge from submit-queue (batch tested with PRs 37860, 38429, 38451, 36050, 38463) [Part 2] Adding s390x cross-compilation support for gcr.io images in this repo <!-- Thanks for sending a pull request! Here are some tips for you: 1. If this is your first time, read our contributor guidelines https://github.com/kubernetes/kubernetes/blob/master/CONTRIBUTING.md and developer guide https://github.com/kubernetes/kubernetes/blob/master/docs/devel/development.md 2. If you want *faster* PR reviews, read how: https://github.com/kubernetes/kubernetes/blob/master/docs/devel/faster_reviews.md 3. Follow the instructions for writing a release note: https://github.com/kubernetes/kubernetes/blob/master/docs/devel/pull-requests.md#release-notes --> **What this PR does / why we need it**: This PR enables s390x support to kube-dns , pause, addon-manager, etcd, hyperkube, kube-discovery etc. This PR also includes the changes due to which it can be cross compiled on x86 host architecture. **Which issue this PR fixes #34328 **Special notes for your reviewer**: In existing file "build-tools/build-image/cross/Dockerfile" the repository mentioned for installing cross build tool chains for supporting architecture does not have a tool chain for s390x hence in my PR I am changing the repository so that it will be cross compiled for s390x. **Release note**: <!-- Steps to write your release note: 1. Use the release-note-* labels to set the release note state (if you have access) 2. Enter your extended release note in the below block; leaving it blank means using the PR title as the release note. If no release note is required, just write `NONE`. --> ``` Allows cross compilation of Kubernetes on x86 host for s390x also enables s390x support to kube-dns , pause, addon-manager, etcd, hyperkube, kube-discovery etc ```
121 lines
4.9 KiB
Makefile
121 lines
4.9 KiB
Makefile
# Copyright 2016 The Kubernetes Authors.
|
|
#
|
|
# 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.
|
|
|
|
# Build the hyperkube image.
|
|
#
|
|
# Usage:
|
|
# [ARCH=amd64] [REGISTRY="gcr.io/google_containers"] make (build|push) VERSION={some_released_version_of_kubernetes}
|
|
|
|
REGISTRY?=gcr.io/google_containers
|
|
ARCH?=amd64
|
|
TEMP_DIR:=$(shell mktemp -d -t hyperkubeXXXXXX)
|
|
CNI_RELEASE=07a8a28637e97b22eb8dfe710eeae1344f69d16e
|
|
|
|
UNAME_S:=$(shell uname -s)
|
|
ifeq ($(UNAME_S),Darwin)
|
|
SED_CMD?=sed -i ""
|
|
endif
|
|
ifeq ($(UNAME_S),Linux)
|
|
SED_CMD?=sed -i
|
|
endif
|
|
|
|
ifeq ($(ARCH),amd64)
|
|
BASEIMAGE?=debian:jessie
|
|
endif
|
|
ifeq ($(ARCH),arm)
|
|
BASEIMAGE?=armel/debian:jessie
|
|
QEMUARCH=arm
|
|
endif
|
|
ifeq ($(ARCH),arm64)
|
|
BASEIMAGE?=aarch64/debian:jessie
|
|
QEMUARCH=aarch64
|
|
endif
|
|
ifeq ($(ARCH),ppc64le)
|
|
BASEIMAGE?=ppc64le/debian:jessie
|
|
QEMUARCH=ppc64le
|
|
endif
|
|
ifeq ($(ARCH),s390x)
|
|
BASEIMAGE?=s390x/debian:jessie
|
|
QEMUARCH=s390x
|
|
endif
|
|
|
|
all: build
|
|
|
|
build:
|
|
|
|
ifndef VERSION
|
|
$(error VERSION is undefined)
|
|
endif
|
|
cp -r ./* ${TEMP_DIR}
|
|
mkdir -p ${TEMP_DIR}/cni-bin ${TEMP_DIR}/addons ${TEMP_DIR}/addons/singlenode ${TEMP_DIR}/addons/multinode
|
|
cp ../../saltbase/salt/generate-cert/make-ca-cert.sh ${TEMP_DIR}
|
|
|
|
# Singlenode addons
|
|
cp ../../addons/dns/skydns-rc.yaml.base ${TEMP_DIR}/addons/singlenode/skydns-rc.yaml
|
|
cp ../../addons/dns/skydns-svc.yaml.base ${TEMP_DIR}/addons/singlenode/skydns-svc.yaml
|
|
cp ../../addons/dashboard/dashboard-controller.yaml ${TEMP_DIR}/addons/singlenode/
|
|
cp ../../addons/dashboard/dashboard-service.yaml ${TEMP_DIR}/addons/singlenode/
|
|
|
|
# Multinode addons; all singlenode addons plus kube-proxy (and soon flannel)
|
|
cp ${TEMP_DIR}/addons/singlenode/*.yaml ${TEMP_DIR}/addons/multinode/
|
|
cp kube-proxy-ds.yaml ${TEMP_DIR}/addons/multinode/kube-proxy.yaml
|
|
|
|
cp ../../../_output/dockerized/bin/linux/${ARCH}/hyperkube ${TEMP_DIR}
|
|
|
|
cd ${TEMP_DIR} && sed -i.back "s|VERSION|${VERSION}|g" addons/singlenode/*.yaml addons/multinode/*.yaml static-pods/*.json
|
|
cd ${TEMP_DIR} && sed -i.back "s|REGISTRY|${REGISTRY}|g" addons/singlenode/*.yaml addons/multinode/*.yaml static-pods/*.json
|
|
cd ${TEMP_DIR} && sed -i.back "s|ARCH|${ARCH}|g" addons/singlenode/*.yaml addons/multinode/*.yaml static-pods/*.json
|
|
cd ${TEMP_DIR} && sed -i.back "s|ARCH|${QEMUARCH}|g" Dockerfile
|
|
cd ${TEMP_DIR} && sed -i.back "s|BASEIMAGE|${BASEIMAGE}|g" Dockerfile
|
|
cd ${TEMP_DIR} && sed -i.back "s|CACHEBUST|$(shell uuidgen)|g" Dockerfile
|
|
cd ${TEMP_DIR} && sed -i.back "s|-amd64|-${ARCH}|g" addons/singlenode/*.yaml addons/multinode/*.yaml
|
|
cd ${TEMP_DIR} && sed -i.back "s|__PILLAR__DNS__SERVER__|10.0.0.10|g" addons/singlenode/skydns*.yaml addons/multinode/skydns*.yaml
|
|
cd ${TEMP_DIR} && sed -i.back "s|__PILLAR__DNS__DOMAIN__|cluster.local|g;s|__PILLAR__FEDERATIONS__DOMAIN__MAP__||g;" addons/singlenode/skydns*.yaml addons/multinode/skydns*.yaml
|
|
cd ${TEMP_DIR} && rm -f addons/singlenode/*.back addons/multinode/*.back static-pods/*.back
|
|
|
|
# Make scripts executable before they are copied into the Docker image. If we make them executable later, in another layer
|
|
# they'll take up twice the space because the new executable binary differs from the old one, but everything is cached in layers.
|
|
cd ${TEMP_DIR} && chmod a+rx \
|
|
hyperkube \
|
|
setup-files.sh \
|
|
make-ca-cert.sh \
|
|
copy-addons.sh
|
|
|
|
ifeq ($(ARCH),amd64)
|
|
# When building "normally" for amd64, remove the whole line, it has no part in the amd64 image
|
|
cd ${TEMP_DIR} && ${SED_CMD} "/CROSS_BUILD_/d" Dockerfile
|
|
else
|
|
cd ${TEMP_DIR} && ${SED_CMD} "s/CROSS_BUILD_//g" Dockerfile
|
|
|
|
# When cross-building, only the placeholder "CROSS_BUILD_" should be removed
|
|
# Register /usr/bin/qemu-ARCH-static as the handler for ARM binaries in the kernel
|
|
docker run --rm --privileged multiarch/qemu-user-static:register --reset
|
|
curl -sSL --retry 5 https://github.com/multiarch/qemu-user-static/releases/download/v2.5.0/x86_64_qemu-${QEMUARCH}-static.tar.xz | tar -xJ -C ${TEMP_DIR}
|
|
endif
|
|
# Download CNI
|
|
curl -sSL --retry 5 https://storage.googleapis.com/kubernetes-release/network-plugins/cni-${ARCH}-${CNI_RELEASE}.tar.gz | tar -xz -C ${TEMP_DIR}/cni-bin
|
|
|
|
docker build -t ${REGISTRY}/hyperkube-${ARCH}:${VERSION} ${TEMP_DIR}
|
|
rm -rf "${TEMP_DIR}"
|
|
|
|
push: build
|
|
gcloud docker -- push ${REGISTRY}/hyperkube-${ARCH}:${VERSION}
|
|
ifeq ($(ARCH),amd64)
|
|
docker rmi ${REGISTRY}/hyperkube:${VERSION} || true
|
|
docker tag ${REGISTRY}/hyperkube-${ARCH}:${VERSION} ${REGISTRY}/hyperkube:${VERSION}
|
|
gcloud docker -- push ${REGISTRY}/hyperkube:${VERSION}
|
|
endif
|
|
|
|
.PHONY: all
|