Skip to content
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

Jump to bottom

base-images: Use new debian-base:v2.1.0 and build new debian-iptables:v12.1.0 #90697

Merged
merged 5 commits into from May 6, 2020
Merged

base-images: Use new debian-base:v2.1.0 and build new debian-iptables:v12.1.0 #90697

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0357843
build: Fixup GCB configs for debian-{base,iptables} images
justaugustus May 2, 2020
f828821
releng: Point debian-base image references to K8s Infra
justaugustus May 3, 2020
64300d8
deps: Update dependents to use debian-base:v2.1.0
justaugustus May 3, 2020
7109a86
build: Build debian-iptables:v12.1.0 image
justaugustus May 3, 2020
d95dcc6
cluster/images/etcd: Bump etcd image tags for new debian-base
justaugustus May 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions build/common.sh
View file
Open in desktop
Expand Up @@ -43,7 +43,7 @@ readonly KUBE_BUILD_IMAGE_REPO=kube-build
readonly KUBE_BUILD_IMAGE_CROSS_TAG="$(cat "${KUBE_ROOT}/build/build-image/cross/VERSION")"

readonly KUBE_DOCKER_REGISTRY="${KUBE_DOCKER_REGISTRY:-k8s.gcr.io}"
readonly KUBE_BASE_IMAGE_REGISTRY="${KUBE_BASE_IMAGE_REGISTRY:-k8s.gcr.io}"
readonly KUBE_BASE_IMAGE_REGISTRY="${KUBE_BASE_IMAGE_REGISTRY:-us.gcr.io/k8s-artifacts-prod/build-image}"

# This version number is used to cause everyone to rebuild their data containers
# and build image. This is especially useful for automated build systems like
Expand Down Expand Up @@ -94,7 +94,7 @@ readonly KUBE_CONTAINER_RSYNC_PORT=8730
# $1 - server architecture
kube::build::get_docker_wrapped_binaries() {
local arch=$1
local debian_base_version=v2.0.0
local debian_base_version=v2.1.0
local debian_iptables_version=v12.0.1
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this debian_iptables_version has changed in the rest of the PR, should be changed here too?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@aojea -- Not yet. See here: https://github.com/kubernetes/kubernetes/pull/90697/files#diff-0ea054266fe6ea2dc38e6079e8adb98bL116

From #90665:

* Add base images to dependencies.yaml
  Dependencies for each image are broken up into two sections to allow the dependency check to pass:
  
  * `image:tag`: versions that should be bumped in order to build the image
  * `image:tag: dependents`: dependents that need to be bumped _after_ the image has been built and promoted

So we're bumping the tag just in the Makefile to trigger the image build for debian-iptables in this PR.
After this merges and the image is promoted, I'll come back with another PR to bring the dependents up to the newly-promoted version.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks for the clarification, I'm just trying to follow this new process, seems a nice improvement

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Appreciate the feedback, @aojea! 💕
I'll be tracking everything here: #90698

...and documenting everything once some of the last quirks are worked out. :)

### If you change any of these lists, please also update DOCKERIZED_BINARIES
### in build/BUILD. And kube::golang::server_image_targets
Expand Down
2 changes: 1 addition & 1 deletion build/debian-base/Makefile
View file
Open in desktop
Expand Up @@ -14,7 +14,7 @@

all: all-build

REGISTRY ?= staging-k8s.gcr.io
REGISTRY ?= gcr.io/k8s-staging-build-image
IMAGE ?= $(REGISTRY)/debian-base
BUILD_IMAGE ?= debian-build

Expand Down
1 change: 1 addition & 0 deletions build/debian-base/cloudbuild.yaml
View file
Open in desktop
Expand Up @@ -6,6 +6,7 @@ options:
steps:
- name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20200422-b25d964'
entrypoint: make
dir: ./build/debian-base
env:
- DOCKER_CLI_EXPERIMENTAL=enabled
- REGISTRY=gcr.io/$PROJECT_ID
Expand Down
8 changes: 4 additions & 4 deletions build/debian-iptables/Makefile
View file
Open in desktop
Expand Up @@ -14,15 +14,15 @@

.PHONY: build push all all-build all-push-images all-push push-manifest

