Skip to content

Commit 4a7360d

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#90665 from justaugustus/base-images
cleanup: Base image workflow improvements
2 parents 3f4f018 + 410b388 commit 4a7360d

File tree

12 files changed

+197
-82
lines changed

12 files changed

+197
-82
lines changed

‎build/cloudbuild.yaml‎

Lines changed: 0 additions & 41 deletions
This file was deleted.

‎build/debian-base/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ REGISTRY ?= staging-k8s.gcr.io
1818
IMAGE ?= $(REGISTRY)/debian-base
1919
BUILD_IMAGE ?= debian-build
2020

21-
TAG ?= v2.0.1
21+
TAG ?= v2.1.0
2222

2323
TAR_FILE ?= rootfs.tar
2424
ARCH?=amd64

‎build/debian-base/OWNERS‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
# See the OWNERS docs at https://go.k8s.io/owners
22

33
reviewers:
4+
- build-image-reviewers
45
- BenTheElder
56
- mkumatag
67
- tallclair
78
approvers:
9+
- build-image-approvers
810
- BenTheElder
911
- mkumatag
1012
- tallclair

‎build/debian-base/cloudbuild.yaml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# See https://cloud.google.com/cloud-build/docs/build-config
2+
timeout: 1200s
3+
options:
4+
substitution_option: ALLOW_LOOSE
5+
machineType: 'N1_HIGHCPU_8'
6+
steps:
7+
- name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20200422-b25d964'
8+
entrypoint: make
9+
env:
10+
- DOCKER_CLI_EXPERIMENTAL=enabled
11+
- REGISTRY=gcr.io/$PROJECT_ID
12+
- IMAGE=gcr.io/$PROJECT_ID/debian-base
13+
- BUILD_IMAGE=debian-build
14+
args:
15+
- all-push

‎build/debian-iptables/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616

1717
REGISTRY?="staging-k8s.gcr.io"
1818
IMAGE=$(REGISTRY)/debian-iptables
19-
TAG?=v12.0.2
19+
TAG?=v12.0.1
2020
ARCH?=amd64
2121
ALL_ARCH = amd64 arm arm64 ppc64le s390x
2222
TEMP_DIR:=$(shell mktemp -d)
2323

2424
BASE_REGISTRY?=k8s.gcr.io
25-
BASEIMAGE?=$(BASE_REGISTRY)/debian-base-$(ARCH):v2.0.1
25+
BASEIMAGE?=$(BASE_REGISTRY)/debian-base-$(ARCH):v2.0.0
2626

2727
# This option is for running docker manifest command
2828
export DOCKER_CLI_EXPERIMENTAL := enabled

‎build/debian-iptables/OWNERS‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# See the OWNERS docs at https://go.k8s.io/owners
22

33
reviewers:
4+
- build-image-reviewers
45
- BenTheElder
56
- bowei
67
- freehan
@@ -9,6 +10,7 @@ reviewers:
910
- mrhohn
1011
- tallclair
1112
approvers:
13+
- build-image-approvers
1214
- BenTheElder
1315
- bowei
1416
- freehan

‎build/debian-iptables/cloudbuild.yaml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# See https://cloud.google.com/cloud-build/docs/build-config
2+
timeout: 1200s
3+
options:
4+
substitution_option: ALLOW_LOOSE
5+
machineType: 'N1_HIGHCPU_8'
6+
steps:
7+
- name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20200422-b25d964'
8+
entrypoint: make
9+
env:
10+
- DOCKER_CLI_EXPERIMENTAL=enabled
11+
- REGISTRY=gcr.io/$PROJECT_ID
12+
- BASE_REGISTRY=gcr.io/$PROJECT_ID
13+
- IMAGE=gcr.io/$PROJECT_ID/debian-iptables
14+
args:
15+
- all-push

‎build/dependencies.yaml‎

