From b3ad67739a8f27a182001cf82a014ec5bd8a3297 Mon Sep 17 00:00:00 2001 From: Benjamin Elder Date: Wed, 15 Oct 2025 20:24:12 -0700 Subject: [PATCH] delete build-image we no longer need this now that we run kube-cross directly --- build/build-image/Dockerfile | 57 ------------------------- build/build-image/VERSION | 1 - build/build-image/rsyncd.sh | 83 ------------------------------------ 3 files changed, 141 deletions(-) delete mode 100644 build/build-image/Dockerfile delete mode 100644 build/build-image/VERSION delete mode 100755 build/build-image/rsyncd.sh diff --git a/build/build-image/Dockerfile b/build/build-image/Dockerfile deleted file mode 100644 index 4473935769b..00000000000 --- a/build/build-image/Dockerfile +++ /dev/null @@ -1,57 +0,0 @@ -# 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. - -# This file creates a standard build environment for building Kubernetes -ARG KUBE_CROSS_IMAGE -ARG KUBE_CROSS_VERSION - -FROM ${KUBE_CROSS_IMAGE}:${KUBE_CROSS_VERSION} - -# Mark this as a kube-build container -RUN touch /kube-build-image - -# To run as non-root we sometimes need to rebuild go stdlib packages. -RUN chmod -R a+rwx /usr/local/go/pkg - -# For running integration tests /var/run/kubernetes is required -# and should be writable by user -RUN mkdir /var/run/kubernetes && chmod a+rwx /var/run/kubernetes - -# The kubernetes source is expected to be mounted here. This will be the base -# of operations. -ENV HOME=/go/src/k8s.io/kubernetes -WORKDIR ${HOME} - -# Make output from the dockerized build go someplace else -ENV KUBE_OUTPUT_SUBPATH=_output/dockerized - -# Pick up version stuff here as we don't copy our .git over. -ENV KUBE_GIT_VERSION_FILE=${HOME}/.dockerized-kube-version-defs - -# Add system-wide git user information -RUN git config --system user.email "nobody@k8s.io" \ - && git config --system user.name "kube-build-image" - -# Fix permissions on gopath -RUN chmod -R a+rwx $GOPATH - -# Make log messages use the right timezone -ADD localtime /etc/localtime -RUN chmod a+r /etc/localtime - -# Set up rsyncd -ADD rsyncd.password / -RUN chmod a+r /rsyncd.password -ADD rsyncd.sh / -RUN chmod a+rx /rsyncd.sh diff --git a/build/build-image/VERSION b/build/build-image/VERSION deleted file mode 100644 index 7ed6ff82de6..00000000000 --- a/build/build-image/VERSION +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/build/build-image/rsyncd.sh b/build/build-image/rsyncd.sh deleted file mode 100755 index 2801fa6a387..00000000000 --- a/build/build-image/rsyncd.sh +++ /dev/null @@ -1,83 +0,0 @@ -#!/usr/bin/env bash - -# 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. - -# This script will set up and run rsyncd to allow data to move into and out of -# our dockerized build system. This is used for syncing sources and changes of -# sources into the docker-build-container. It is also used to transfer built binaries -# and generated files back out. -# -# When run as root (rare) it'll preserve the file ids as sent from the client. -# Usually it'll be run as non-dockerized UID/GID and end up translating all file -# ownership to that. - - -set -o errexit -set -o nounset -set -o pipefail - -# The directory that gets sync'd -VOLUME=${HOME} - -# Assume that this is running in Docker on a bridge. Allow connections from -# anything on the local subnet. -ALLOW=$(ip route | awk '/^default via/ { reg = "^[0-9./]+ dev "$5 } ; $0 ~ reg { print $1 }') - -CONFDIR="/tmp/rsync.k8s" -PIDFILE="${CONFDIR}/rsyncd.pid" -CONFFILE="${CONFDIR}/rsyncd.conf" -SECRETS="${CONFDIR}/rsyncd.secrets" - -mkdir -p "${CONFDIR}" - -if [[ -f "${PIDFILE}" ]]; then - PID=$(cat "${PIDFILE}") - echo "Cleaning up old PID file: ${PIDFILE}" - kill "${PID}" &> /dev/null || true - rm "${PIDFILE}" -fi - -PASSWORD=$("${SECRETS}" -k8s:${PASSWORD} -EOF -chmod go= "${SECRETS}" - -USER_CONFIG= -if [[ "$(id -u)" == "0" ]]; then - USER_CONFIG=" uid = 0"$'\n'" gid = 0" -fi - -cat <"${CONFFILE}" -pid file = ${PIDFILE} -use chroot = no -log file = /dev/stdout -reverse lookup = no -munge symlinks = no -port = 8730 -[k8s] - numeric ids = true - $USER_CONFIG - hosts deny = * - hosts allow = ${ALLOW} ${ALLOW_HOST-} - auth users = k8s - secrets file = ${SECRETS} - read only = false - path = ${VOLUME} - filter = - /_tmp/ -EOF - -exec /usr/bin/rsync --no-detach --daemon --config="${CONFFILE}" "$@"