github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Switch to k8s.gcr.io (from staging) 

Change-Id: Ib0d6f681be3537f0cbfcae1dc254f1c42a04be66
pull/564/head
Davanum Srinivas 2019-02-27 08:54:45 -05:00
parent 87d9903aaf
commit 23b33f5c85
No known key found for this signature in database
GPG Key ID: 80D83A796103BF59
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/images/conformance/Makefile
View File

@ -15,9 +15,9 @@
# Build the conformance image.
#
# Usage:
# [ARCH=amd64] [REGISTRY="staging-k8s.gcr.io"] make (build|push) VERSION={some_released_version_of_kubernetes}
# [ARCH=amd64] [REGISTRY="k8s.gcr.io"] make (build|push) VERSION={some_released_version_of_kubernetes}
REGISTRY?=staging-k8s.gcr.io
REGISTRY?=k8s.gcr.io
ARCH?=amd64
OUT_DIR?=_output

14
cluster/images/conformance/README.md
View File

@ -10,23 +10,23 @@
$ make WHAT="test/e2e/e2e.test vendor/github.com/onsi/ginkgo/ginkgo cmd/kubectl"
# Build for linux/amd64 (default)
# export REGISTRY=$HOST/$ORG to switch from staging-k8s.gcr.io
# export REGISTRY=$HOST/$ORG to switch from k8s.gcr.io
$ make push VERSION={target_version} ARCH=amd64
# ---> staging-k8s.gcr.io/conformance-amd64:VERSION
# ---> staging-k8s.gcr.io/conformance:VERSION (image with backwards-compatible naming)
# ---> k8s.gcr.io/conformance-amd64:VERSION
# ---> k8s.gcr.io/conformance:VERSION (image with backwards-compatible naming)
$ make push VERSION={target_version} ARCH=arm
# ---> staging-k8s.gcr.io/conformance-arm:VERSION
# ---> k8s.gcr.io/conformance-arm:VERSION
$ make push VERSION={target_version} ARCH=arm64
# ---> staging-k8s.gcr.io/conformance-arm64:VERSION
# ---> k8s.gcr.io/conformance-arm64:VERSION
$ make push VERSION={target_version} ARCH=ppc64le
# ---> staging-k8s.gcr.io/conformance-ppc64le:VERSION
# ---> k8s.gcr.io/conformance-ppc64le:VERSION
$ make push VERSION={target_version} ARCH=s390x
# ---> staging-k8s.gcr.io/conformance-s390x:VERSION
# ---> k8s.gcr.io/conformance-s390x:VERSION
```
If you don't want to push the images, run `make` or `make build` instead

2
cluster/images/conformance/conformance-e2e.yaml
View File

@ -55,7 +55,7 @@ metadata:
spec:
containers:
- name: conformance-container
image: staging-k8s.gcr.io/conformance-amd64:v1.14-alpha4
image: k8s.gcr.io/conformance-amd64:v1.14
imagePullPolicy: IfNotPresent
env:
- name: E2E_FOCUS