REGISTRY?="staging-k8s.gcr.io"
REGISTRY?="gcr.io/k8s-staging-build-image"
IMAGE=$(REGISTRY)/debian-iptables
TAG?=v12.0.1
TAG?=v12.1.0
ARCH?=amd64
ALL_ARCH = amd64 arm arm64 ppc64le s390x
TEMP_DIR:=$(shell mktemp -d)

BASE_REGISTRY?=k8s.gcr.io
BASEIMAGE?=$(BASE_REGISTRY)/debian-base-$(ARCH):v2.0.0
BASE_REGISTRY?=us.gcr.io/k8s-artifacts-prod/build-image
BASEIMAGE?=$(BASE_REGISTRY)/debian-base-$(ARCH):v2.1.0

# This option is for running docker manifest command
export DOCKER_CLI_EXPERIMENTAL := enabled
Expand Down
2 changes: 1 addition & 1 deletion build/debian-iptables/cloudbuild.yaml
View file
Open in desktop
Expand Up @@ -6,10 +6,10 @@ options:
steps:
- name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20200422-b25d964'
entrypoint: make
dir: ./build/debian-iptables
env:
- DOCKER_CLI_EXPERIMENTAL=enabled
- REGISTRY=gcr.io/$PROJECT_ID
- BASE_REGISTRY=gcr.io/$PROJECT_ID
- IMAGE=gcr.io/$PROJECT_ID/debian-iptables
args:
- all-push
16 changes: 8 additions & 8 deletions build/dependencies.yaml
View file
Open in desktop
Expand Up @@ -82,7 +82,7 @@ dependencies:
match: TAG \?=

- name: "k8s.gcr.io/debian-base: dependents"
version: 2.0.0
version: 2.1.0
refPaths:
- path: build/common.sh
match: debian_base_version=
Expand All @@ -91,20 +91,20 @@ dependencies:
- path: build/debian-iptables/Makefile
match: BASEIMAGE\?\=\$\(BASE_REGISTRY\)\/debian-base-\$\(ARCH\)
- path: cluster/images/etcd/Makefile
match: BASEIMAGE\?\=k8s\.gcr\.io\/debian-base:v\d+\.\d+\.\d+
match: BASEIMAGE\?\=us\.gcr\.io\/k8s-artifacts-prod\/build-image\/debian-base:v\d+\.\d+\.\d+
- path: cluster/images/etcd/Makefile
match: BASEIMAGE\?\=k8s\.gcr\.io\/debian-base-arm:v\d+\.\d+\.\d+
match: BASEIMAGE\?\=us\.gcr\.io\/k8s-artifacts-prod\/build-image\/debian-base-arm:v\d+\.\d+\.\d+
- path: cluster/images/etcd/Makefile
match: BASEIMAGE\?\=k8s\.gcr\.io\/debian-base-arm64:v\d+\.\d+\.\d+
match: BASEIMAGE\?\=us\.gcr\.io\/k8s-artifacts-prod\/build-image\/debian-base-arm64:v\d+\.\d+\.\d+
- path: cluster/images/etcd/Makefile
match: BASEIMAGE\?\=k8s\.gcr\.io\/debian-base-ppc64le:v\d+\.\d+\.\d+
match: BASEIMAGE\?\=us\.gcr\.io\/k8s-artifacts-prod\/build-image\/debian-base-ppc64le:v\d+\.\d+\.\d+
- path: cluster/images/etcd/Makefile
match: BASEIMAGE\?\=k8s\.gcr\.io\/debian-base-s390x:v\d+\.\d+\.\d+
match: BASEIMAGE\?\=us\.gcr\.io\/k8s-artifacts-prod\/build-image\/debian-base-s390x:v\d+\.\d+\.\d+
- path: cluster/images/etcd-empty-dir-cleanup/Dockerfile
match: k8s.gcr.io\/debian-base:v\d+\.\d+\.\d+
match: us\.gcr\.io\/k8s-artifacts-prod\/build-image\/debian-base:v\d+\.\d+\.\d+

- name: "k8s.gcr.io/debian-iptables"
version: 12.0.1
version: 12.1.0
refPaths:
- path: build/debian-iptables/Makefile
match: TAG\?=
Expand Down
16 changes: 8 additions & 8 deletions build/workspace.bzl
View file
Open in desktop
Expand Up @@ -73,12 +73,12 @@ def cri_tarballs():