Lines changed: 133 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,48 @@
11
dependencies:
2+
- name: "cni"
3+
version: 0.8.5
4+
refPaths:
5+
- path: build/workspace.bzl
6+
match: CNI_VERSION =
7+
- path: cluster/gce/gci/configure.sh
8+
match: DEFAULT_CNI_VERSION=
9+
- path: cluster/gce/config-common.sh
10+
match: WINDOWS_CNI_VERSION=
11+
- path: test/e2e_node/remote/utils.go
12+
match: cniVersion[\t\n\f\r ]*=
13+
14+
- name: "coredns-kube-up"
15+
version: 1.6.7
16+
refPaths:
17+
- path: cluster/addons/dns/coredns/coredns.yaml.base
18+
match: k8s.gcr.io/coredns
19+
- path: cluster/addons/dns/coredns/coredns.yaml.in
20+
match: k8s.gcr.io/coredns
21+
- path: cluster/addons/dns/coredns/coredns.yaml.sed
22+
match: k8s.gcr.io/coredns
23+
24+
- name: "coredns-kubeadm"
25+
version: 1.6.7
26+
refPaths:
27+
- path: cmd/kubeadm/app/constants/constants.go
28+
match: CoreDNSVersion =
29+
30+
- name: "crictl"
31+
version: 1.17.0
32+
refPaths:
33+
- path: build/workspace.bzl
34+
match: CRI_TOOLS_VERSION =
35+
- path: cluster/gce/gci/configure.sh
36+
match: DEFAULT_CRICTL_VERSION=
37+
- path: cluster/gce/windows/k8s-node-setup.psm1
38+
match: CRICTL_VERSION =
39+
40+
- name: "docker"
41+
version: 19.03
42+
refPaths:
43+
- path: vendor/k8s.io/system-validators/validators/docker_validator.go
44+
match: latestValidatedDockerVersion
45+
246
- name: "etcd"
347
version: 3.4.7
448
refPaths:
@@ -24,56 +68,109 @@ dependencies:
2468
- path: test/e2e/framework/nodes_util.go
2569
match: const etcdImage
2670

27-
- name: "docker"
28-
version: 19.03
29-
refPaths:
30-
- path: vendor/k8s.io/system-validators/validators/docker_validator.go
31-
match: latestValidatedDockerVersion
32-
33-
3471
- name: "golang"
3572
version: 1.13.9
3673
refPaths:
3774
- path: build/build-image/cross/VERSION
3875
- path: test/images/Makefile
3976
match: GOLANG_VERSION
4077

78+
- name: "k8s.gcr.io/debian-base"
79+
version: 2.1.0
80+
refPaths:
81+
- path: build/debian-base/Makefile
82+
match: TAG \?=
4183

42-
- name: "cni"
43-
version: 0.8.5
84+
- name: "k8s.gcr.io/debian-base: dependents"
85+
version: 2.0.0
4486
refPaths:
87+
- path: build/common.sh
88+
match: debian_base_version=
4589
- path: build/workspace.bzl
46-
match: CNI_VERSION =
47-
- path: cluster/gce/gci/configure.sh
48-
match: DEFAULT_CNI_VERSION=
49-
- path: cluster/gce/config-common.sh
50-
match: WINDOWS_CNI_VERSION=
51-
- path: test/e2e_node/remote/utils.go
52-
match: cniVersion[\t\n\f\r ]*=
90+
match: tag =
91+
- path: build/debian-iptables/Makefile
92+
match: BASEIMAGE\?\=\$\(BASE_REGISTRY\)\/debian-base-\$\(ARCH\)
93+
- path: cluster/images/etcd/Makefile
94+
match: BASEIMAGE\?\=k8s\.gcr\.io\/debian-base:v\d+\.\d+\.\d+
95+
- path: cluster/images/etcd/Makefile
96+
match: BASEIMAGE\?\=k8s\.gcr\.io\/debian-base-arm:v\d+\.\d+\.\d+
97+
- path: cluster/images/etcd/Makefile
98+
match: BASEIMAGE\?\=k8s\.gcr\.io\/debian-base-arm64:v\d+\.\d+\.\d+
99+
- path: cluster/images/etcd/Makefile
100+
match: BASEIMAGE\?\=k8s\.gcr\.io\/debian-base-ppc64le:v\d+\.\d+\.\d+
101+
- path: cluster/images/etcd/Makefile
102+
match: BASEIMAGE\?\=k8s\.gcr\.io\/debian-base-s390x:v\d+\.\d+\.\d+
103+
- path: cluster/images/etcd-empty-dir-cleanup/Dockerfile
104+
match: k8s.gcr.io\/debian-base:v\d+\.\d+\.\d+
53105

106+
- name: "k8s.gcr.io/debian-iptables"
107+
version: 12.0.1
108+
refPaths:
109+
- path: build/debian-iptables/Makefile
110+
match: TAG\?=
54111

55-
- name: "coredns-kube-up"
56-
version: 1.6.7
112+
- name: "k8s.gcr.io/debian-iptables: dependents"
113+
version: 12.0.1
57114
refPaths:
58-
- path: cluster/addons/dns/coredns/coredns.yaml.base
59-
match: k8s.gcr.io/coredns
60-
- path: cluster/addons/dns/coredns/coredns.yaml.in
61-
match: k8s.gcr.io/coredns
62-
- path: cluster/addons/dns/coredns/coredns.yaml.sed
63-
match: k8s.gcr.io/coredns
115+
- path: build/common.sh
116+
match: debian_iptables_version=
117+
- path: build/workspace.bzl
118+
match: tag =
64119

65-
- name: "coredns-kubeadm"
66-
version: 1.6.7
120+
- name: "k8s.gcr.io/pause"
121+
version: 3.3
67122
refPaths:
68-
- path: cmd/kubeadm/app/constants/constants.go
69-
match: CoreDNSVersion =
123+
- path: build/pause/Makefile
124+
match: TAG =
70125

