Skip to content

Commit

Permalink
Merge pull request #2920 from vinayakankugoyal/myfeature
Browse files Browse the repository at this point in the history
Update go-runner version in distroless-iptables.
  • Loading branch information
k8s-ci-robot authored Feb 18, 2023
2 parents 58b8bc4 + 33c99a5 commit 79c2961
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 11 deletions.
10 changes: 6 additions & 4 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -493,24 +493,26 @@ dependencies:
match: "DEBIAN_BASE_VERSION: 'bullseye-v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'"

- name: "registry.k8s.io/build-image/debian-iptables"
version: bullseye-v1.5.1
version: bullseye-v1.5.2
refPaths:
- path: images/build/debian-iptables/Makefile
match: IMAGE_VERSION\ \?=\ bullseye-v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)
- path: images/build/debian-iptables/variants.yaml
match: "IMAGE_VERSION: 'bullseye-v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'"

- name: "registry.k8s.io/build-image/distroless-iptables"
version: v0.2.0
version: v0.2.1
refPaths:
- path: images/build/distroless-iptables/Makefile
match: IMAGE_VERSION\ \?=\ v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)

- name: "registry.k8s.io/build-image/go-runner: dependents"
version: v2.3.1-go1.19.5-bullseye.0
version: v2.3.1-go1.19.6-bullseye.0
refPaths:
- path: images/build/debian-iptables/Makefile
match: GORUNNER_VERSION \?= v\d+\.\d+\.\d+-go\d+.\d+(alpha|beta|rc)?\.?(\d+)?-bullseye\.\d+
- path: images/build/distroless-iptables/Makefile
match: GORUNNER_VERSION \?= v\d+\.\d+\.\d+-go\d+.\d+(alpha|beta|rc)?\.?(\d+)?-bullseye\.\d+

- name: "registry.k8s.io/build-image/setcap"
version: bullseye-v1.4.1
Expand All @@ -536,7 +538,7 @@ dependencies:
match: "DEBIAN_BASE_VERSION: 'bullseye-v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'"

- name: "registry.k8s.io/build-image/debian-iptables (next candidate)"
version: bullseye-v1.5.1
version: bullseye-v1.5.2
refPaths:
- path: images/build/debian-iptables/variants.yaml
match: "IMAGE_VERSION: 'bullseye-v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'"
Expand Down
4 changes: 2 additions & 2 deletions images/build/debian-iptables/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ REGISTRY?="gcr.io/k8s-staging-build-image"
IMAGE=$(REGISTRY)/debian-iptables

TAG ?= $(shell git describe --tags --always --dirty)
IMAGE_VERSION ?= bullseye-v1.5.1
IMAGE_VERSION ?= bullseye-v1.5.2
CONFIG ?= bullseye
DEBIAN_BASE_VERSION ?= bullseye-v1.4.2
GORUNNER_VERSION ?= v2.3.1-go1.19.5-bullseye.0
GORUNNER_VERSION ?= v2.3.1-go1.19.6-bullseye.0

ARCH?=amd64
ALL_ARCH = amd64 arm arm64 ppc64le s390x
Expand Down
2 changes: 1 addition & 1 deletion images/build/debian-iptables/variants.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ variants:
# Debian 11 - Kubernetes 1.23 and newer
bullseye:
CONFIG: 'bullseye'
IMAGE_VERSION: 'bullseye-v1.5.1'
IMAGE_VERSION: 'bullseye-v1.5.2'
DEBIAN_BASE_VERSION: 'bullseye-v1.4.2'
# Debian 10 - Kubernetes 1.22 and older
buster:
Expand Down
4 changes: 2 additions & 2 deletions images/build/distroless-iptables/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ REGISTRY?="gcr.io/k8s-staging-build-image"
IMAGE=$(REGISTRY)/distroless-iptables

TAG ?= $(shell git describe --tags --always --dirty)
IMAGE_VERSION ?= v0.2.0
IMAGE_VERSION ?= v0.2.1
CONFIG ?= distroless
BASEIMAGE ?= debian:bullseye-slim
GORUNNER_VERSION ?= v2.3.1-go1.19.1-bullseye.0
GORUNNER_VERSION ?= v2.3.1-go1.19.6-bullseye.0

ARCH?=amd64
ALL_ARCH = amd64 arm arm64 ppc64le s390x
Expand Down
4 changes: 2 additions & 2 deletions images/build/distroless-iptables/variants.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
variants:
distroless:
CONFIG: 'distroless'
IMAGE_VERSION: 'v0.1.2'
GORUNNER_VERSION: 'v2.3.1-go1.19.1-bullseye.0'
IMAGE_VERSION: 'v0.2.1'
GORUNNER_VERSION: 'v2.3.1-go1.19.6-bullseye.0'

0 comments on commit 79c2961

Please sign in to comment.