Skip to content

Commit

Permalink
dependencies.yaml: Default to go1.17 for image builds
Browse files Browse the repository at this point in the history
Signed-off-by: Stephen Augustus <foo@auggie.dev>
  • Loading branch information
justaugustus committed Aug 25, 2021
1 parent 975fd9f commit 36c385b
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 25 deletions.
2 changes: 1 addition & 1 deletion Dockerfile-kubepkg
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM golang:1.16.7-buster AS builder
FROM golang:1.17-buster AS builder

ENV GO111MODULE=on

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-kubepkg-rpm
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM golang:1.16.7-buster AS builder
FROM golang:1.17-buster AS builder

ENV GO111MODULE=on

Expand Down
23 changes: 10 additions & 13 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ dependencies:

# Golang
- name: "golang"
version: 1.16.7
version: 1.17
refPaths:
- path: Dockerfile-kubepkg
match: FROM golang:\d+.\d+(alpha|beta|rc)?\.?(\d+)-(bullseye|buster) AS builder
Expand All @@ -84,12 +84,12 @@ dependencies:
match: FROM golang:\d+.\d+(alpha|beta|rc)?\.?(\d+)-(bullseye|buster)

# Golang pre-releases are denoted as `1.y<pre-release stage>.z`
# Example: go1.16rc1
# Example: go1.17rc1
#
# This entry is a stub of the major version to allow dependency checks to
# pass when building Kubernetes using a pre-release of Golang.
- name: "golang: 1.<major>"
version: 1.16
version: 1.17
refPaths:
- path: images/build/cross/Makefile
match: GO_MAJOR_VERSION\ \?=\ \d+.\d+(alpha|beta|rc)?\.?(\d+)?
Expand All @@ -101,7 +101,7 @@ dependencies:
match: "GO_MAJOR_VERSION: '\\d+.\\d+'"

- name: "golang: after kubernetes/kubernetes update"
version: 1.16.7
version: 1.17
refPaths:
- path: images/releng/k8s-ci-builder/Dockerfile
match: FROM golang:\d+.\d+(alpha|beta|rc)?\.?(\d+)-\${OS_CODENAME} AS builder
Expand All @@ -118,15 +118,15 @@ dependencies:
# Golang images

# Represents the targeted Kubernetes version at the time the images
# are to be created e.g., 'v1.22.0'
# are to be created e.g., 'v1.100.0'
#
# Note: There is no need to increment the patch version of this variable.
# The reason for the inclusion of the patch version here is to satisfy
# a SemVer regex on the IMAGE_VERSION.
#
# Example:
# - v1.22.0-go1.16-buster.0 satisfies SemVer regex, while:
# - v1.22-go1.16-buster.0 does not
# - v1.100.0-go1.17-buster.0 satisfies SemVer regex, while:
# - v1.100-go1.17-buster.0 does not
- name: "Kubernetes version (stable.0)"
version: v1.22.0
refPaths:
Expand Down Expand Up @@ -156,7 +156,7 @@ dependencies:
match: v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)-([0-9]+)

- name: "k8s.gcr.io/build-image/go-runner"
version: v2.3.1-go1.16.7-buster.0
version: v2.3.1-go1.17-buster.0
refPaths:
- path: images/build/go-runner/variants.yaml
match: v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)
Expand All @@ -170,14 +170,13 @@ dependencies:
match: REVISION:\ '\d+'

- name: "k8s.gcr.io/build-image/kube-cross"
version: v1.22.0-go1.16.7-buster.0
version: v1.23.0-go1.17-buster.0
refPaths:
- path: images/build/cross/variants.yaml
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-]+)*))?)'"

# TODO: Consider capturing this in "golang: 1.<major>" instead
- name: "k8s.gcr.io/build-image/kube-cross: config variant"
version: go1.16-buster
version: go1.17-buster
refPaths:
- path: images/build/cross/variants.yaml
match: "CONFIG: 'go\\d+.\\d+-(bullseye|buster)'"
Expand Down Expand Up @@ -234,7 +233,6 @@ dependencies:
- path: images/build/cross/variants.yaml
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-]+)*))?)'"

# TODO: Consider capturing this in "golang: 1.<major>" instead
- name: "k8s.gcr.io/build-image/kube-cross: config variant (next candidate)"
version: go1.17-buster
refPaths:
Expand Down Expand Up @@ -289,7 +287,6 @@ dependencies:
- path: images/build/cross/variants.yaml
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-]+)*))?)'"

# TODO: Consider capturing this in "golang: 1.<major>" instead
- name: "k8s.gcr.io/build-image/kube-cross: config variant (for previous release branches)"
version: go1.15-buster
refPaths:
Expand Down
10 changes: 5 additions & 5 deletions images/build/cross/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,18 @@ SHELL=/bin/bash -o pipefail
IMGNAME = kube-cross

# Represents the targeted Kubernetes version at the time the images
# are to be created e.g., 'v1.22.0'
# are to be created e.g., 'v1.100.0'
#
# Note: There is no need to increment the patch version of this variable.
# The reason for the inclusion of the patch version here is to satisfy
# a SemVer regex on the IMAGE_VERSION.
#
# Example:
# - v1.22.0-go1.16-buster.0 satisfies SemVer regex, while:
# - v1.22-go1.16-buster.0 does not
# - v1.100.0-go1.17-buster.0 satisfies SemVer regex, while:
# - v1.100-go1.17-buster.0 does not
KUBERNETES_VERSION ?= v1.22.0
GO_VERSION ?= 1.16.7
GO_MAJOR_VERSION ?= 1.16
GO_VERSION ?= 1.17
GO_MAJOR_VERSION ?= 1.17
OS_CODENAME ?= buster
REVISION ?= 0
TYPE ?= default
Expand Down
4 changes: 2 additions & 2 deletions images/build/go-runner/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ include $(CURDIR)/../../Makefile.common-image

IMGNAME = go-runner
APP_VERSION = $(shell cat VERSION)
GO_MAJOR_VERSION ?= 1.16
GO_MAJOR_VERSION ?= 1.17
REVISION ?= 0

# Build args
GO_VERSION ?= 1.16.7
GO_VERSION ?= 1.17
OS_CODENAME ?= buster
DISTROLESS_IMAGE ?= static-debian10

Expand Down
2 changes: 1 addition & 1 deletion images/releng/k8s-ci-builder/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ ARG OS_CODENAME

# The Golang version for the builder image should always be explicitly set to
# the Golang version of the kubernetes/kubernetes active development branch
FROM golang:1.16.7-${OS_CODENAME} AS builder
FROM golang:1.17-${OS_CODENAME} AS builder

WORKDIR /go/src/k8s.io/release

Expand Down
2 changes: 1 addition & 1 deletion images/releng/k8s-ci-builder/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ IMAGE = $(REGISTRY)/$(IMGNAME)
TAG ?= $(shell git describe --tags --always --dirty)

# Build args
GO_VERSION ?= 1.16.7
GO_VERSION ?= 1.17
OS_CODENAME ?= buster
IMAGE_ARG ?= $(IMAGE):$(TAG)-$(CONFIG)

Expand Down
2 changes: 1 addition & 1 deletion packages/deb/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM golang:1.16.7-buster
FROM golang:1.17-buster

RUN export DEBIAN_FRONTEND=noninteractive \
&& apt-get update -y \
Expand Down

0 comments on commit 36c385b

Please sign in to comment.