Merge pull request #2211 from justaugustus/go117

[go1.17] Build images for go1.17
kubernetes · Aug 24, 2021 · ee1077f · ee1077f
2 parents fcfc445 + 6f0afcf
commit ee1077f
Show file tree

Hide file tree

Showing 24 changed files with 263 additions and 238 deletions.
diff --git a/Dockerfile-kubepkg b/Dockerfile-kubepkg
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM golang:1.16.7 AS builder
+FROM golang:1.16.7-buster AS builder
 
 ENV GO111MODULE=on
 

diff --git a/Dockerfile-kubepkg-rpm b/Dockerfile-kubepkg-rpm
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM golang:1.16.7 AS builder
+FROM golang:1.16.7-buster AS builder
 
 ENV GO111MODULE=on
 

diff --git a/cloudbuild-kubepkg.yaml b/cloudbuild-kubepkg.yaml
@@ -2,6 +2,7 @@
 timeout: 1200s
 options:
   substitution_option: ALLOW_LOOSE
+
 steps:
   - name: gcr.io/cloud-builders/docker
     args:
@@ -19,14 +20,19 @@ steps:
     - --tag=$_REGISTRY/kubepkg-rpm:$_GIT_TAG
     - --tag=$_REGISTRY/kubepkg-rpm:latest
     - .
+
 substitutions:
   # _GIT_TAG will be filled with a git-based tag for the image, of the form vYYYYMMDD-hash, and
   # can be used as a substitution
   _GIT_TAG: '12345'
   _PULL_BASE_REF: 'dev'
   _REGISTRY: 'fake.repository/registry-name'
-  # TODO(images): Remove once CI failures are resolved.
-  _CI_FAILURES: 'https://prow.k8s.io/view/gs/kubernetes-jenkins/logs/post-release-push-image-kubepkg/1382830189301469184'
+
+tags:
+- 'kubepkg'
+- ${_GIT_TAG}
+- ${_PULL_BASE_REF}
+
 images:
   - 'gcr.io/$PROJECT_ID/kubepkg:$_GIT_TAG'
   - 'gcr.io/$PROJECT_ID/kubepkg:latest'

diff --git a/cmd/vulndash/Dockerfile b/cmd/vulndash/Dockerfile
@@ -14,8 +14,10 @@
 
 # Build the manager binary
 ARG GO_VERSION
+ARG OS_CODENAME
+# TODO(codename): Consider parameterizing in Makefile based on codename
 ARG DISTROLESS_IMAGE
-FROM golang:${GO_VERSION} as builder
+FROM golang:${GO_VERSION}-${OS_CODENAME} as builder
 
 WORKDIR /go/src/k8s.io/release
 

diff --git a/cmd/vulndash/Makefile b/cmd/vulndash/Makefile
@@ -21,23 +21,27 @@ SHELL=/bin/bash -o pipefail
 REGISTRY ?= gcr.io/k8s-staging-artifact-promoter
 IMGNAME = vulndash
 IMAGE_VERSION ?= v0.4.3-7
-CONFIG ?= buster
 
 IMAGE = $(REGISTRY)/$(IMGNAME)
 
 TAG ?= $(shell git describe --tags --always --dirty)
 
 # Build args
 GO_VERSION ?= 1.16.7
+OS_CODENAME ?= buster
 DISTROLESS_IMAGE ?= static-debian10
 
+# Configuration
+CONFIG = $(OS_CODENAME)
+
 PLATFORMS ?= linux/amd64
 
 HOST_GOOS ?= $(shell go env GOOS)
 HOST_GOARCH ?= $(shell go env GOARCH)
 GO_BUILD ?= go build
 
 BUILD_ARGS = --build-arg=GO_VERSION=$(GO_VERSION) \
+             --build-arg=OS_CODENAME=$(OS_CODENAME) \
              --build-arg=DISTROLESS_IMAGE=$(DISTROLESS_IMAGE)
 
 # Ensure support for 'docker buildx' and 'docker manifest' commands

diff --git a/cmd/vulndash/cloudbuild.yaml b/cmd/vulndash/cloudbuild.yaml
@@ -19,6 +19,7 @@ steps:
     - PULL_BASE_REF=$_PULL_BASE_REF
     - IMAGE_VERSION=$_IMAGE_VERSION
     - GO_VERSION=$_GO_VERSION
+    - OS_CODENAME=$_OS_CODENAME
     - DISTROLESS_IMAGE=$_DISTROLESS_IMAGE
     args:
     - '-c'
@@ -33,6 +34,7 @@ substitutions:
   _PULL_BASE_REF: 'dev'
   _IMAGE_VERSION: 'v0.0.0'
   _GO_VERSION: '0.0.0'
+  _OS_CODENAME: 'codename'
   _DISTROLESS_IMAGE: 'static-debian00'
 
 tags:
@@ -41,6 +43,7 @@ tags:
 - ${_PULL_BASE_REF}
 - ${_IMAGE_VERSION}
 - ${_GO_VERSION}
+- ${_OS_CODENAME}
 - ${_DISTROLESS_IMAGE}
 
 images:

diff --git a/cmd/vulndash/variants.yaml b/cmd/vulndash/variants.yaml
@@ -2,4 +2,5 @@ variants:
   default:
     IMAGE_VERSION: 'v0.4.3-7'
     GO_VERSION: '1.16.7'
+    OS_CODENAME: 'buster'
     DISTROLESS_IMAGE: 'static-debian10'