From 32c8e76dcdec5c0d3b280fa416e59ac601ca5d66 Mon Sep 17 00:00:00 2001
From: Stephen Augustus <saugustus@vmware.com>
Date: Tue, 18 Aug 2020 11:30:01 -0400
Subject: [PATCH 1/5] images: Initial copy of go-runner from
 kubernetes/kubernetes

Signed-off-by: Stephen Augustus <saugustus@vmware.com>
---
 dependencies.yaml                      |   6 ++
 images/build/go-runner/BUILD           |  29 ++++++
 images/build/go-runner/Dockerfile      |  45 +++++++++
 images/build/go-runner/Makefile        |  71 ++++++++++++++
 images/build/go-runner/OWNERS          |   6 ++
 images/build/go-runner/README.md       |  30 ++++++
 images/build/go-runner/cloudbuild.yaml |  22 +++++
 images/build/go-runner/go-runner.go    | 122 +++++++++++++++++++++++++
 images/build/go-runner/go.mod          |   5 +
 images/build/go-runner/go.sum          |   2 +
 10 files changed, 338 insertions(+)
 create mode 100644 images/build/go-runner/BUILD
 create mode 100644 images/build/go-runner/Dockerfile
 create mode 100644 images/build/go-runner/Makefile
 create mode 100644 images/build/go-runner/OWNERS
 create mode 100644 images/build/go-runner/README.md
 create mode 100644 images/build/go-runner/cloudbuild.yaml
 create mode 100644 images/build/go-runner/go-runner.go
 create mode 100644 images/build/go-runner/go.mod
 create mode 100644 images/build/go-runner/go.sum

diff --git a/dependencies.yaml b/dependencies.yaml
index 8aa38c505d2..43c474be162 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -98,3 +98,9 @@ dependencies:
     refPaths:
     - path: images/build/debian-hyperkube-base/Makefile
       match: BASEIMAGE\?\=\$\(BASE_REGISTRY\)\/debian-iptables-\$\(ARCH\):v\d+\.\d+\.\d+
+
+  - name: "k8s.gcr.io/go-runner"
+    version: 0.1.1
+    refPaths:
+    - path: images/build/go-runner/Makefile
+      match: TAG \?=
diff --git a/images/build/go-runner/BUILD b/images/build/go-runner/BUILD
new file mode 100644
index 00000000000..1a3f5dc40bd
--- /dev/null
+++ b/images/build/go-runner/BUILD
@@ -0,0 +1,29 @@
+load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
+
+go_library(
+    name = "go_default_library",
+    srcs = ["go-runner.go"],
+    importpath = "k8s.io/kubernetes/build/go-runner",
+    visibility = ["//visibility:private"],
+    deps = ["//vendor/github.com/pkg/errors:go_default_library"],
+)
+
+go_binary(
+    name = "go-runner",
+    embed = [":go_default_library"],
+    visibility = ["//visibility:public"],
+)
+
+filegroup(
+    name = "package-srcs",
+    srcs = glob(["**"]),
+    tags = ["automanaged"],
+    visibility = ["//visibility:private"],
+)
+
+filegroup(
+    name = "all-srcs",
+    srcs = [":package-srcs"],
+    tags = ["automanaged"],
+    visibility = ["//visibility:public"],
+)
diff --git a/images/build/go-runner/Dockerfile b/images/build/go-runner/Dockerfile
new file mode 100644
index 00000000000..a9ad0ef3cd4
--- /dev/null
+++ b/images/build/go-runner/Dockerfile
@@ -0,0 +1,45 @@
+# Copyright 2020 The Kubernetes Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Build the manager binary
+FROM golang:1.13 as builder
+WORKDIR /workspace
+
+# Run this with docker build --build_arg goproxy=$(go env GOPROXY) to override the goproxy
+ARG goproxy=https://proxy.golang.org
+# Run this with docker build --build_arg package=./controlplane/kubeadm or --build_arg package=./bootstrap/kubeadm
+ENV GOPROXY=$goproxy
+
+# Copy the sources
+COPY ./ ./
+
+# Cache the go build
+RUN go build .
+
+# Build
+ARG package=.
+ARG ARCH
+
+# Do not force rebuild of up-to-date packages (do not use -a)
+RUN CGO_ENABLED=0 GOOS=linux GOARCH=${ARCH} \
+    go build -ldflags '-s -w -buildid= -extldflags "-static"' \
+    -o go-runner ${package}
+
+# Production image
+FROM gcr.io/distroless/static:latest
+LABEL maintainers="Kubernetes Authors"
+LABEL description="go based runner for distroless scenarios"
+WORKDIR /
+COPY --from=builder /workspace/go-runner .
+ENTRYPOINT ["/go-runner"]
diff --git a/images/build/go-runner/Makefile b/images/build/go-runner/Makefile
new file mode 100644
index 00000000000..1d3a85ea458
--- /dev/null
+++ b/images/build/go-runner/Makefile
@@ -0,0 +1,71 @@
+# Copyright 2020 The Kubernetes Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# set default shell
+SHELL=/bin/bash -o pipefail
+
+TAG ?= v0.1.1
+REGISTRY ?= k8s.gcr.io
+
+IMGNAME = go-runner
+IMAGE = $(REGISTRY)/$(IMGNAME)
+
+PLATFORMS = linux/amd64 linux/arm64 linux/arm linux/ppc64le linux/s390x
+
+HOST_GOOS ?= $(shell go env GOOS)
+HOST_GOARCH ?= $(shell go env GOARCH)
+GO_BUILD ?= go build
+
+.PHONY: all build clean
+
+.PHONY: all
+all: build
+
+.PHONY: build
+build:
+	$(GO_BUILD)
+
+.PHONY: clean
+clean:
+	rm go-runner
+
+.PHONY: container
+container: init-docker-buildx
+	# https://github.com/docker/buildx/issues/59
+	$(foreach PLATFORM,$(PLATFORMS), \
+		DOCKER_CLI_EXPERIMENTAL=enabled docker buildx build \
+		--load \
+		--progress plain \
+		--platform $(PLATFORM) \
+		--tag $(IMAGE)-$(PLATFORM):$(TAG) .;)
+
+.PHONY: push
+push: container
+	$(foreach PLATFORM,$(PLATFORMS), \
+		docker push $(IMAGE)-$(PLATFORM):$(TAG);)
+
+.PHONY: manifest
+manifest: push
+	docker manifest create --amend $(IMAGE):$(TAG) $(shell echo $(PLATFORMS) | sed -e "s~[^ ]*~$(IMAGE)\-&:$(TAG)~g")
+	@for arch in $(PLATFORMS); do docker manifest annotate --arch "$${arch##*/}" ${IMAGE}:${TAG} ${IMAGE}-$${arch}:${TAG}; done
+	docker manifest push --purge $(IMAGE):$(TAG)
+
+.PHONY: init-docker-buildx
+init-docker-buildx:
+ifneq ($(shell docker buildx 2>&1 >/dev/null; echo $?),)
+	$(error "buildx not vailable. Docker 19.03 or higher is required")
+endif
+	docker run --rm --privileged linuxkit/binfmt:4ea3b9b0938cbd19834c096aa31ff475cc75d281
+	docker buildx create --name multiarch-go-runner --use || true
+	docker buildx inspect --bootstrap
diff --git a/images/build/go-runner/OWNERS b/images/build/go-runner/OWNERS
new file mode 100644
index 00000000000..8760e69dd46
--- /dev/null
+++ b/images/build/go-runner/OWNERS
@@ -0,0 +1,6 @@
+# See the OWNERS docs at https://go.k8s.io/owners
+
+approvers:
+  - build-image-approvers
+reviewers:
+  - build-image-reviewers
diff --git a/images/build/go-runner/README.md b/images/build/go-runner/README.md
new file mode 100644
index 00000000000..0073d6f5267
--- /dev/null
+++ b/images/build/go-runner/README.md
@@ -0,0 +1,30 @@
+# Kubernetes go-runner image
+
+The Kubernetes go-runner image wraps the gcr.io/distroless/static image and provides a go based
+binary that can run commands and wrap stdout/stderr etc. 
+
+Why do we need this? Some of our images like kube-apiserver currently use bash for collecting
+logs, so we are not able to switch to distroless images directly for these images. The klog's
+`--log-file` was supposed to fix this problem, but we ran into trouble in scalability CI jobs
+around log rotation and picked this option instead. we essentially publish a multi-arch 
+manifest with support for various platforms. This can be used as a base for other kubernetes
+components.
+
+For example instead of running kube-apiserver like this:
+```bash
+"/bin/sh",
+  "-c",
+  "exec /usr/local/bin/kube-apiserver {{params}} --allow-privileged={{pillar['allow_privileged']}} 1>>/var/log/kube-apiserver.log 2>&1"
+```  
+
+we would use go-runner like so:
+```bash
+"/go-runner", "--log-file=/var/log/kube-apiserver.log", "--also-stdout=false", "--redirect-stderr=true",
+  "/usr/local/bin/kube-apiserver",
+  "--allow-privileged={{pillar['allow_privileged']}}",
+  {{params}}
+```
+
+The go-runner would then ensure that we run the `/usr/local/bin/kube-apiserver` with the 
+specified parameters and redirect stdout ONLY to the log file specified and ensure anything 
+logged to stderr also ends up in the log file.
diff --git a/images/build/go-runner/cloudbuild.yaml b/images/build/go-runner/cloudbuild.yaml
new file mode 100644
index 00000000000..eeb3fafe56c
--- /dev/null
+++ b/images/build/go-runner/cloudbuild.yaml
@@ -0,0 +1,22 @@
+# See https://github.com/kubernetes/test-infra/blob/master/config/jobs/image-pushing/README.md for more details on image pushing process
+
+# this must be specified in seconds. If omitted, defaults to 600s (10 mins)
+timeout: 1200s
+# this prevents errors if you don't use both _GIT_TAG and _PULL_BASE_REF,
+# or any new substitutions added in the future.
+options:
+  substitution_option: ALLOW_LOOSE
+  machineType: 'N1_HIGHCPU_8'
+steps:
+  - name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20200422-b25d964'
+    entrypoint: 'bash'
+    dir: ./images/build/go-runner
+    env:
+    - DOCKER_CLI_EXPERIMENTAL=enabled
+    - REGISTRY=gcr.io/$PROJECT_ID
+    - HOME=/root
+    args:
+    - '-c'
+    - |
+      gcloud auth configure-docker \
+      && make manifest
diff --git a/images/build/go-runner/go-runner.go b/images/build/go-runner/go-runner.go
new file mode 100644
index 00000000000..feb141201c1
--- /dev/null
+++ b/images/build/go-runner/go-runner.go
@@ -0,0 +1,122 @@
+/*
+Copyright 2020 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package main
+
+import (
+	"flag"
+	"fmt"
+	"io"
+	"log"
+	"os"
+	"os/exec"
+	"os/signal"
+	"strings"
+	"syscall"
+
+	"github.com/pkg/errors"
+)
+
+var (
+	logFilePath    = flag.String("log-file", "", "If non-empty, save stdout to this file")
+	alsoToStdOut   = flag.Bool("also-stdout", false, "useful with log-file, log to standard output as well as the log file")
+	redirectStderr = flag.Bool("redirect-stderr", true, "treat stderr same as stdout")
+)
+
+func main() {
+	flag.Parse()
+
+	if err := configureAndRun(); err != nil {
+		log.Fatal(err)
+	}
+}
+
+func configureAndRun() error {
+	var (
+		outputStream io.Writer = os.Stdout
+		errStream    io.Writer = os.Stderr
+	)
+
+	args := flag.Args()
+	if len(args) == 0 {
+		return errors.Errorf("not enough arguments to run")
+	}
+
+	if logFilePath != nil && *logFilePath != "" {
+		logFile, err := os.OpenFile(*logFilePath, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
+		if err != nil {
+			return errors.Wrapf(err, "failed to create log file %v", *logFilePath)
+		}
+		if *alsoToStdOut {
+			outputStream = io.MultiWriter(os.Stdout, logFile)
+		} else {
+			outputStream = logFile
+		}
+	}
+
+	if *redirectStderr {
+		errStream = outputStream
+	}
+
+	exe := args[0]
+	var exeArgs []string
+	if len(args) > 1 {
+		exeArgs = args[1:]
+	}
+	cmd := exec.Command(exe, exeArgs...)
+	cmd.Stdout = outputStream
+	cmd.Stderr = errStream
+
+	log.Printf("Running command:\n%v", cmdInfo(cmd))
+	err := cmd.Start()
+	if err != nil {
+		return errors.Wrap(err, "starting command")
+	}
+
+	// Handle signals and shutdown process gracefully.
+	go setupSigHandler(cmd.Process)
+	return errors.Wrap(cmd.Wait(), "running command")
+}
+
+// cmdInfo generates a useful look at what the command is for printing/debug.
+func cmdInfo(cmd *exec.Cmd) string {
+	return fmt.Sprintf(
+		`Command env: (log-file=%v, also-stdout=%v, redirect-stderr=%v)
+Run from directory: %v
+Executable path: %v
+Args (comma-delimited): %v`, *logFilePath, *alsoToStdOut, *redirectStderr,
+		cmd.Dir, cmd.Path, strings.Join(cmd.Args, ","),
+	)
+}
+
+// setupSigHandler will forward any termination signals to the process
+func setupSigHandler(process *os.Process) {
+	// terminationSignals are signals that cause the program to exit in the
+	// supported platforms (linux, darwin, windows).
+	terminationSignals := []os.Signal{syscall.SIGHUP, syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT}
+
+	c := make(chan os.Signal, 1)
+	signal.Notify(c, terminationSignals...)
+
+	// Block until a signal is received.
+	log.Println("Now listening for interrupts")
+	s := <-c
+	log.Printf("Got signal: %v. Sending down to process (PID: %v)", s, process.Pid)
+	if err := process.Signal(s); err != nil {
+		log.Fatalf("Failed to signal process: %v", err)
+	}
+	log.Printf("Signalled process %v successfully.", process.Pid)
+}
diff --git a/images/build/go-runner/go.mod b/images/build/go-runner/go.mod
new file mode 100644
index 00000000000..e5929a4e6f9
--- /dev/null
+++ b/images/build/go-runner/go.mod
@@ -0,0 +1,5 @@
+module k8s.io/kubernetes/build/go-runner
+
+go 1.15
+
+require github.com/pkg/errors v0.9.1
diff --git a/images/build/go-runner/go.sum b/images/build/go-runner/go.sum
new file mode 100644
index 00000000000..7c401c3f58b
--- /dev/null
+++ b/images/build/go-runner/go.sum
@@ -0,0 +1,2 @@
+github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=

From e806c12de03fa95ccde8a7d4d810b592faee01ce Mon Sep 17 00:00:00 2001
From: Stephen Augustus <saugustus@vmware.com>
Date: Tue, 18 Aug 2020 13:06:06 -0400
Subject: [PATCH 2/5] images/go-runner: Enable variant building

Signed-off-by: Stephen Augustus <saugustus@vmware.com>
---
 images/build/go-runner/Dockerfile      |  3 ++-
 images/build/go-runner/Makefile        | 24 ++++++++++++++++--------
 images/build/go-runner/cloudbuild.yaml | 23 +++++++++++++++++++++++
 images/build/go-runner/variants.yaml   |  4 ++++
 4 files changed, 45 insertions(+), 9 deletions(-)
 create mode 100644 images/build/go-runner/variants.yaml

diff --git a/images/build/go-runner/Dockerfile b/images/build/go-runner/Dockerfile
index a9ad0ef3cd4..b0ac4463a57 100644
--- a/images/build/go-runner/Dockerfile
+++ b/images/build/go-runner/Dockerfile
@@ -22,7 +22,8 @@ ARG goproxy=https://proxy.golang.org
 ENV GOPROXY=$goproxy
 
 # Copy the sources
-COPY ./ ./
+COPY ./go-runner.go ./
+COPY ./go.* ./
 
 # Cache the go build
 RUN go build .
diff --git a/images/build/go-runner/Makefile b/images/build/go-runner/Makefile
index 1d3a85ea458..a2cb725365c 100644
--- a/images/build/go-runner/Makefile
+++ b/images/build/go-runner/Makefile
@@ -15,12 +15,14 @@
 # set default shell
 SHELL=/bin/bash -o pipefail
 
-TAG ?= v0.1.1
-REGISTRY ?= k8s.gcr.io
-
+REGISTRY ?= gcr.io/k8s-staging-build-image
 IMGNAME = go-runner
 IMAGE = $(REGISTRY)/$(IMGNAME)
 
+TAG ?= $(shell git describe --tags --always --dirty)
+IMAGE_VERSION ?= v0.1.1
+CONFIG ?= buster
+
 PLATFORMS = linux/amd64 linux/arm64 linux/arm linux/ppc64le linux/s390x
 
 HOST_GOOS ?= $(shell go env GOOS)
@@ -48,18 +50,24 @@ container: init-docker-buildx
 		--load \
 		--progress plain \
 		--platform $(PLATFORM) \
-		--tag $(IMAGE)-$(PLATFORM):$(TAG) .;)
+		--tag $(IMAGE)-$(PLATFORM):$(IMAGE_VERSION) \
+		--tag $(IMAGE)-$(PLATFORM):$(TAG)-$(CONFIG) \
+		--tag $(IMAGE)-$(PLATFORM):latest-$(CONFIG) .;)
 
 .PHONY: push
 push: container
 	$(foreach PLATFORM,$(PLATFORMS), \
-		docker push $(IMAGE)-$(PLATFORM):$(TAG);)
+		docker push $(IMAGE)-$(PLATFORM):$(IMAGE_VERSION);)
+	$(foreach PLATFORM,$(PLATFORMS), \
+		docker push $(IMAGE)-$(PLATFORM):$(TAG)-$(CONFIG);)
+	$(foreach PLATFORM,$(PLATFORMS), \
+		docker push $(IMAGE)-$(PLATFORM):latest-$(CONFIG);)
 
 .PHONY: manifest
 manifest: push
-	docker manifest create --amend $(IMAGE):$(TAG) $(shell echo $(PLATFORMS) | sed -e "s~[^ ]*~$(IMAGE)\-&:$(TAG)~g")
-	@for arch in $(PLATFORMS); do docker manifest annotate --arch "$${arch##*/}" ${IMAGE}:${TAG} ${IMAGE}-$${arch}:${TAG}; done
-	docker manifest push --purge $(IMAGE):$(TAG)
+	docker manifest create --amend $(IMAGE):$(IMAGE_VERSION) $(shell echo $(PLATFORMS) | sed -e "s~[^ ]*~$(IMAGE)\-&:$(IMAGE_VERSION)~g")
+	@for arch in $(PLATFORMS); do docker manifest annotate --arch "$${arch##*/}" ${IMAGE}:${IMAGE_VERSION} ${IMAGE}-$${arch}:${IMAGE_VERSION}; done
+	docker manifest push --purge $(IMAGE):$(IMAGE_VERSION)
 
 .PHONY: init-docker-buildx
 init-docker-buildx:
