Skip to content

K
k3s
Unverified Commit f4d560fa authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #66665 from dims/update-webhook-test-image-to-multi-arch

Automatic merge from submit-queue (batch tested with PRs 66665, 66707, 66596). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Update webhook test image to multi-arch **What this PR does / why we need it**: Use the `image-util.sh` to build the container image so we can generate the full manifest for multi-arch images **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes # **Special notes for your reviewer**: /cc @mkumatag /cc @luxas **Release note**: ```release-note NONE ```
parents 2ffbaa13 1013fe98
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 9 deletions
test/images/webhook/BASEIMAGE 0 → 100644
View file @ f4d560fa
amd64=alpine:3.6
arm=arm32v6/alpine:3.6
arm64=arm64v8/alpine:3.6
ppc64le=ppc64le/alpine:3.6
test/images/webhook/Dockerfile
View file @ f4d560fa
......@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
FROM alpine:latest
FROM BASEIMAGE
ADD webhook /webhook
ENTRYPOINT ["/webhook"]
test/images/webhook/Makefile
View file @ f4d560fa
......@@ -12,12 +12,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
IMAGE = gcr.io/kubernetes-e2e-test-images/k8s-sample-admission-webhook-amd64
TAG = 1.10v2
SRCS=webhook
ARCH ?= amd64
TARGET ?= $(CURDIR)
GOLANG_VERSION ?= latest
SRC_DIR = $(notdir $(shell pwd))
export
build:
CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o webhook .
docker build --no-cache -t $(IMAGE):$(TAG) .
rm -rf webhook
push:
docker push $(IMAGE):$(TAG)
bin:
../image-util.sh bin $(SRCS)
.PHONY: bin
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment