mirror of
https://github.com/ceph/ceph-csi.git
synced 2025-06-13 10:33:35 +00:00
vendor updates
This commit is contained in:
10
vendor/k8s.io/kubernetes/build/BUILD
generated
vendored
10
vendor/k8s.io/kubernetes/build/BUILD
generated
vendored
@ -38,7 +38,7 @@ DOCKERIZED_BINARIES = {
|
||||
},
|
||||
"kube-scheduler": {
|
||||
"base": "@official_busybox//image",
|
||||
"target": "//plugin/cmd/kube-scheduler:kube-scheduler",
|
||||
"target": "//cmd/kube-scheduler:kube-scheduler",
|
||||
},
|
||||
"kube-proxy": {
|
||||
"base": "@debian-iptables-amd64//image",
|
||||
@ -62,7 +62,11 @@ DOCKERIZED_BINARIES = {
|
||||
|
||||
[docker_bundle(
|
||||
name = binary,
|
||||
images = {"gcr.io/google_containers/%s:{STABLE_DOCKER_TAG}" % binary: binary + "-internal"},
|
||||
# TODO(thockin): remove the google_containers name after release 1.10.
|
||||
images = {
|
||||
"k8s.gcr.io/%s:{STABLE_DOCKER_TAG}" % binary: binary + "-internal",
|
||||
"gcr.io/google_containers/%s:{STABLE_DOCKER_TAG}" % binary: binary + "-internal",
|
||||
},
|
||||
stamp = True,
|
||||
) for binary in DOCKERIZED_BINARIES.keys()]
|
||||
|
||||
@ -127,7 +131,7 @@ release_filegroup(
|
||||
"//cmd/hyperkube",
|
||||
"//cmd/kube-apiserver",
|
||||
"//cmd/kube-controller-manager",
|
||||
"//plugin/cmd/kube-scheduler",
|
||||
"//cmd/kube-scheduler",
|
||||
"//vendor/k8s.io/kube-aggregator",
|
||||
],
|
||||
)
|
||||
|
2
vendor/k8s.io/kubernetes/build/README.md
generated
vendored
2
vendor/k8s.io/kubernetes/build/README.md
generated
vendored
@ -100,12 +100,10 @@ The main output is a tar file: `kubernetes.tar.gz`. This includes:
|
||||
* Examples
|
||||
* Cluster deployment scripts for various clouds
|
||||
* Tar file containing all server binaries
|
||||
* Tar file containing salt deployment tree shared across multiple cloud deployments.
|
||||
|
||||
In addition, there are some other tar files that are created:
|
||||
* `kubernetes-client-*.tar.gz` Client binaries for a specific platform.
|
||||
* `kubernetes-server-*.tar.gz` Server binaries for a specific platform.
|
||||
* `kubernetes-salt.tar.gz` The salt script/tree shared across multiple deployment scripts.
|
||||
|
||||
When building final release tars, they are first staged into `_output/release-stage` before being tar'd up and put into `_output/release-tars`.
|
||||
|
||||
|
2
vendor/k8s.io/kubernetes/build/build-image/Dockerfile
generated
vendored
2
vendor/k8s.io/kubernetes/build/build-image/Dockerfile
generated
vendored
@ -13,7 +13,7 @@
|
||||
# limitations under the License.
|
||||
|
||||
# This file creates a standard build environment for building Kubernetes
|
||||
FROM gcr.io/google_containers/kube-cross:KUBE_BUILD_IMAGE_CROSS_TAG
|
||||
FROM k8s.gcr.io/kube-cross:KUBE_BUILD_IMAGE_CROSS_TAG
|
||||
|
||||
# Mark this as a kube-build container
|
||||
RUN touch /kube-build-image
|
||||
|
4
vendor/k8s.io/kubernetes/build/build-image/cross/Dockerfile
generated
vendored
4
vendor/k8s.io/kubernetes/build/build-image/cross/Dockerfile
generated
vendored
@ -15,7 +15,7 @@
|
||||
# This file creates a standard build environment for building cross
|
||||
# platform go binary for the architecture kubernetes cares about.
|
||||
|
||||
FROM golang:1.9.2
|
||||
FROM golang:1.9.3
|
||||
|
||||
ENV GOARM 7
|
||||
ENV KUBE_DYNAMIC_CROSSPLATFORMS \
|
||||
@ -71,7 +71,7 @@ RUN go get golang.org/x/tools/cmd/cover \
|
||||
golang.org/x/tools/cmd/goimports
|
||||
|
||||
# Download and symlink etcd. We need this for our integration tests.
|
||||
RUN export ETCD_VERSION=v3.1.10; \
|
||||
RUN export ETCD_VERSION=v3.2.14; \
|
||||
mkdir -p /usr/local/src/etcd \
|
||||
&& cd /usr/local/src/etcd \
|
||||
&& curl -fsSL https://github.com/coreos/etcd/releases/download/${ETCD_VERSION}/etcd-${ETCD_VERSION}-linux-amd64.tar.gz | tar -xz \
|
||||
|
4
vendor/k8s.io/kubernetes/build/build-image/cross/Makefile
generated
vendored
4
vendor/k8s.io/kubernetes/build/build-image/cross/Makefile
generated
vendored
@ -21,7 +21,7 @@ TAG=$(shell cat VERSION)
|
||||
all: push
|
||||
|
||||
build:
|
||||
docker build --pull -t gcr.io/google_containers/$(IMAGE):$(TAG) .
|
||||
docker build --pull -t staging-k8s.gcr.io/$(IMAGE):$(TAG) .
|
||||
|
||||
push: build
|
||||
gcloud docker --server=gcr.io -- push gcr.io/google_containers/$(IMAGE):$(TAG)
|
||||
docker push staging-k8s.gcr.io/$(IMAGE):$(TAG)
|
||||
|
2
vendor/k8s.io/kubernetes/build/build-image/cross/VERSION
generated
vendored
2
vendor/k8s.io/kubernetes/build/build-image/cross/VERSION
generated
vendored
@ -1 +1 @@
|
||||
v1.9.2-1
|
||||
v1.9.3-2
|
||||
|
25
vendor/k8s.io/kubernetes/build/common.sh
generated
vendored
25
vendor/k8s.io/kubernetes/build/common.sh
generated
vendored
@ -96,7 +96,7 @@ kube::build::get_docker_wrapped_binaries() {
|
||||
kube-controller-manager,busybox
|
||||
kube-scheduler,busybox
|
||||
kube-aggregator,busybox
|
||||
kube-proxy,gcr.io/google-containers/debian-iptables-amd64:${debian_iptables_version}
|
||||
kube-proxy,k8s.gcr.io/debian-iptables-amd64:${debian_iptables_version}
|
||||
);;
|
||||
"arm")
|
||||
local targets=(
|
||||
@ -105,7 +105,7 @@ kube::build::get_docker_wrapped_binaries() {
|
||||
kube-controller-manager,arm32v7/busybox
|
||||
kube-scheduler,arm32v7/busybox
|
||||
kube-aggregator,arm32v7/busybox
|
||||
kube-proxy,gcr.io/google-containers/debian-iptables-arm:${debian_iptables_version}
|
||||
kube-proxy,k8s.gcr.io/debian-iptables-arm:${debian_iptables_version}
|
||||
);;
|
||||
"arm64")
|
||||
local targets=(
|
||||
@ -114,7 +114,7 @@ kube::build::get_docker_wrapped_binaries() {
|
||||
kube-controller-manager,arm64v8/busybox
|
||||
kube-scheduler,arm64v8/busybox
|
||||
kube-aggregator,arm64v8/busybox
|
||||
kube-proxy,gcr.io/google-containers/debian-iptables-arm64:${debian_iptables_version}
|
||||
kube-proxy,k8s.gcr.io/debian-iptables-arm64:${debian_iptables_version}
|
||||
);;
|
||||
"ppc64le")
|
||||
local targets=(
|
||||
@ -123,7 +123,7 @@ kube::build::get_docker_wrapped_binaries() {
|
||||
kube-controller-manager,ppc64le/busybox
|
||||
kube-scheduler,ppc64le/busybox
|
||||
kube-aggregator,ppc64le/busybox
|
||||
kube-proxy,gcr.io/google-containers/debian-iptables-ppc64le:${debian_iptables_version}
|
||||
kube-proxy,k8s.gcr.io/debian-iptables-ppc64le:${debian_iptables_version}
|
||||
);;
|
||||
"s390x")
|
||||
local targets=(
|
||||
@ -132,7 +132,7 @@ kube::build::get_docker_wrapped_binaries() {
|
||||
kube-controller-manager,s390x/busybox
|
||||
kube-scheduler,s390x/busybox
|
||||
kube-aggregator,s390x/busybox
|
||||
kube-proxy,gcr.io/google-containers/debian-iptables-s390x:${debian_iptables_version}
|
||||
kube-proxy,k8s.gcr.io/debian-iptables-s390x:${debian_iptables_version}
|
||||
);;
|
||||
esac
|
||||
|
||||
@ -451,8 +451,8 @@ function kube::build::build_image() {
|
||||
|
||||
cp /etc/localtime "${LOCAL_OUTPUT_BUILD_CONTEXT}/"
|
||||
|
||||
cp build/build-image/Dockerfile "${LOCAL_OUTPUT_BUILD_CONTEXT}/Dockerfile"
|
||||
cp build/build-image/rsyncd.sh "${LOCAL_OUTPUT_BUILD_CONTEXT}/"
|
||||
cp ${KUBE_ROOT}/build/build-image/Dockerfile "${LOCAL_OUTPUT_BUILD_CONTEXT}/Dockerfile"
|
||||
cp ${KUBE_ROOT}/build/build-image/rsyncd.sh "${LOCAL_OUTPUT_BUILD_CONTEXT}/"
|
||||
dd if=/dev/urandom bs=512 count=1 2>/dev/null | LC_ALL=C tr -dc 'A-Za-z0-9' | dd bs=32 count=1 2>/dev/null > "${LOCAL_OUTPUT_BUILD_CONTEXT}/rsyncd.password"
|
||||
chmod go= "${LOCAL_OUTPUT_BUILD_CONTEXT}/rsyncd.password"
|
||||
|
||||
@ -501,9 +501,11 @@ function kube::build::ensure_data_container() {
|
||||
# If the data container exists AND exited successfully, we can use it.
|
||||
# Otherwise nuke it and start over.
|
||||
local ret=0
|
||||
local code=$(docker inspect \
|
||||
local code=0
|
||||
|
||||
code=$(docker inspect \
|
||||
-f '{{.State.ExitCode}}' \
|
||||
"${KUBE_DATA_CONTAINER_NAME}" 2>/dev/null || ret=$?)
|
||||
"${KUBE_DATA_CONTAINER_NAME}" 2>/dev/null) || ret=$?
|
||||
if [[ "${ret}" == 0 && "${code}" != 0 ]]; then
|
||||
kube::build::destroy_container "${KUBE_DATA_CONTAINER_NAME}"
|
||||
ret=1
|
||||
@ -601,6 +603,11 @@ function kube::build::run_build_command_ex() {
|
||||
--env "GOGCFLAGS=${GOGCFLAGS:-}"
|
||||
)
|
||||
|
||||
if [[ -n "${DOCKER_CGROUP_PARENT:-}" ]]; then
|
||||
kube::log::status "Using ${DOCKER_CGROUP_PARENT} as container cgroup parent"
|
||||
docker_run_opts+=(--cgroup-parent "${DOCKER_CGROUP_PARENT}")
|
||||
fi
|
||||
|
||||
# If we have stdin we can run interactive. This allows things like 'shell.sh'
|
||||
# to work. However, if we run this way and don't have stdin, then it ends up
|
||||
# running in a daemon-ish mode. So if we don't have a stdin, we explicitly
|
||||
|
2
vendor/k8s.io/kubernetes/build/copy-output.sh
generated
vendored
2
vendor/k8s.io/kubernetes/build/copy-output.sh
generated
vendored
@ -14,7 +14,7 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
# Copies any built binaries (and other generated files) out of the Docker build contianer.
|
||||
# Copies any built binaries (and other generated files) out of the Docker build container.
|
||||
set -o errexit
|
||||
set -o nounset
|
||||
set -o pipefail
|
||||
|
4
vendor/k8s.io/kubernetes/build/debian-base/Makefile
generated
vendored
4
vendor/k8s.io/kubernetes/build/debian-base/Makefile
generated
vendored
@ -14,7 +14,7 @@
|
||||
|
||||
all: build
|
||||
|
||||
REGISTRY ?= gcr.io/google-containers
|
||||
REGISTRY ?= staging-k8s.gcr.io
|
||||
IMAGE ?= debian-base
|
||||
BUILD_IMAGE ?= debian-build
|
||||
|
||||
@ -71,7 +71,7 @@ endif
|
||||
rm -rf $(TEMP_DIR)
|
||||
|
||||
push: build
|
||||
gcloud docker -- push $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG)
|
||||
docker push $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG)
|
||||
|
||||
clean:
|
||||
docker rmi -f $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG) || true
|
||||
|
2
vendor/k8s.io/kubernetes/build/debian-hyperkube-base/Dockerfile
generated
vendored
2
vendor/k8s.io/kubernetes/build/debian-hyperkube-base/Dockerfile
generated
vendored
@ -28,11 +28,13 @@ RUN echo CACHEBUST>/dev/null && clean-install \
|
||||
cifs-utils \
|
||||
conntrack \
|
||||
e2fsprogs \
|
||||
xfsprogs \
|
||||
ebtables \
|
||||
ethtool \
|
||||
git \
|
||||
glusterfs-client \
|
||||
iptables \
|
||||
ipset \
|
||||
jq \
|
||||
kmod \
|
||||
openssh-client \
|
||||
|
10
vendor/k8s.io/kubernetes/build/debian-hyperkube-base/Makefile
generated
vendored
10
vendor/k8s.io/kubernetes/build/debian-hyperkube-base/Makefile
generated
vendored
@ -15,15 +15,15 @@
|
||||
# Build the hyperkube base image. This image is used to build the hyperkube image.
|
||||
#
|
||||
# Usage:
|
||||
# [ARCH=amd64] [REGISTRY="gcr.io/google-containers"] make (build|push)
|
||||
# [ARCH=amd64] [REGISTRY="staging-k8s.gcr.io"] make (build|push)
|
||||
|
||||
REGISTRY?=gcr.io/google-containers
|
||||
REGISTRY?=staging-k8s.gcr.io
|
||||
IMAGE?=debian-hyperkube-base
|
||||
TAG=0.8
|
||||
TAG=0.9
|
||||
ARCH?=amd64
|
||||
CACHEBUST?=1
|
||||
|
||||
BASEIMAGE=gcr.io/google-containers/debian-base-$(ARCH):0.3
|
||||
BASEIMAGE=k8s.gcr.io/debian-base-$(ARCH):0.3
|
||||
CNI_VERSION=v0.6.0
|
||||
|
||||
TEMP_DIR:=$(shell mktemp -d)
|
||||
@ -57,4 +57,4 @@ endif
|
||||
rm -rf $(TEMP_DIR)
|
||||
|
||||
push: build
|
||||
gcloud docker -- push $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG)
|
||||
docker push $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG)
|
||||
|
12
vendor/k8s.io/kubernetes/build/debian-hyperkube-base/README.md
generated
vendored
12
vendor/k8s.io/kubernetes/build/debian-hyperkube-base/README.md
generated
vendored
@ -1,6 +1,6 @@
|
||||
### debian-hyperkube-base
|
||||
|
||||
Serves as the base image for `gcr.io/google-containers/hyperkube-${ARCH}`
|
||||
Serves as the base image for `k8s.gcr.io/hyperkube-${ARCH}`
|
||||
images.
|
||||
|
||||
This image is compiled for multiple architectures.
|
||||
@ -12,19 +12,19 @@ If you're editing the Dockerfile or some other thing, please bump the `TAG` in t
|
||||
```console
|
||||
# Build for linux/amd64 (default)
|
||||
$ make push ARCH=amd64
|
||||
# ---> gcr.io/google-containers/debian-hyperkube-base-amd64:TAG
|
||||
# ---> staging-k8s.gcr.io/debian-hyperkube-base-amd64:TAG
|
||||
|
||||
$ make push ARCH=arm
|
||||
# ---> gcr.io/google-containers/debian-hyperkube-base-arm:TAG
|
||||
# ---> staging-k8s.gcr.io/debian-hyperkube-base-arm:TAG
|
||||
|
||||
$ make push ARCH=arm64
|
||||
# ---> gcr.io/google-containers/debian-hyperkube-base-arm64:TAG
|
||||
# ---> staging-k8s.gcr.io/debian-hyperkube-base-arm64:TAG
|
||||
|
||||
$ make push ARCH=ppc64le
|
||||
# ---> gcr.io/google-containers/debian-hyperkube-base-ppc64le:TAG
|
||||
# ---> staging-k8s.gcr.io/debian-hyperkube-base-ppc64le:TAG
|
||||
|
||||
$ make push ARCH=s390x
|
||||
# ---> gcr.io/google-containers/debian-hyperkube-base-s390x:TAG
|
||||
# ---> staging-k8s.gcr.io/debian-hyperkube-base-s390x:TAG
|
||||
```
|
||||
|
||||
If you don't want to push the images, run `make build` instead
|
||||
|
6
vendor/k8s.io/kubernetes/build/debian-iptables/Makefile
generated
vendored
6
vendor/k8s.io/kubernetes/build/debian-iptables/Makefile
generated
vendored
@ -14,7 +14,7 @@
|
||||
|
||||
.PHONY: build push
|
||||
|
||||
REGISTRY?="gcr.io/google-containers"
|
||||
REGISTRY?="staging-k8s.gcr.io"
|
||||
IMAGE=debian-iptables
|
||||
TAG=v10
|
||||
ARCH?=amd64
|
||||
@ -34,7 +34,7 @@ ifeq ($(ARCH),s390x)
|
||||
QEMUARCH=s390x
|
||||
endif
|
||||
|
||||
BASEIMAGE=gcr.io/google-containers/debian-base-$(ARCH):0.3
|
||||
BASEIMAGE=k8s.gcr.io/debian-base-$(ARCH):0.3
|
||||
|
||||
build:
|
||||
cp ./* $(TEMP_DIR)
|
||||
@ -55,6 +55,6 @@ endif
|
||||
docker build --pull -t $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG) $(TEMP_DIR)
|
||||
|
||||
push: build
|
||||
gcloud docker -- push $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG)
|
||||
docker push $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG)
|
||||
|
||||
all: push
|
||||
|
12
vendor/k8s.io/kubernetes/build/debian-iptables/README.md
generated
vendored
12
vendor/k8s.io/kubernetes/build/debian-iptables/README.md
generated
vendored
@ -1,6 +1,6 @@
|
||||
### debian-iptables
|
||||
|
||||
Serves as the base image for `gcr.io/google_containers/kube-proxy-${ARCH}` and multiarch (not `amd64`) `gcr.io/google_containers/flannel-${ARCH}` images.
|
||||
Serves as the base image for `k8s.gcr.io/kube-proxy-${ARCH}` and multiarch (not `amd64`) `k8s.gcr.io/flannel-${ARCH}` images.
|
||||
|
||||
This image is compiled for multiple architectures.
|
||||
|
||||
@ -11,19 +11,19 @@ If you're editing the Dockerfile or some other thing, please bump the `TAG` in t
|
||||
```console
|
||||
# Build for linux/amd64 (default)
|
||||
$ make push ARCH=amd64
|
||||
# ---> gcr.io/google_containers/debian-iptables-amd64:TAG
|
||||
# ---> staging-k8s.gcr.io/debian-iptables-amd64:TAG
|
||||
|
||||
$ make push ARCH=arm
|
||||
# ---> gcr.io/google_containers/debian-iptables-arm:TAG
|
||||
# ---> staging-k8s.gcr.io/debian-iptables-arm:TAG
|
||||
|
||||
$ make push ARCH=arm64
|
||||
# ---> gcr.io/google_containers/debian-iptables-arm64:TAG
|
||||
# ---> staging-k8s.gcr.io/debian-iptables-arm64:TAG
|
||||
|
||||
$ make push ARCH=ppc64le
|
||||
# ---> gcr.io/google_containers/debian-iptables-ppc64le:TAG
|
||||
# ---> staging-k8s.gcr.io/debian-iptables-ppc64le:TAG
|
||||
|
||||
$ make push ARCH=s390x
|
||||
# ---> gcr.io/google_containers/debian-iptables-s390x:TAG
|
||||
# ---> staging-k8s.gcr.io/debian-iptables-s390x:TAG
|
||||
```
|
||||
|
||||
If you don't want to push the images, run `make` or `make build` instead
|
||||
|
4
vendor/k8s.io/kubernetes/build/debs/BUILD
generated
vendored
4
vendor/k8s.io/kubernetes/build/debs/BUILD
generated
vendored
@ -1,8 +1,8 @@
|
||||
package(default_visibility = ["//visibility:public"])
|
||||
|
||||
load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar")
|
||||
load("@io_kubernetes_build//defs:deb.bzl", "k8s_deb", "deb_data")
|
||||
load("@io_kubernetes_build//defs:build.bzl", "release_filegroup")
|
||||
load("@io_kubernetes_build//defs:pkg.bzl", "pkg_tar")
|
||||
|
||||
# We do not include kube-scheduler, kube-controller-manager,
|
||||
# kube-apiserver, and kube-proxy in this list even though we
|
||||
@ -41,7 +41,7 @@ deb_data(
|
||||
name = "kube-scheduler",
|
||||
data = [
|
||||
{
|
||||
"files": ["//plugin/cmd/kube-scheduler"],
|
||||
"files": ["//cmd/kube-scheduler"],
|
||||
"mode": "0755",
|
||||
"dir": "/usr/bin",
|
||||
},
|
||||
|
100
vendor/k8s.io/kubernetes/build/lib/release.sh
generated
vendored
100
vendor/k8s.io/kubernetes/build/lib/release.sh
generated
vendored
@ -28,11 +28,7 @@ readonly RELEASE_STAGE="${LOCAL_OUTPUT_ROOT}/release-stage"
|
||||
readonly RELEASE_TARS="${LOCAL_OUTPUT_ROOT}/release-tars"
|
||||
readonly RELEASE_IMAGES="${LOCAL_OUTPUT_ROOT}/release-images"
|
||||
|
||||
KUBE_BUILD_HYPERKUBE=${KUBE_BUILD_HYPERKUBE:-n}
|
||||
if [[ -n "${KUBE_DOCKER_IMAGE_TAG-}" && -n "${KUBE_DOCKER_REGISTRY-}" ]]; then
|
||||
# retain legacy behavior of automatically building hyperkube during releases
|
||||
KUBE_BUILD_HYPERKUBE=y
|
||||
fi
|
||||
KUBE_BUILD_HYPERKUBE=${KUBE_BUILD_HYPERKUBE:-y}
|
||||
|
||||
# Validate a ci version
|
||||
#
|
||||
@ -82,7 +78,6 @@ function kube::release::package_tarballs() {
|
||||
mkdir -p "${RELEASE_TARS}"
|
||||
kube::release::package_src_tarball &
|
||||
kube::release::package_client_tarballs &
|
||||
kube::release::package_salt_tarball &
|
||||
kube::release::package_kube_manifests_tarball &
|
||||
kube::util::wait-for-jobs || { kube::log::error "previous tarball phase failed"; return 1; }
|
||||
|
||||
@ -289,7 +284,11 @@ function kube::release::create_docker_images_for_server() {
|
||||
local images_dir="${RELEASE_IMAGES}/${arch}"
|
||||
mkdir -p "${images_dir}"
|
||||
|
||||
local -r docker_registry="gcr.io/google_containers"
|
||||
local -r docker_registry="k8s.gcr.io"
|
||||
# TODO(thockin): Remove all traces of this after 1.10 release.
|
||||
# The following is the old non-indirected registry name. To ease the
|
||||
# transition to the new name (above), we are double-tagging saved images.
|
||||
local -r deprecated_registry="gcr.io/google_containers"
|
||||
# Docker tags cannot contain '+'
|
||||
local docker_tag="${KUBE_GIT_VERSION/+/_}"
|
||||
if [[ -z "${docker_tag}" ]]; then
|
||||
@ -310,14 +309,17 @@ function kube::release::create_docker_images_for_server() {
|
||||
local docker_file_path="${docker_build_path}/Dockerfile"
|
||||
local binary_file_path="${binary_dir}/${binary_name}"
|
||||
local docker_image_tag="${docker_registry}"
|
||||
local deprecated_image_tag="${deprecated_registry}"
|
||||
if [[ ${arch} == "amd64" ]]; then
|
||||
# If we are building a amd64 docker image, preserve the original
|
||||
# image name
|
||||
docker_image_tag+="/${binary_name}:${docker_tag}"
|
||||
deprecated_image_tag+="/${binary_name}:${docker_tag}"
|
||||
else
|
||||
# If we are building a docker image for another architecture,
|
||||
# append the arch in the image tag
|
||||
docker_image_tag+="/${binary_name}-${arch}:${docker_tag}"
|
||||
deprecated_image_tag+="/${binary_name}-${arch}:${docker_tag}"
|
||||
fi
|
||||
|
||||
|
||||
@ -329,7 +331,8 @@ function kube::release::create_docker_images_for_server() {
|
||||
printf " FROM ${base_image} \n ADD ${binary_name} /usr/local/bin/${binary_name}\n" > ${docker_file_path}
|
||||
|
||||
"${DOCKER[@]}" build --pull -q -t "${docker_image_tag}" ${docker_build_path} >/dev/null
|
||||
"${DOCKER[@]}" save "${docker_image_tag}" > "${binary_dir}/${binary_name}.tar"
|
||||
"${DOCKER[@]}" tag "${docker_image_tag}" ${deprecated_image_tag} >/dev/null
|
||||
"${DOCKER[@]}" save "${docker_image_tag}" ${deprecated_image_tag} > "${binary_dir}/${binary_name}.tar"
|
||||
echo "${docker_tag}" > ${binary_dir}/${binary_name}.docker_tag
|
||||
rm -rf ${docker_build_path}
|
||||
ln "${binary_dir}/${binary_name}.tar" "${images_dir}/"
|
||||
@ -348,6 +351,7 @@ function kube::release::create_docker_images_for_server() {
|
||||
# not a release
|
||||
kube::log::status "Deleting docker image ${docker_image_tag}"
|
||||
"${DOCKER[@]}" rmi ${docker_image_tag} &>/dev/null || true
|
||||
"${DOCKER[@]}" rmi ${deprecated_image_tag} &>/dev/null || true
|
||||
fi
|
||||
) &
|
||||
done
|
||||
@ -363,71 +367,38 @@ function kube::release::create_docker_images_for_server() {
|
||||
|
||||
}
|
||||
|
||||
# Package up the salt configuration tree. This is an optional helper to getting
|
||||
# a cluster up and running.
|
||||
function kube::release::package_salt_tarball() {
|
||||
kube::log::status "Building tarball: salt"
|
||||
|
||||
local release_stage="${RELEASE_STAGE}/salt/kubernetes"
|
||||
rm -rf "${release_stage}"
|
||||
mkdir -p "${release_stage}"
|
||||
|
||||
cp -R "${KUBE_ROOT}/cluster/saltbase" "${release_stage}/"
|
||||
|
||||
# TODO(#3579): This is a temporary hack. It gathers up the yaml,
|
||||
# yaml.in, json files in cluster/addons (minus any demos) and overlays
|
||||
# them into kube-addons, where we expect them. (This pipeline is a
|
||||
# fancy copy, stripping anything but the files we don't want.)
|
||||
local objects
|
||||
objects=$(cd "${KUBE_ROOT}/cluster/addons" && find . \( -name \*.yaml -or -name \*.yaml.in -or -name \*.json \) | grep -v demo)
|
||||
tar c -C "${KUBE_ROOT}/cluster/addons" ${objects} | tar x -C "${release_stage}/saltbase/salt/kube-addons"
|
||||
|
||||
kube::release::clean_cruft
|
||||
|
||||
local package_name="${RELEASE_TARS}/kubernetes-salt.tar.gz"
|
||||
kube::release::create_tarball "${package_name}" "${release_stage}/.."
|
||||
}
|
||||
|
||||
# This will pack kube-system manifests files for distros without using salt
|
||||
# such as GCI and Ubuntu Trusty. We directly copy manifests from
|
||||
# cluster/addons and cluster/saltbase/salt. The script of cluster initialization
|
||||
# will remove the salt configuration and evaluate the variables in the manifests.
|
||||
# This will pack kube-system manifests files for distros such as COS.
|
||||
function kube::release::package_kube_manifests_tarball() {
|
||||
kube::log::status "Building tarball: manifests"
|
||||
|
||||
local salt_dir="${KUBE_ROOT}/cluster/saltbase/salt"
|
||||
local src_dir="${KUBE_ROOT}/cluster/gce/manifests"
|
||||
|
||||
local release_stage="${RELEASE_STAGE}/manifests/kubernetes"
|
||||
rm -rf "${release_stage}"
|
||||
|
||||
mkdir -p "${release_stage}"
|
||||
cp "${salt_dir}/kube-registry-proxy/kube-registry-proxy.yaml" "${release_stage}/"
|
||||
cp "${salt_dir}/kube-proxy/kube-proxy.manifest" "${release_stage}/"
|
||||
|
||||
local gci_dst_dir="${release_stage}/gci-trusty"
|
||||
mkdir -p "${gci_dst_dir}"
|
||||
cp "${salt_dir}/cluster-autoscaler/cluster-autoscaler.manifest" "${gci_dst_dir}/"
|
||||
cp "${salt_dir}/etcd/etcd.manifest" "${gci_dst_dir}"
|
||||
cp "${salt_dir}/kube-scheduler/kube-scheduler.manifest" "${gci_dst_dir}"
|
||||
cp "${salt_dir}/kube-apiserver/kube-apiserver.manifest" "${gci_dst_dir}"
|
||||
cp "${salt_dir}/kube-apiserver/abac-authz-policy.jsonl" "${gci_dst_dir}"
|
||||
cp "${salt_dir}/kube-controller-manager/kube-controller-manager.manifest" "${gci_dst_dir}"
|
||||
cp "${salt_dir}/kube-addons/kube-addon-manager.yaml" "${gci_dst_dir}"
|
||||
cp "${salt_dir}/l7-gcp/glbc.manifest" "${gci_dst_dir}"
|
||||
cp "${salt_dir}/rescheduler/rescheduler.manifest" "${gci_dst_dir}/"
|
||||
cp "${salt_dir}/e2e-image-puller/e2e-image-puller.manifest" "${gci_dst_dir}/"
|
||||
cp "${KUBE_ROOT}/cluster/gce/gci/configure-helper.sh" "${gci_dst_dir}/gci-configure-helper.sh"
|
||||
cp "${KUBE_ROOT}/cluster/gce/gci/health-monitor.sh" "${gci_dst_dir}/health-monitor.sh"
|
||||
cp "${KUBE_ROOT}/cluster/gce/container-linux/configure-helper.sh" "${gci_dst_dir}/container-linux-configure-helper.sh"
|
||||
cp -r "${salt_dir}/kube-admission-controls/limit-range" "${gci_dst_dir}"
|
||||
local dst_dir="${release_stage}/gci-trusty"
|
||||
mkdir -p "${dst_dir}"
|
||||
cp "${src_dir}/kube-proxy.manifest" "${dst_dir}/"
|
||||
cp "${src_dir}/cluster-autoscaler.manifest" "${dst_dir}/"
|
||||
cp "${src_dir}/etcd.manifest" "${dst_dir}"
|
||||
cp "${src_dir}/kube-scheduler.manifest" "${dst_dir}"
|
||||
cp "${src_dir}/kube-apiserver.manifest" "${dst_dir}"
|
||||
cp "${src_dir}/abac-authz-policy.jsonl" "${dst_dir}"
|
||||
cp "${src_dir}/kube-controller-manager.manifest" "${dst_dir}"
|
||||
cp "${src_dir}/kube-addon-manager.yaml" "${dst_dir}"
|
||||
cp "${src_dir}/glbc.manifest" "${dst_dir}"
|
||||
cp "${src_dir}/rescheduler.manifest" "${dst_dir}/"
|
||||
cp "${src_dir}/e2e-image-puller.manifest" "${dst_dir}/"
|
||||
cp "${KUBE_ROOT}/cluster/gce/gci/configure-helper.sh" "${dst_dir}/gci-configure-helper.sh"
|
||||
cp "${KUBE_ROOT}/cluster/gce/gci/health-monitor.sh" "${dst_dir}/health-monitor.sh"
|
||||
local objects
|
||||
objects=$(cd "${KUBE_ROOT}/cluster/addons" && find . \( -name \*.yaml -or -name \*.yaml.in -or -name \*.json \) | grep -v demo)
|
||||
tar c -C "${KUBE_ROOT}/cluster/addons" ${objects} | tar x -C "${gci_dst_dir}"
|
||||
tar c -C "${KUBE_ROOT}/cluster/addons" ${objects} | tar x -C "${dst_dir}"
|
||||
# Merge GCE-specific addons with general purpose addons.
|
||||
local gce_objects
|
||||
gce_objects=$(cd "${KUBE_ROOT}/cluster/gce/addons" && find . \( -name \*.yaml -or -name \*.yaml.in -or -name \*.json \) \( -not -name \*demo\* \))
|
||||
if [[ -n "${gce_objects}" ]]; then
|
||||
tar c -C "${KUBE_ROOT}/cluster/gce/addons" ${gce_objects} | tar x -C "${gci_dst_dir}"
|
||||
tar c -C "${KUBE_ROOT}/cluster/gce/addons" ${gce_objects} | tar x -C "${dst_dir}"
|
||||
fi
|
||||
|
||||
kube::release::clean_cruft
|
||||
@ -476,8 +447,7 @@ function kube::release::package_test_tarball() {
|
||||
# using the bundled cluster/get-kube-binaries.sh script).
|
||||
# Included in this tarball:
|
||||
# - Cluster spin up/down scripts and configs for various cloud providers
|
||||
# - Tarballs for salt configs that are ready to be uploaded
|
||||
# to master by whatever means appropriate.
|
||||
# - Tarballs for manifest configs that are ready to be uploaded
|
||||
# - Examples (which may or may not still work)
|
||||
# - The remnants of the docs/ directory
|
||||
function kube::release::package_final_tarball() {
|
||||
@ -496,13 +466,10 @@ Client binaries are no longer included in the Kubernetes final tarball.
|
||||
Run cluster/get-kube-binaries.sh to download client and server binaries.
|
||||
EOF
|
||||
|
||||
# We want everything in /cluster except saltbase. That is only needed on the
|
||||
# server.
|
||||
# We want everything in /cluster.
|
||||
cp -R "${KUBE_ROOT}/cluster" "${release_stage}/"
|
||||
rm -rf "${release_stage}/cluster/saltbase"
|
||||
|
||||
mkdir -p "${release_stage}/server"
|
||||
cp "${RELEASE_TARS}/kubernetes-salt.tar.gz" "${release_stage}/server/"
|
||||
cp "${RELEASE_TARS}/kubernetes-manifests.tar.gz" "${release_stage}/server/"
|
||||
cat <<EOF > "${release_stage}/server/README"
|
||||
Server binary tarballs are no longer included in the Kubernetes final tarball.
|
||||
@ -521,7 +488,6 @@ EOF
|
||||
cp -R "${KUBE_ROOT}/docs" "${release_stage}/"
|
||||
cp "${KUBE_ROOT}/README.md" "${release_stage}/"
|
||||
cp "${KUBE_ROOT}/Godeps/LICENSES" "${release_stage}/"
|
||||
cp "${KUBE_ROOT}/Vagrantfile" "${release_stage}/"
|
||||
|
||||
echo "${KUBE_GIT_VERSION}" > "${release_stage}/version"
|
||||
|
||||
|
15
vendor/k8s.io/kubernetes/build/openapi.bzl
generated
vendored
15
vendor/k8s.io/kubernetes/build/openapi.bzl
generated
vendored
@ -1,3 +1,17 @@
|
||||
# Copyright 2017 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.
|
||||
|
||||
# A project wanting to generate openapi code for vendored
|
||||
# k8s.io/kubernetes will need to set the following variables in
|
||||
# //build/openapi.bzl in their project and customize the go prefix:
|
||||
@ -6,4 +20,5 @@
|
||||
# openapi_vendor_prefix = "vendor/k8s.io/kubernetes/"
|
||||
|
||||
openapi_go_prefix = "k8s.io/kubernetes/"
|
||||
|
||||
openapi_vendor_prefix = ""
|
||||
|
8
vendor/k8s.io/kubernetes/build/pause/CHANGELOG.md
generated
vendored
Normal file
8
vendor/k8s.io/kubernetes/build/pause/CHANGELOG.md
generated
vendored
Normal file
@ -0,0 +1,8 @@
|
||||
# 3.1
|
||||
|
||||
* The pause container gains a signal handler to clean up orphaned zombie processes. ([#36853](https://prs.k8s.io/36853), [@verb](https://github.com/verb))
|
||||
* `pause -v` will return build information for the pause binary. ([#56762](https://prs.k8s.io/56762), [@verb](https://github.com/verb))
|
||||
|
||||
# 3.0
|
||||
|
||||
* The pause container was rewritten entirely in C. ([#23009](https://prs.k8s.io/23009), [@uluyol](https://github.com/uluyol))
|
41
vendor/k8s.io/kubernetes/build/pause/Makefile
generated
vendored
41
vendor/k8s.io/kubernetes/build/pause/Makefile
generated
vendored
@ -12,21 +12,24 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
.PHONY: all push push-legacy container clean orphan
|
||||
.PHONY: all push container clean orphan all-push push-manifest
|
||||
|
||||
REGISTRY ?= gcr.io/google_containers
|
||||
IMAGE = $(REGISTRY)/pause-$(ARCH)
|
||||
LEGACY_AMD64_IMAGE = $(REGISTRY)/pause
|
||||
include ../../hack/make-rules/Makefile.manifest
|
||||
|
||||
TAG = 3.0
|
||||
REGISTRY ?= staging-k8s.gcr.io
|
||||
IMAGE = $(REGISTRY)/pause
|
||||
IMAGE_WITH_ARCH = $(IMAGE)-$(ARCH)
|
||||
|
||||
TAG = 3.1
|
||||
REV = $(shell git describe --contains --always --match='v*')
|
||||
|
||||
# Architectures supported: amd64, arm, arm64, ppc64le and s390x
|
||||
ARCH ?= amd64
|
||||
|
||||
ALL_ARCH = amd64 arm arm64 ppc64le s390x
|
||||
|
||||
CFLAGS = -Os -Wall -Werror -static
|
||||
KUBE_CROSS_IMAGE ?= gcr.io/google_containers/kube-cross
|
||||
CFLAGS = -Os -Wall -Werror -static -DVERSION=v$(TAG)-$(REV)
|
||||
KUBE_CROSS_IMAGE ?= k8s.gcr.io/kube-cross
|
||||
KUBE_CROSS_VERSION ?= $(shell cat ../build-image/cross/VERSION)
|
||||
|
||||
BIN = pause
|
||||
@ -37,7 +40,7 @@ ifeq ($(ARCH),amd64)
|
||||
endif
|
||||
|
||||
ifeq ($(ARCH),arm)
|
||||
TRIPLE ?= arm-linux-gnueabi
|
||||
TRIPLE ?= arm-linux-gnueabihf
|
||||
endif
|
||||
|
||||
ifeq ($(ARCH),arm64)
|
||||
@ -55,6 +58,11 @@ endif
|
||||
# If you want to build AND push all containers, see the 'all-push' rule.
|
||||
all: all-container
|
||||
|
||||
all-push: all-push-images push-manifest
|
||||
|
||||
push-manifest: manifest-tool
|
||||
manifest-tool push from-args --platforms $(call join_platforms,$(ALL_ARCH)) --template $(IMAGE)-ARCH:$(TAG) --target $(IMAGE):$(TAG)
|
||||
|
||||
sub-container-%:
|
||||
$(MAKE) ARCH=$* container
|
||||
|
||||
@ -63,7 +71,7 @@ sub-push-%:
|
||||
|
||||
all-container: $(addprefix sub-container-,$(ALL_ARCH))
|
||||
|
||||
all-push: $(addprefix sub-push-,$(ALL_ARCH))
|
||||
all-push-images: $(addprefix sub-push-,$(ALL_ARCH))
|
||||
|
||||
build: bin/$(BIN)-$(ARCH)
|
||||
|
||||
@ -78,23 +86,12 @@ bin/$(BIN)-$(ARCH): $(SRCS)
|
||||
|
||||
container: .container-$(ARCH)
|
||||
.container-$(ARCH): bin/$(BIN)-$(ARCH)
|
||||
docker build --pull -t $(IMAGE):$(TAG) --build-arg ARCH=$(ARCH) .
|
||||
ifeq ($(ARCH),amd64)
|
||||
docker rmi $(LEGACY_AMD64_IMAGE):$(TAG) 2>/dev/null || true
|
||||
docker tag $(IMAGE):$(TAG) $(LEGACY_AMD64_IMAGE):$(TAG)
|
||||
endif
|
||||
docker build --pull -t $(IMAGE_WITH_ARCH):$(TAG) --build-arg ARCH=$(ARCH) .
|
||||
touch $@
|
||||
|
||||
push: .push-$(ARCH)
|
||||
.push-$(ARCH): .container-$(ARCH)
|
||||
gcloud docker -- push $(IMAGE):$(TAG)
|
||||
touch $@
|
||||
|
||||
push-legacy: .push-legacy-$(ARCH)
|
||||
.push-legacy-$(ARCH): .container-$(ARCH)
|
||||
ifeq ($(ARCH),amd64)
|
||||
gcloud docker -- push $(LEGACY_AMD64_IMAGE):$(TAG)
|
||||
endif
|
||||
docker push $(IMAGE_WITH_ARCH):$(TAG)
|
||||
touch $@
|
||||
|
||||
# Useful for testing, not automatically included in container image
|
||||
|
21
vendor/k8s.io/kubernetes/build/pause/pause.c
generated
vendored
21
vendor/k8s.io/kubernetes/build/pause/pause.c
generated
vendored
@ -17,20 +17,37 @@ limitations under the License.
|
||||
#include <signal.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/wait.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#define STRINGIFY(x) #x
|
||||
#define VERSION_STRING(x) STRINGIFY(x)
|
||||
|
||||
#ifndef VERSION
|
||||
#define VERSION HEAD
|
||||
#endif
|
||||
|
||||
static void sigdown(int signo) {
|
||||
psignal(signo, "Shutting down, got signal");
|
||||
exit(0);
|
||||
}
|
||||
|
||||
static void sigreap(int signo) {
|
||||
while (waitpid(-1, NULL, WNOHANG) > 0);
|
||||
while (waitpid(-1, NULL, WNOHANG) > 0)
|
||||
;
|
||||
}
|
||||
|
||||
int main() {
|
||||
int main(int argc, char **argv) {
|
||||
int i;
|
||||
for (i = 1; i < argc; ++i) {
|
||||
if (!strcasecmp(argv[i], "-v")) {
|
||||
printf("pause.c %s\n", VERSION_STRING(VERSION));
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
if (getpid() != 1)
|
||||
/* Not an error because pause sees use outside of infra containers. */
|
||||
fprintf(stderr, "Warning: pause should be the first process\n");
|
||||
|
66
vendor/k8s.io/kubernetes/build/release-tars/BUILD
generated
vendored
66
vendor/k8s.io/kubernetes/build/release-tars/BUILD
generated
vendored
@ -1,7 +1,7 @@
|
||||
package(default_visibility = ["//visibility:public"])
|
||||
|
||||
load("@io_bazel//tools/build_defs/pkg:pkg.bzl", "pkg_tar")
|
||||
load("@io_kubernetes_build//defs:build.bzl", "release_filegroup")
|
||||
load("@io_kubernetes_build//defs:pkg.bzl", "pkg_tar")
|
||||
|
||||
filegroup(
|
||||
name = "package-srcs",
|
||||
@ -38,17 +38,17 @@ grep ^STABLE_BUILD_GIT_COMMIT bazel-out/stable-status.txt | cut -d' ' -f2 >>$@
|
||||
|
||||
pkg_tar(
|
||||
name = "kubernetes-src",
|
||||
build_tar = "@io_kubernetes_build//tools/build_tar",
|
||||
extension = "tar.gz",
|
||||
files = select({
|
||||
srcs = select({
|
||||
":package_src": ["//:all-srcs"],
|
||||
"//conditions:default": ["README-src.txt"],
|
||||
}),
|
||||
extension = "tar.gz",
|
||||
package_dir = "kubernetes",
|
||||
strip_prefix = select({
|
||||
":package_src": "//",
|
||||
"//conditions:default": ".",
|
||||
}),
|
||||
tags = ["no-cache"],
|
||||
)
|
||||
|
||||
# FIXME: this should be configurable/auto-detected
|
||||
@ -66,18 +66,18 @@ filegroup(
|
||||
|
||||
pkg_tar(
|
||||
name = "_client-bin",
|
||||
build_tar = "@io_kubernetes_build//tools/build_tar",
|
||||
files = ["//build:client-targets"],
|
||||
srcs = ["//build:client-targets"],
|
||||
mode = "0755",
|
||||
package_dir = "client/bin",
|
||||
tags = ["no-cache"],
|
||||
visibility = ["//visibility:private"],
|
||||
)
|
||||
|
||||
pkg_tar(
|
||||
name = "kubernetes-client-%s" % PLATFORM_ARCH_STRING,
|
||||
build_tar = "@io_kubernetes_build//tools/build_tar",
|
||||
extension = "tar.gz",
|
||||
package_dir = "kubernetes",
|
||||
tags = ["no-cache"],
|
||||
deps = [
|
||||
":_client-bin",
|
||||
],
|
||||
@ -85,23 +85,23 @@ pkg_tar(
|
||||
|
||||
pkg_tar(
|
||||
name = "_node-bin",
|
||||
build_tar = "@io_kubernetes_build//tools/build_tar",
|
||||
files = [
|
||||
srcs = [
|
||||
"//build:client-targets",
|
||||
"//build:node-targets",
|
||||
],
|
||||
mode = "0755",
|
||||
package_dir = "node/bin",
|
||||
tags = ["no-cache"],
|
||||
visibility = ["//visibility:private"],
|
||||
)
|
||||
|
||||
pkg_tar(
|
||||
name = "kubernetes-node-%s" % PLATFORM_ARCH_STRING,
|
||||
build_tar = "@io_kubernetes_build//tools/build_tar",
|
||||
srcs = [":license-targets"],
|
||||
extension = "tar.gz",
|
||||
files = [":license-targets"],
|
||||
mode = "0644",
|
||||
package_dir = "kubernetes",
|
||||
tags = ["no-cache"],
|
||||
deps = [
|
||||
":_node-bin",
|
||||
],
|
||||
@ -109,8 +109,7 @@ pkg_tar(
|
||||
|
||||
pkg_tar(
|
||||
name = "_server-bin",
|
||||
build_tar = "@io_kubernetes_build//tools/build_tar",
|
||||
files = [
|
||||
srcs = [
|
||||
"//build:client-targets",
|
||||
"//build:docker-artifacts",
|
||||
"//build:node-targets",
|
||||
@ -118,6 +117,7 @@ pkg_tar(
|
||||
],
|
||||
mode = "0755",
|
||||
package_dir = "server/bin",
|
||||
tags = ["no-cache"],
|
||||
visibility = ["//visibility:private"],
|
||||
)
|
||||
|
||||
@ -131,21 +131,21 @@ genrule(
|
||||
# Some of the startup scripts fail if there isn't an addons/ directory in the server tarball.
|
||||
pkg_tar(
|
||||
name = "_server-addons",
|
||||
build_tar = "@io_kubernetes_build//tools/build_tar",
|
||||
files = [
|
||||
srcs = [
|
||||
":.dummy",
|
||||
],
|
||||
package_dir = "addons",
|
||||
tags = ["no-cache"],
|
||||
visibility = ["//visibility:private"],
|
||||
)
|
||||
|
||||
pkg_tar(
|
||||
name = "kubernetes-server-%s" % PLATFORM_ARCH_STRING,
|
||||
build_tar = "@io_kubernetes_build//tools/build_tar",
|
||||
srcs = [":license-targets"],
|
||||
extension = "tar.gz",
|
||||
files = [":license-targets"],
|
||||
mode = "0644",
|
||||
package_dir = "kubernetes",
|
||||
tags = ["no-cache"],
|
||||
deps = [
|
||||
":_server-addons",
|
||||
":_server-bin",
|
||||
@ -154,21 +154,21 @@ pkg_tar(
|
||||
|
||||
pkg_tar(
|
||||
name = "_test-bin",
|
||||
build_tar = "@io_kubernetes_build//tools/build_tar",
|
||||
files = ["//build:test-targets"],
|
||||
srcs = ["//build:test-targets"],
|
||||
mode = "0755",
|
||||
package_dir = "platforms/" + PLATFORM_ARCH_STRING.replace("-", "/"),
|
||||
tags = ["no-cache"],
|
||||
# TODO: how to make this multiplatform?
|
||||
visibility = ["//visibility:private"],
|
||||
)
|
||||
|
||||
pkg_tar(
|
||||
name = "kubernetes-test",
|
||||
build_tar = "@io_kubernetes_build//tools/build_tar",
|
||||
srcs = ["//build:test-portable-targets"],
|
||||
extension = "tar.gz",
|
||||
files = ["//build:test-portable-targets"],
|
||||
package_dir = "kubernetes",
|
||||
strip_prefix = "//",
|
||||
tags = ["no-cache"],
|
||||
deps = [
|
||||
# TODO: how to make this multiplatform?
|
||||
":_test-bin",
|
||||
@ -177,23 +177,19 @@ pkg_tar(
|
||||
|
||||
pkg_tar(
|
||||
name = "_full_server",
|
||||
build_tar = "@io_kubernetes_build//tools/build_tar",
|
||||
files = [
|
||||
srcs = [
|
||||
":kubernetes-manifests.tar.gz",
|
||||
":kubernetes-salt.tar.gz",
|
||||
],
|
||||
package_dir = "server",
|
||||
tags = ["no-cache"],
|
||||
visibility = ["//visibility:private"],
|
||||
)
|
||||
|
||||
pkg_tar(
|
||||
name = "kubernetes",
|
||||
build_tar = "@io_kubernetes_build//tools/build_tar",
|
||||
extension = "tar.gz",
|
||||
files = [
|
||||
srcs = [
|
||||
"//:Godeps/LICENSES",
|
||||
"//:README.md",
|
||||
"//:Vagrantfile",
|
||||
"//:version",
|
||||
"//cluster:all-srcs",
|
||||
"//docs:all-srcs",
|
||||
@ -201,8 +197,10 @@ pkg_tar(
|
||||
"//hack/lib:all-srcs",
|
||||
"//third_party/htpasswd:all-srcs",
|
||||
],
|
||||
extension = "tar.gz",
|
||||
package_dir = "kubernetes",
|
||||
strip_prefix = "//",
|
||||
tags = ["no-cache"],
|
||||
deps = [
|
||||
":_full_server",
|
||||
],
|
||||
@ -210,22 +208,13 @@ pkg_tar(
|
||||
|
||||
pkg_tar(
|
||||
name = "kubernetes-manifests",
|
||||
build_tar = "@io_kubernetes_build//tools/build_tar",
|
||||
extension = "tar.gz",
|
||||
tags = ["no-cache"],
|
||||
deps = [
|
||||
"//cluster:manifests",
|
||||
],
|
||||
)
|
||||
|
||||
pkg_tar(
|
||||
name = "kubernetes-salt",
|
||||
build_tar = "@io_kubernetes_build//tools/build_tar",
|
||||
extension = "tar.gz",
|
||||
deps = [
|
||||
"//cluster/saltbase:salt",
|
||||
],
|
||||
)
|
||||
|
||||
release_filegroup(
|
||||
name = "release-tars",
|
||||
srcs = [
|
||||
@ -234,7 +223,6 @@ release_filegroup(
|
||||
":kubernetes-node-%s.tar.gz" % PLATFORM_ARCH_STRING,
|
||||
":kubernetes-server-%s.tar.gz" % PLATFORM_ARCH_STRING,
|
||||
":kubernetes-manifests.tar.gz",
|
||||
":kubernetes-salt.tar.gz",
|
||||
":kubernetes-src.tar.gz",
|
||||
":kubernetes-test.tar.gz",
|
||||
],
|
||||
|
9
vendor/k8s.io/kubernetes/build/root/.bazelrc
generated
vendored
9
vendor/k8s.io/kubernetes/build/root/.bazelrc
generated
vendored
@ -1,3 +1,5 @@
|
||||
startup --expand_configs_in_place
|
||||
|
||||
# Show us information about failures.
|
||||
build --verbose_failures
|
||||
test --test_output=errors
|
||||
@ -13,4 +15,9 @@ build --sandbox_tmpfs_path=/tmp
|
||||
build --sandbox_fake_username
|
||||
|
||||
# Enable go race detection.
|
||||
test --features=race
|
||||
test:unit --features=race
|
||||
test:unit --test_tag_filters=-e2e,-integration
|
||||
test:unit --flaky_test_attempts=3
|
||||
|
||||
test:integration --local_test_jobs 4
|
||||
test:integration --test_tag_filters=integration
|
||||
|
1
vendor/k8s.io/kubernetes/build/root/BUILD.root
generated
vendored
1
vendor/k8s.io/kubernetes/build/root/BUILD.root
generated
vendored
@ -2,6 +2,7 @@
|
||||
# gazelle:exclude _gopath
|
||||
# gazelle:exclude _output
|
||||
# gazelle:exclude _tmp
|
||||
# gazelle:prefix k8s.io/kubernetes
|
||||
|
||||
package(default_visibility = ["//visibility:public"])
|
||||
|
||||
|
29
vendor/k8s.io/kubernetes/build/root/Makefile
generated
vendored
29
vendor/k8s.io/kubernetes/build/root/Makefile
generated
vendored
@ -123,7 +123,7 @@ verify:
|
||||
@echo "$$VERIFY_HELP_INFO"
|
||||
else
|
||||
verify: verify_generated_files
|
||||
KUBE_VERIFY_GIT_BRANCH=$(BRANCH) hack/make-rules/verify.sh -v
|
||||
KUBE_VERIFY_GIT_BRANCH=$(BRANCH) hack/make-rules/verify.sh
|
||||
endif
|
||||
|
||||
define QUICK_VERIFY_HELP_INFO
|
||||
@ -138,7 +138,7 @@ quick-verify:
|
||||
@echo "$$QUICK_VERIFY_HELP_INFO"
|
||||
else
|
||||
quick-verify: verify_generated_files
|
||||
hack/make-rules/verify.sh -v -Q
|
||||
QUICK=true SILENT=false hack/make-rules/verify.sh
|
||||
endif
|
||||
|
||||
define UPDATE_HELP_INFO
|
||||
@ -149,11 +149,11 @@ define UPDATE_HELP_INFO
|
||||
endef
|
||||
.PHONY: update
|
||||
ifeq ($(PRINT_HELP),y)
|
||||
update:
|
||||
update: generated_files
|
||||
@echo "$$UPDATE_HELP_INFO"
|
||||
else
|
||||
update:
|
||||
hack/update-all.sh
|
||||
CALLED_FROM_MAIN_MAKEFILE=1 hack/make-rules/update.sh
|
||||
endif
|
||||
|
||||
define CHECK_TEST_HELP_INFO
|
||||
@ -389,7 +389,7 @@ define RELEASE_SKIP_TESTS_HELP_INFO
|
||||
#
|
||||
# Args:
|
||||
# KUBE_RELEASE_RUN_TESTS: Whether to run tests. Set to 'y' to run tests anyways.
|
||||
# KUBE_FASTBUILD: Whether to cross-compile for other architectures. Set to 'true' to do so.
|
||||
# KUBE_FASTBUILD: Whether to cross-compile for other architectures. Set to 'false' to do so.
|
||||
#
|
||||
# Example:
|
||||
# make release-skip-tests
|
||||
@ -466,21 +466,6 @@ $(filter-out %$(EXCLUDE_TARGET),$(notdir $(abspath $(wildcard cmd/*/)))): genera
|
||||
hack/make-rules/build.sh cmd/$@
|
||||
endif
|
||||
|
||||
define PLUGIN_CMD_HELP_INFO
|
||||
# Add rules for all directories in plugin/cmd/
|
||||
#
|
||||
# Example:
|
||||
# make kube-scheduler
|
||||
endef
|
||||
.PHONY: $(notdir $(abspath $(wildcard plugin/cmd/*/)))
|
||||
ifeq ($(PRINT_HELP),y)
|
||||
$(notdir $(abspath $(wildcard plugin/cmd/*/))):
|
||||
@echo "$$PLUGIN_CMD_HELP_INFO"
|
||||
else
|
||||
$(notdir $(abspath $(wildcard plugin/cmd/*/))): generated_files
|
||||
hack/make-rules/build.sh plugin/cmd/$@
|
||||
endif
|
||||
|
||||
define GENERATED_FILES_HELP_INFO
|
||||
# Produce auto-generated files needed for the build.
|
||||
#
|
||||
@ -559,7 +544,7 @@ else
|
||||
# We don't want to build any of the release artifacts when running tests.
|
||||
# Some things in vendor don't build due to empty target lists for cross-platform rules.
|
||||
bazel-test:
|
||||
bazel test --build_tag_filters=-e2e,-integration --test_tag_filters=-e2e,-integration --flaky_test_attempts=3 -- \
|
||||
bazel test --config=unit -- \
|
||||
//... \
|
||||
//hack:verify-all \
|
||||
-//build/... \
|
||||
@ -577,7 +562,7 @@ bazel-test-integration:
|
||||
@echo "$$BAZEL_TEST_INTEGRATION_HELP_INFO"
|
||||
else
|
||||
bazel-test-integration:
|
||||
bazel test //test/integration/...
|
||||
bazel test --config integration //test/integration/...
|
||||
endif
|
||||
|
||||
ifeq ($(PRINT_HELP),y)
|
||||
|
73
vendor/k8s.io/kubernetes/build/root/WORKSPACE
generated
vendored
73
vendor/k8s.io/kubernetes/build/root/WORKSPACE
generated
vendored
@ -1,37 +1,34 @@
|
||||
http_archive(
|
||||
name = "io_bazel_rules_go",
|
||||
sha256 = "441e560e947d8011f064bd7348d86940d6b6131ae7d7c4425a538e8d9f884274",
|
||||
strip_prefix = "rules_go-c72631a220406c4fae276861ee286aaec82c5af2",
|
||||
urls = ["https://github.com/bazelbuild/rules_go/archive/c72631a220406c4fae276861ee286aaec82c5af2.tar.gz"],
|
||||
sha256 = "66282d078c1847c2d876c02c5dabd4fd57cc75eb41a9668a2374352fa73b4587",
|
||||
strip_prefix = "rules_go-ff7e3364d9383cf14155f8c2efc87218d07eb03b",
|
||||
urls = ["https://github.com/bazelbuild/rules_go/archive/ff7e3364d9383cf14155f8c2efc87218d07eb03b.tar.gz"],
|
||||
)
|
||||
|
||||
http_archive(
|
||||
name = "io_kubernetes_build",
|
||||
sha256 = "89788eb30f10258ae0c6ab8b8625a28cb4c101fba93a8a6725ba227bb778ff27",
|
||||
strip_prefix = "repo-infra-653485c1a6d554513266d55683da451bd41f7d65",
|
||||
urls = ["https://github.com/kubernetes/repo-infra/archive/653485c1a6d554513266d55683da451bd41f7d65.tar.gz"],
|
||||
sha256 = "007774f06536059f3f782d1a092bddc625d88c17f20bbe731cea844a52485b11",
|
||||
strip_prefix = "repo-infra-97099dccc8807e9159dc28f374a8f0602cab07e1",
|
||||
urls = ["https://github.com/kubernetes/repo-infra/archive/97099dccc8807e9159dc28f374a8f0602cab07e1.tar.gz"],
|
||||
)
|
||||
|
||||
ETCD_VERSION = "3.1.10"
|
||||
http_archive(
|
||||
name = "bazel_skylib",
|
||||
sha256 = "bbccf674aa441c266df9894182d80de104cabd19be98be002f6d478aaa31574d",
|
||||
strip_prefix = "bazel-skylib-2169ae1c374aab4a09aa90e65efe1a3aad4e279b",
|
||||
urls = ["https://github.com/bazelbuild/bazel-skylib/archive/2169ae1c374aab4a09aa90e65efe1a3aad4e279b.tar.gz"],
|
||||
)
|
||||
|
||||
ETCD_VERSION = "3.2.14"
|
||||
|
||||
new_http_archive(
|
||||
name = "com_coreos_etcd",
|
||||
build_file = "third_party/etcd.BUILD",
|
||||
sha256 = "2d335f298619c6fb02b1124773a56966e448ad9952b26fea52909da4fe80d2be",
|
||||
sha256 = "f77398f558ff19b65a0bf978b47868e03683f27090c56c054415666b1d78bf42",
|
||||
strip_prefix = "etcd-v%s-linux-amd64" % ETCD_VERSION,
|
||||
urls = ["https://github.com/coreos/etcd/releases/download/v%s/etcd-v%s-linux-amd64.tar.gz" % (ETCD_VERSION, ETCD_VERSION)],
|
||||
)
|
||||
|
||||
# This contains a patch to not prepend ./ to tarfiles produced by pkg_tar.
|
||||
# When merged upstream, we'll no longer need to use ixdy's fork:
|
||||
# https://bazel-review.googlesource.com/#/c/10390/
|
||||
http_archive(
|
||||
name = "io_bazel",
|
||||
sha256 = "892a84aa1e7c1f99fb57bb056cb648745c513077252815324579a012d263defb",
|
||||
strip_prefix = "bazel-df2c687c22bdd7c76f3cdcc85f38fefd02f0b844",
|
||||
urls = ["https://github.com/ixdy/bazel/archive/df2c687c22bdd7c76f3cdcc85f38fefd02f0b844.tar.gz"],
|
||||
)
|
||||
|
||||
http_archive(
|
||||
name = "io_bazel_rules_docker",
|
||||
sha256 = "c440717ee9b1b2f4a1e9bf5622539feb5aef9db83fc1fa1517818f13c041b0be",
|
||||
@ -39,35 +36,17 @@ http_archive(
|
||||
urls = ["https://github.com/bazelbuild/rules_docker/archive/8bbe2a8abd382641e65ff7127a3700a8530f02ce.tar.gz"],
|
||||
)
|
||||
|
||||
load("@io_kubernetes_build//defs:bazel_version.bzl", "check_version")
|
||||
load("@bazel_skylib//:lib.bzl", "versions")
|
||||
|
||||
check_version("0.6.0")
|
||||
versions.check(minimum_bazel_version = "0.10.0")
|
||||
|
||||
load("@io_bazel_rules_go//go:def.bzl", "go_rules_dependencies", "go_register_toolchains", "go_download_sdk")
|
||||
load("@io_bazel_rules_docker//docker:docker.bzl", "docker_repositories", "docker_pull")
|
||||
|
||||
go_rules_dependencies()
|
||||
|
||||
# The upstream version of rules_go is broken in a number of ways. Until it's fixed, explicitly download and use go1.9.2 ourselves.
|
||||
go_download_sdk(
|
||||
name = "go_sdk",
|
||||
sdks = {
|
||||
"darwin_amd64": ("go1.9.2.darwin-amd64.tar.gz", "73fd5840d55f5566d8db6c0ffdd187577e8ebe650c783f68bd27cbf95bde6743"),
|
||||
"linux_386": ("go1.9.2.linux-386.tar.gz", "574b2c4b1a248e58ef7d1f825beda15429610a2316d9cbd3096d8d3fa8c0bc1a"),
|
||||
"linux_amd64": ("go1.9.2.linux-amd64.tar.gz", "de874549d9a8d8d8062be05808509c09a88a248e77ec14eb77453530829ac02b"),
|
||||
"linux_armv6l": ("go1.9.2.linux-armv6l.tar.gz", "8a6758c8d390e28ef2bcea511f62dcb43056f38c1addc06a8bc996741987e7bb"),
|
||||
"windows_386": ("go1.9.2.windows-386.zip", "35d3be5d7b97c6d11ffb76c1b19e20a824e427805ee918e82c08a2e5793eda20"),
|
||||
"windows_amd64": ("go1.9.2.windows-amd64.zip", "682ec3626a9c45b657c2456e35cadad119057408d37f334c6c24d88389c2164c"),
|
||||
"freebsd_386": ("go1.9.2.freebsd-386.tar.gz", "809dcb0a8457c8d0abf954f20311a1ee353486d0ae3f921e9478189721d37677"),
|
||||
"freebsd_amd64": ("go1.9.2.freebsd-amd64.tar.gz", "8be985c3e251c8e007fa6ecd0189bc53e65cc519f4464ddf19fa11f7ed251134"),
|
||||
"linux_arm64": ("go1.9.2.linux-arm64.tar.gz", "0016ac65ad8340c84f51bc11dbb24ee8265b0a4597dbfdf8d91776fc187456fa"),
|
||||
"linux_ppc64le": ("go1.9.2.linux-ppc64le.tar.gz", "adb440b2b6ae9e448c253a20836d8e8aa4236f731d87717d9c7b241998dc7f9d"),
|
||||
"linux_s390x": ("go1.9.2.linux-s390x.tar.gz", "a7137b4fbdec126823a12a4b696eeee2f04ec616e9fb8a54654c51d5884c1345"),
|
||||
},
|
||||
)
|
||||
|
||||
go_register_toolchains(
|
||||
go_version = "overridden by go_download_sdk",
|
||||
go_version = "1.9.3",
|
||||
)
|
||||
|
||||
docker_repositories()
|
||||
@ -80,23 +59,23 @@ http_file(
|
||||
|
||||
docker_pull(
|
||||
name = "debian-iptables-amd64",
|
||||
digest = "sha256:a3b936c0fb98a934eecd2cfb91f73658d402b29116084e778ce9ddb68e55383e",
|
||||
registry = "gcr.io",
|
||||
repository = "google-containers/debian-iptables-amd64",
|
||||
digest = "sha256:fb18678f8203ca1bd2fad2671e3ebd80cb408a1baae423d4ad39c05f4caac4e1",
|
||||
registry = "k8s.gcr.io",
|
||||
repository = "debian-iptables-amd64",
|
||||
tag = "v10", # ignored, but kept here for documentation
|
||||
)
|
||||
|
||||
docker_pull(
|
||||
name = "debian-hyperkube-base-amd64",
|
||||
digest = "sha256:fc1b461367730660ac5a40c1eb2d1b23221829acf8a892981c12361383b3742b",
|
||||
registry = "gcr.io",
|
||||
repository = "google-containers/debian-hyperkube-base-amd64",
|
||||
tag = "0.8", # ignored, but kept here for documentation
|
||||
digest = "sha256:d83594ecd85345144584523e7fa5388467edf5d2dfa30d0a1bcbf184cddf4a7b",
|
||||
registry = "k8s.gcr.io",
|
||||
repository = "debian-hyperkube-base-amd64",
|
||||
tag = "0.9", # ignored, but kept here for documentation
|
||||
)
|
||||
|
||||
docker_pull(
|
||||
name = "official_busybox",
|
||||
digest = "sha256:be3c11fdba7cfe299214e46edc642e09514dbb9bbefcd0d3836c05a1e0cd0642",
|
||||
digest = "sha256:4cee1979ba0bf7db9fc5d28fb7b798ca69ae95a47c5fecf46327720df4ff352d",
|
||||
registry = "index.docker.io",
|
||||
repository = "library/busybox",
|
||||
tag = "latest", # ignored, but kept here for documentation
|
||||
|
2
vendor/k8s.io/kubernetes/build/visible_to/BUILD
generated
vendored
2
vendor/k8s.io/kubernetes/build/visible_to/BUILD
generated
vendored
@ -210,7 +210,7 @@ package_group(
|
||||
"//cmd/clicheck",
|
||||
"//cmd/hyperkube",
|
||||
"//cmd/kube-proxy/app",
|
||||
"//plugin/cmd/kube-scheduler/app",
|
||||
"//cmd/kube-scheduler/app",
|
||||
],
|
||||
)
|
||||
|
||||
|
Reference in New Issue
Block a user