diff --git a/images/build/go-runner/cloudbuild.yaml b/images/build/go-runner/cloudbuild.yaml
index eeb3fafe56c..77101b5ca6d 100644
--- a/images/build/go-runner/cloudbuild.yaml
+++ b/images/build/go-runner/cloudbuild.yaml
@@ -15,8 +15,31 @@ steps:
     - DOCKER_CLI_EXPERIMENTAL=enabled
     - REGISTRY=gcr.io/$PROJECT_ID
     - HOME=/root
+    - TAG=$_GIT_TAG
+    - PULL_BASE_REF=$_PULL_BASE_REF
+    - IMAGE_VERSION=$_IMAGE_VERSION
+    - CONFIG=$_CONFIG
     args:
     - '-c'
     - |
       gcloud auth configure-docker \
       && make manifest
+
+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'
+  _IMAGE_VERSION: 'codename-v0.0.0'
+  _CONFIG: 'codename'
+
+tags:
+- ${_GIT_TAG}
+- ${_PULL_BASE_REF}
+- ${_IMAGE_VERSION}
+- ${_CONFIG}
+
+images:
+  - 'gcr.io/$PROJECT_ID/go-runner-linux/amd64:$_IMAGE_VERSION'
+  - 'gcr.io/$PROJECT_ID/go-runner-linux/amd64:$_GIT_TAG-$_CONFIG'
+  - 'gcr.io/$PROJECT_ID/go-runner-linux/amd64:latest-$_CONFIG'
diff --git a/images/build/go-runner/variants.yaml b/images/build/go-runner/variants.yaml
new file mode 100644
index 00000000000..856faf01b8b
--- /dev/null
+++ b/images/build/go-runner/variants.yaml
@@ -0,0 +1,4 @@
+variants:
+  v0:
+    CONFIG: 'buster'
+    IMAGE_VERSION: 'v0.1.1'

From a03497ed386aaef1d17e20a827db00a6d43452d0 Mon Sep 17 00:00:00 2001
From: Stephen Augustus <saugustus@vmware.com>
Date: Tue, 18 Aug 2020 14:09:28 -0400
Subject: [PATCH 3/5] images/go-runner: Add 'buster' variant

Signed-off-by: Stephen Augustus <saugustus@vmware.com>
---
 dependencies.yaml                      | 6 ++++--
 images/build/go-runner/Dockerfile      | 3 ++-
 images/build/go-runner/Makefile        | 6 ++++--
 images/build/go-runner/cloudbuild.yaml | 3 +++
 images/build/go-runner/variants.yaml   | 5 +++--
 5 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/dependencies.yaml b/dependencies.yaml
index 43c474be162..4b6edbc425c 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -100,7 +100,9 @@ dependencies:
       match: BASEIMAGE\?\=\$\(BASE_REGISTRY\)\/debian-iptables-\$\(ARCH\):v\d+\.\d+\.\d+
 
   - name: "k8s.gcr.io/go-runner"
-    version: 0.1.1
+    version: buster-v1.0.0
     refPaths:
     - path: images/build/go-runner/Makefile
-      match: TAG \?=
+      match: IMAGE_VERSION\ \?=\ [a-zA-Z]+\-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/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-]+)*))?)
diff --git a/images/build/go-runner/Dockerfile b/images/build/go-runner/Dockerfile
index b0ac4463a57..1381491d856 100644
--- a/images/build/go-runner/Dockerfile
+++ b/images/build/go-runner/Dockerfile
@@ -13,6 +13,7 @@
 # limitations under the License.
 
 # Build the manager binary
+ARG DISTROLESS_IMAGE
 FROM golang:1.13 as builder
 WORKDIR /workspace
 
@@ -38,7 +39,7 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=${ARCH} \
     -o go-runner ${package}
 
 # Production image
-FROM gcr.io/distroless/static:latest
+FROM gcr.io/distroless/${DISTROLESS_IMAGE}:latest
 LABEL maintainers="Kubernetes Authors"
 LABEL description="go based runner for distroless scenarios"
 WORKDIR /
diff --git a/images/build/go-runner/Makefile b/images/build/go-runner/Makefile
index a2cb725365c..ed9bdd44c07 100644
--- a/images/build/go-runner/Makefile
+++ b/images/build/go-runner/Makefile
@@ -20,8 +20,9 @@ IMGNAME = go-runner
 IMAGE = $(REGISTRY)/$(IMGNAME)
 
 TAG ?= $(shell git describe --tags --always --dirty)
-IMAGE_VERSION ?= v0.1.1
+IMAGE_VERSION ?= buster-v1.0.0
 CONFIG ?= buster
+DISTROLESS_IMAGE ?= static-debian10
 
 PLATFORMS = linux/amd64 linux/arm64 linux/arm linux/ppc64le linux/s390x
 
@@ -52,7 +53,8 @@ container: init-docker-buildx
 		--platform $(PLATFORM) \
 		--tag $(IMAGE)-$(PLATFORM):$(IMAGE_VERSION) \
 		--tag $(IMAGE)-$(PLATFORM):$(TAG)-$(CONFIG) \