# Use go get -u github.com/estesp/manifest-tool to find these values
_DEBIAN_BASE_DIGEST = {
"manifest": "sha256:ebda8587ec0f49eb88ee3a608ef018484908cbc5aa32556a0d78356088c185d4",
"amd64": "sha256:d7be39e143d4e6677a28c81c0a84868b40800fc979dea1848bb19d526668a00c",
"arm": "sha256:fc731da13b0bc9013b85a86b583fc92e50869b5bc8e7aa6ca730ec0240954c7d",
"arm64": "sha256:12502c3eed050fa9b6d5fe353a44bfc5f437dc325c8912b1a48dcc180df36f1e",
"ppc64le": "sha256:4277aa59b63c5a1369e6d84a295ecc4ffa08985dcf114de9f7b6de1af4fcbc86",
"s390x": "sha256:78ef2a6b017539379c1654b4e52ba8519bfec821c62d0b3a1dbd15104b711e21",
"manifest": "sha256:b118abac0bcf633b9db4086584ee718526fe394cf1bd18aee036e6cc497860f6",
"amd64": "sha256:a67798e4746faaab3fde5b7407fa8bba75d8b1214d168dc7ad2b5364f6fc4319",
"arm": "sha256:3ab4332e481610acbcba7a801711e29506b4bd4ecb38f72590253674d914c449",
"arm64": "sha256:8d53ac4da977eb20d6219ee49b9cdff8c066831ecab0e4294d0a02179d26b1d7",
"ppc64le": "sha256:a631023e795fe18df7faa8fe1264e757a6c74a232b9a2659657bf65756f3f4aa",
"s390x": "sha256:dac908eaa61d2034aec252576a470a7e4ab184c361f89170526f707a0c3c6082",
}

_DEBIAN_IPTABLES_DIGEST = {
Expand All @@ -102,9 +102,9 @@ def debian_image_dependencies():
name = "debian-base-" + arch,
architecture = arch,
digest = _digest(_DEBIAN_BASE_DIGEST, arch),
registry = "k8s.gcr.io",
registry = "us.gcr.io/k8s-artifacts-prod/build-image",
repository = "debian-base",
tag = "v2.0.0", # ignored, but kept here for documentation
tag = "v2.1.0", # ignored, but kept here for documentation
)

container_pull(
Expand Down
2 changes: 1 addition & 1 deletion cluster/images/etcd-empty-dir-cleanup/Dockerfile
View file
Open in desktop
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM k8s.gcr.io/debian-base:v2.0.0
FROM us.gcr.io/k8s-artifacts-prod/build-image/debian-base:v2.1.0
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to bump version number for this image


COPY etcdctl etcd-empty-dir-cleanup.sh /
RUN chmod a+rx /etcdctl /etcd-empty-dir-cleanup.sh
Expand Down
10 changes: 5 additions & 5 deletions cluster/images/etcd/Makefile
View file
Open in desktop
Expand Up @@ -67,19 +67,19 @@ GOARM?=7
TEMP_DIR:=$(shell mktemp -d)

ifeq ($(ARCH),amd64)
BASEIMAGE?=k8s.gcr.io/debian-base:v2.0.0
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to bump version number for this image as well

BASEIMAGE?=us.gcr.io/k8s-artifacts-prod/build-image/debian-base:v2.1.0
endif
ifeq ($(ARCH),arm)
BASEIMAGE?=k8s.gcr.io/debian-base-arm:v2.0.0
BASEIMAGE?=us.gcr.io/k8s-artifacts-prod/build-image/debian-base-arm:v2.1.0
endif
ifeq ($(ARCH),arm64)
BASEIMAGE?=k8s.gcr.io/debian-base-arm64:v2.0.0
BASEIMAGE?=us.gcr.io/k8s-artifacts-prod/build-image/debian-base-arm64:v2.1.0
endif
ifeq ($(ARCH),ppc64le)
BASEIMAGE?=k8s.gcr.io/debian-base-ppc64le:v2.0.0
BASEIMAGE?=us.gcr.io/k8s-artifacts-prod/build-image/debian-base-ppc64le:v2.1.0
endif
ifeq ($(ARCH),s390x)
BASEIMAGE?=k8s.gcr.io/debian-base-s390x:v2.0.0
BASEIMAGE?=us.gcr.io/k8s-artifacts-prod/build-image/debian-base-s390x:v2.1.0
endif

build:
Expand Down