71-
- name: "crictl"
72-
version: 1.17.0
126+
- name: "k8s.gcr.io/pause: dependents"
127+
version: 3.2
73128
refPaths:
74-
- path: build/workspace.bzl
75-
match: CRI_TOOLS_VERSION =
76-
- path: cluster/gce/gci/configure.sh
77-
match: DEFAULT_CRICTL_VERSION=
78-
- path: cluster/gce/windows/k8s-node-setup.psm1
79-
match: CRICTL_VERSION =
129+
- path: cmd/kubeadm/app/constants/constants_unix.go
130+
match: PauseVersion\s+=
131+
- path: cmd/kubeadm/app/util/template_test.go
132+
match: validTmpl\s+=
133+
- path: cmd/kubeadm/app/util/template_test.go
134+
match: validTmplOut\s+=
135+
- path: cmd/kubeadm/app/util/template_test.go
136+
match: doNothing\s+=
137+
- path: cmd/kubelet/app/options/container_runtime.go
138+
match: defaultPodSandboxImageVersion\s+=
139+
- path: hack/testdata/pod-with-precision.json
140+
match: k8s.gcr.io\/pause:\d+\.\d+
141+
- path: pkg/kubelet/dockershim/docker_sandbox.go
142+
match: k8s.gcr.io\/pause:\d+\.\d+
143+
- path: staging/src/k8s.io/kubectl/testdata/set/multi-resource-yaml.yaml
144+
match: k8s.gcr.io\/pause:\d+\.\d+
145+
- path: staging/src/k8s.io/kubectl/testdata/set/namespaced-resource.yaml
146+
match: k8s.gcr.io\/pause:\d+\.\d+
147+
- path: test/cmd/core.sh
148+
match: k8s.gcr.io\/pause:\d+\.\d+
149+
- path: test/fixtures/pkg/kubectl/cmd/set/multi-resource-yaml.yaml
150+
match: k8s.gcr.io\/pause:\d+\.\d+
151+
- path: test/fixtures/pkg/kubectl/cmd/set/namespaced-resource.yaml
152+
match: k8s.gcr.io\/pause:\d+\.\d+
153+
- path: test/integration/benchmark-controller.json
154+
match: k8s.gcr.io\/pause:\d+\.\d+
155+
- path: test/integration/scheduler_perf/config/pod-default.yaml
156+
match: k8s.gcr.io\/pause:\d+\.\d+
157+
- path: test/integration/scheduler_perf/config/pod-with-node-affinity.yaml
158+
match: k8s.gcr.io\/pause:\d+\.\d+
159+
- path: test/integration/scheduler_perf/config/pod-with-pod-affinity.yaml
160+
match: k8s.gcr.io\/pause:\d+\.\d+
161+
- path: test/integration/scheduler_perf/config/pod-with-pod-anti-affinity.yaml
162+
match: k8s.gcr.io\/pause:\d+\.\d+
163+
- path: test/integration/scheduler_perf/config/pod-with-preferred-pod-affinity.yaml
164+
match: k8s.gcr.io\/pause:\d+\.\d+
165+
- path: test/integration/scheduler_perf/config/pod-with-preferred-pod-anti-affinity.yaml
166+
match: k8s.gcr.io\/pause:\d+\.\d+
167+
- path: test/integration/scheduler_perf/config/pod-with-preferred-topology-spreading.yaml
168+
match: k8s.gcr.io\/pause:\d+\.\d+
169+
- path: test/integration/scheduler_perf/config/pod-with-secret-volume.yaml
170+
match: k8s.gcr.io\/pause:\d+\.\d+
171+
- path: test/integration/scheduler_perf/config/pod-with-topology-spreading.yaml
172+
match: k8s.gcr.io\/pause:\d+\.\d+
173+
- path: test/utils/runners.go
174+
match: k8s.gcr.io\/pause:\d+\.\d+
175+
- path: test/utils/image/manifest.go
176+
match: configs\[Pause\] = Config{gcRegistry, "pause", "\d+\.\d+"}

‎build/pause/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ REGISTRY ?= staging-k8s.gcr.io
1818
IMAGE = $(REGISTRY)/pause
1919
IMAGE_WITH_ARCH = $(IMAGE)-$(ARCH)
2020

21-
TAG = 3.2
21+
TAG = 3.3
2222
REV = $(shell git describe --contains --always --match='v*')
2323

2424
# Architectures supported: amd64, arm, arm64, ppc64le and s390x

‎build/pause/OWNERS‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# See the OWNERS docs at https://go.k8s.io/owners
2+
3+
approvers:
4+
- build-image-approvers
5+
reviewers:
6+
- build-image-reviewers

0 commit comments

Comments
 (0)