-		--tag $(IMAGE)-$(PLATFORM):latest-$(CONFIG) .;)
+		--tag $(IMAGE)-$(PLATFORM):latest-$(CONFIG) \
+		--build-arg=DISTROLESS_IMAGE=$(DISTROLESS_IMAGE) .;)
 
 .PHONY: push
 push: container
diff --git a/images/build/go-runner/cloudbuild.yaml b/images/build/go-runner/cloudbuild.yaml
index 77101b5ca6d..42cd274c3ee 100644
--- a/images/build/go-runner/cloudbuild.yaml
+++ b/images/build/go-runner/cloudbuild.yaml
@@ -19,6 +19,7 @@ steps:
     - PULL_BASE_REF=$_PULL_BASE_REF
     - IMAGE_VERSION=$_IMAGE_VERSION
     - CONFIG=$_CONFIG
+    - DISTROLESS_IMAGE=$_DISTROLESS_IMAGE
     args:
     - '-c'
     - |
@@ -32,12 +33,14 @@ substitutions:
   _PULL_BASE_REF: 'dev'
   _IMAGE_VERSION: 'codename-v0.0.0'
   _CONFIG: 'codename'
+  _DISTROLESS_IMAGE: 'static-debian00'
 
 tags:
 - ${_GIT_TAG}
 - ${_PULL_BASE_REF}
 - ${_IMAGE_VERSION}
 - ${_CONFIG}
+- ${_DISTROLESS_IMAGE}
 
 images:
   - 'gcr.io/$PROJECT_ID/go-runner-linux/amd64:$_IMAGE_VERSION'
diff --git a/images/build/go-runner/variants.yaml b/images/build/go-runner/variants.yaml
index 856faf01b8b..7d93f89c4b1 100644
--- a/images/build/go-runner/variants.yaml
+++ b/images/build/go-runner/variants.yaml
@@ -1,4 +1,5 @@
 variants:
-  v0:
+  buster:
     CONFIG: 'buster'
-    IMAGE_VERSION: 'v0.1.1'
+    IMAGE_VERSION: 'buster-v1.0.0'
+    DISTROLESS_IMAGE: 'static-debian10'

From d6bbe653f0ba716feb0b07f2cd36481f3327c11a Mon Sep 17 00:00:00 2001
From: Stephen Augustus <saugustus@vmware.com>
Date: Tue, 18 Aug 2020 14:19:33 -0400
Subject: [PATCH 4/5] images/go-runner: Allow configurable go versions and use
 go1.13.15

Signed-off-by: Stephen Augustus <saugustus@vmware.com>
---
 images/build/go-runner/Dockerfile      | 3 ++-
 images/build/go-runner/Makefile        | 4 ++++
 images/build/go-runner/cloudbuild.yaml | 3 +++
 images/build/go-runner/variants.yaml   | 1 +
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/images/build/go-runner/Dockerfile b/images/build/go-runner/Dockerfile
index 1381491d856..15c0c432f32 100644
--- a/images/build/go-runner/Dockerfile
+++ b/images/build/go-runner/Dockerfile
@@ -13,8 +13,9 @@
 # limitations under the License.
 
 # Build the manager binary
+ARG GO_VERSION
 ARG DISTROLESS_IMAGE
-FROM golang:1.13 as builder
+FROM golang:${GO_VERSION} as builder
 WORKDIR /workspace
 
 # Run this with docker build --build_arg goproxy=$(go env GOPROXY) to override the goproxy
diff --git a/images/build/go-runner/Makefile b/images/build/go-runner/Makefile
index ed9bdd44c07..fe24b970159 100644
--- a/images/build/go-runner/Makefile
+++ b/images/build/go-runner/Makefile
@@ -22,6 +22,9 @@ IMAGE = $(REGISTRY)/$(IMGNAME)
 TAG ?= $(shell git describe --tags --always --dirty)
 IMAGE_VERSION ?= buster-v1.0.0
 CONFIG ?= buster
+
+# Build args
+GO_VERSION ?= 1.13.15
 DISTROLESS_IMAGE ?= static-debian10
 
 PLATFORMS = linux/amd64 linux/arm64 linux/arm linux/ppc64le linux/s390x
@@ -54,6 +57,7 @@ container: init-docker-buildx
 		--tag $(IMAGE)-$(PLATFORM):$(IMAGE_VERSION) \
 		--tag $(IMAGE)-$(PLATFORM):$(TAG)-$(CONFIG) \
 		--tag $(IMAGE)-$(PLATFORM):latest-$(CONFIG) \
+		--build-arg=GO_VERSION=$(GO_VERSION) \
 		--build-arg=DISTROLESS_IMAGE=$(DISTROLESS_IMAGE) .;)
 
 .PHONY: push
diff --git a/images/build/go-runner/cloudbuild.yaml b/images/build/go-runner/cloudbuild.yaml
index 42cd274c3ee..2ad3038bc31 100644
--- a/images/build/go-runner/cloudbuild.yaml
+++ b/images/build/go-runner/cloudbuild.yaml
@@ -19,6 +19,7 @@ steps:
     - PULL_BASE_REF=$_PULL_BASE_REF
     - IMAGE_VERSION=$_IMAGE_VERSION
     - CONFIG=$_CONFIG
+    - GO_VERSION=$_GO_VERSION
     - DISTROLESS_IMAGE=$_DISTROLESS_IMAGE
     args:
     - '-c'
@@ -33,6 +34,7 @@ substitutions:
   _PULL_BASE_REF: 'dev'
   _IMAGE_VERSION: 'codename-v0.0.0'
   _CONFIG: 'codename'
+  _GO_VERSION: '0.0.0'
   _DISTROLESS_IMAGE: 'static-debian00'
 
 tags:
@@ -40,6 +42,7 @@ tags:
 - ${_PULL_BASE_REF}
 - ${_IMAGE_VERSION}
 - ${_CONFIG}
+- ${_GO_VERSION}
 - ${_DISTROLESS_IMAGE}
 
 images:
diff --git a/images/build/go-runner/variants.yaml b/images/build/go-runner/variants.yaml
index 7d93f89c4b1..e77b3e50ad8 100644
--- a/images/build/go-runner/variants.yaml
+++ b/images/build/go-runner/variants.yaml
@@ -2,4 +2,5 @@ variants:
   buster:
     CONFIG: 'buster'
     IMAGE_VERSION: 'buster-v1.0.0'
+    GO_VERSION: '1.13.15'
     DISTROLESS_IMAGE: 'static-debian10'

From c1173c8c7fd67c12832e78f723da0e042834c7b4 Mon Sep 17 00:00:00 2001
From: Stephen Augustus <saugustus@vmware.com>
Date: Tue, 18 Aug 2020 15:20:43 -0400
Subject: [PATCH 5/5] images/go-runner: Fixup go module and build files

Signed-off-by: Stephen Augustus <saugustus@vmware.com>
---
 BUILD.bazel                                   | 1 +
 images/build/go-runner/{BUILD => BUILD.bazel} | 4 ++--
 images/build/go-runner/go.mod                 | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)
 rename images/build/go-runner/{BUILD => BUILD.bazel} (82%)

diff --git a/BUILD.bazel b/BUILD.bazel
index 0a9ed462257..52f22eeb9bc 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -34,6 +34,7 @@ filegroup(
         "//cmd/kubepkg:all-srcs",
         "//cmd/release-notes:all-srcs",
         "//cmd/schedule-builder:all-srcs",
+        "//images/build/go-runner:all-srcs",
         "//lib:all-srcs",
         "//packages/deb:all-srcs",
         "//pkg/announce:all-srcs",
diff --git a/images/build/go-runner/BUILD b/images/build/go-runner/BUILD.bazel
similarity index 82%
rename from images/build/go-runner/BUILD
rename to images/build/go-runner/BUILD.bazel
index 1a3f5dc40bd..ecbd101c533 100644
--- a/images/build/go-runner/BUILD
+++ b/images/build/go-runner/BUILD.bazel
@@ -3,9 +3,9 @@ load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 go_library(
     name = "go_default_library",
     srcs = ["go-runner.go"],
-    importpath = "k8s.io/kubernetes/build/go-runner",
+    importpath = "k8s.io/release/images/build/go-runner",
     visibility = ["//visibility:private"],
-    deps = ["//vendor/github.com/pkg/errors:go_default_library"],
+    deps = ["@com_github_pkg_errors//:go_default_library"],
 )
 
 go_binary(
diff --git a/images/build/go-runner/go.mod b/images/build/go-runner/go.mod
index e5929a4e6f9..ffcd2a45bc2 100644
--- a/images/build/go-runner/go.mod
+++ b/images/build/go-runner/go.mod
@@ -1,4 +1,4 @@
-module k8s.io/kubernetes/build/go-runner
+module k8s.io/release/images/build/go-runner
 
 go 1.15