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

Merge pull request #57824 from thockin/gcr-vanity 

Automatic merge from submit-queue (batch tested with PRs 57824, 58806, 59410, 59280). 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>.

2nd try at using a vanity GCR name

The 2nd commit here is the changes relative to the reverted PR.  Please focus review attention on that.

This is the 2nd attempt.  The previous try (#57573) was reverted while we
figured out the regional mirrors (oops).
    
New plan: k8s.gcr.io is a read-only facade that auto-detects your source
region (us, eu, or asia for now) and pulls from the closest.  To publish
an image, push k8s-staging.gcr.io and it will be synced to the regionals
automatically (similar to today).  For now the staging is an alias to
gcr.io/google_containers (the legacy URL).
    
When we move off of google-owned projects (working on it), then we just
do a one-time sync, and change the google-internal config, and nobody
outside should notice.
    
We can, in parallel, change the auto-sync into a manual sync - send a PR
to "promote" something from staging, and a bot activates it.  Nice and
visible, easy to keep track of.

xref https://github.com/kubernetes/release/issues/281

TL;DR:
  *  The new `staging-k8s.gcr.io` is where we push images.  It is literally an alias to `gcr.io/google_containers` (the existing repo) and is hosted in the US.
  * The contents of `staging-k8s.gcr.io` are automatically synced to `{asia,eu,us)-k8s.gcr.io`.
  * The new `k8s.gcr.io` will be a read-only alias to whichever regional repo is closest to you.
  * In the future, images will be promoted from `staging` to regional "prod" more explicitly and auditably.

 ```release-note
Use "k8s.gcr.io" for pulling container images rather than "gcr.io/google_containers".  Images are already synced, so this should not impact anyone materially.
    
Documentation and tools should all convert to the new name. Users should take note of this in case they see this new name in the system.
```
pull/6/head
Kubernetes Submit Queue 2018-02-08 03:29:32 -08:00 committed by GitHub
parent 6827c3cf47 3586986416
commit fb340a4695
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
232 changed files with 486 additions and 469 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/openapi-spec/swagger.json generated
View File

@ -76545,7 +76545,7 @@
], ],
"properties": { "properties": {
"names": { "names": {
"description": "Names by which this image is known. e.g. [\"gcr.io/google_containers/hyperkube:v1.0.7\", \"dockerhub.io/google_containers/hyperkube:v1.0.7\"]", "description": "Names by which this image is known. e.g. [\"k8s.gcr.io/hyperkube:v1.0.7\", \"dockerhub.io/google_containers/hyperkube:v1.0.7\"]",
"type": "array", "type": "array",
"items": { "items": {
"type": "string" "type": "string"

2
api/swagger-spec/v1.json generated
View File

@ -20261,7 +20261,7 @@
"items": { "items": {
"type": "string" "type": "string"
}, },
"description": "Names by which this image is known. e.g. [\"gcr.io/google_containers/hyperkube:v1.0.7\", \"dockerhub.io/google_containers/hyperkube:v1.0.7\"]" "description": "Names by which this image is known. e.g. [\"k8s.gcr.io/hyperkube:v1.0.7\", \"dockerhub.io/google_containers/hyperkube:v1.0.7\"]"
}, },
"sizeBytes": { "sizeBytes": {
"type": "integer", "type": "integer",

6
build/BUILD
View File

@ -62,7 +62,11 @@ DOCKERIZED_BINARIES = {
[docker_bundle( [docker_bundle(
name = binary, name = binary,
images = {"gcr.io/google_containers/%s:{STABLE_DOCKER_TAG}" % binary: binary + "-internal"}, # TODO(thockin): remove the google_containers name after release 1.10.
images = {
"k8s.gcr.io/%s:{STABLE_DOCKER_TAG}" % binary: binary + "-internal",
"gcr.io/google_containers/%s:{STABLE_DOCKER_TAG}" % binary: binary + "-internal",
},
stamp = True, stamp = True,
) for binary in DOCKERIZED_BINARIES.keys()] ) for binary in DOCKERIZED_BINARIES.keys()]

2
build/build-image/Dockerfile
View File

@ -13,7 +13,7 @@
# limitations under the License. # limitations under the License.
# This file creates a standard build environment for building Kubernetes # This file creates a standard build environment for building Kubernetes
FROM gcr.io/google_containers/kube-cross:KUBE_BUILD_IMAGE_CROSS_TAG FROM k8s.gcr.io/kube-cross:KUBE_BUILD_IMAGE_CROSS_TAG
# Mark this as a kube-build container # Mark this as a kube-build container
RUN touch /kube-build-image RUN touch /kube-build-image

4
build/build-image/cross/Makefile
View File

@ -21,7 +21,7 @@ TAG=$(shell cat VERSION)
all: push all: push
build: build:
docker build --pull -t gcr.io/google_containers/$(IMAGE):$(TAG) . docker build --pull -t staging-k8s.gcr.io/$(IMAGE):$(TAG) .
push: build push: build
gcloud docker -- push gcr.io/google_containers/$(IMAGE):$(TAG) gcloud docker -- push staging-k8s.gcr.io/$(IMAGE):$(TAG)

10
build/common.sh
View File

@ -96,7 +96,7 @@ kube::build::get_docker_wrapped_binaries() {
kube-controller-manager,busybox kube-controller-manager,busybox
kube-scheduler,busybox kube-scheduler,busybox
kube-aggregator,busybox kube-aggregator,busybox
kube-proxy,gcr.io/google-containers/debian-iptables-amd64:${debian_iptables_version} kube-proxy,k8s.gcr.io/debian-iptables-amd64:${debian_iptables_version}
);; );;
"arm") "arm")
local targets=( local targets=(
@ -105,7 +105,7 @@ kube::build::get_docker_wrapped_binaries() {
kube-controller-manager,arm32v7/busybox kube-controller-manager,arm32v7/busybox
kube-scheduler,arm32v7/busybox kube-scheduler,arm32v7/busybox
kube-aggregator,arm32v7/busybox kube-aggregator,arm32v7/busybox
kube-proxy,gcr.io/google-containers/debian-iptables-arm:${debian_iptables_version} kube-proxy,k8s.gcr.io/debian-iptables-arm:${debian_iptables_version}
);; );;
"arm64") "arm64")
local targets=( local targets=(
@ -114,7 +114,7 @@ kube::build::get_docker_wrapped_binaries() {
kube-controller-manager,arm64v8/busybox kube-controller-manager,arm64v8/busybox
kube-scheduler,arm64v8/busybox kube-scheduler,arm64v8/busybox
kube-aggregator,arm64v8/busybox kube-aggregator,arm64v8/busybox
kube-proxy,gcr.io/google-containers/debian-iptables-arm64:${debian_iptables_version} kube-proxy,k8s.gcr.io/debian-iptables-arm64:${debian_iptables_version}
);; );;
"ppc64le") "ppc64le")
local targets=( local targets=(
@ -123,7 +123,7 @@ kube::build::get_docker_wrapped_binaries() {
kube-controller-manager,ppc64le/busybox kube-controller-manager,ppc64le/busybox
kube-scheduler,ppc64le/busybox kube-scheduler,ppc64le/busybox
kube-aggregator,ppc64le/busybox kube-aggregator,ppc64le/busybox
kube-proxy,gcr.io/google-containers/debian-iptables-ppc64le:${debian_iptables_version} kube-proxy,k8s.gcr.io/debian-iptables-ppc64le:${debian_iptables_version}
);; );;
"s390x") "s390x")
local targets=( local targets=(
@ -132,7 +132,7 @@ kube::build::get_docker_wrapped_binaries() {
kube-controller-manager,s390x/busybox kube-controller-manager,s390x/busybox
kube-scheduler,s390x/busybox kube-scheduler,s390x/busybox
kube-aggregator,s390x/busybox kube-aggregator,s390x/busybox
kube-proxy,gcr.io/google-containers/debian-iptables-s390x:${debian_iptables_version} kube-proxy,k8s.gcr.io/debian-iptables-s390x:${debian_iptables_version}
);; );;
esac esac

2
build/debian-base/Makefile
View File

@ -14,7 +14,7 @@
all: build all: build
REGISTRY ?= gcr.io/google-containers REGISTRY ?= staging-k8s.gcr.io
IMAGE ?= debian-base IMAGE ?= debian-base
BUILD_IMAGE ?= debian-build BUILD_IMAGE ?= debian-build

6
build/debian-hyperkube-base/Makefile
View File

@ -15,15 +15,15 @@
# Build the hyperkube base image. This image is used to build the hyperkube image. # Build the hyperkube base image. This image is used to build the hyperkube image.
# #
# Usage: # Usage:
# [ARCH=amd64] [REGISTRY="gcr.io/google-containers"] make (build|push) # [ARCH=amd64] [REGISTRY="staging-k8s.gcr.io"] make (build|push)
REGISTRY?=gcr.io/google-containers REGISTRY?=staging-k8s.gcr.io
IMAGE?=debian-hyperkube-base IMAGE?=debian-hyperkube-base
TAG=0.8 TAG=0.8
ARCH?=amd64 ARCH?=amd64
CACHEBUST?=1 CACHEBUST?=1
BASEIMAGE=gcr.io/google-containers/debian-base-$(ARCH):0.3 BASEIMAGE=k8s.gcr.io/debian-base-$(ARCH):0.3
CNI_VERSION=v0.6.0 CNI_VERSION=v0.6.0
TEMP_DIR:=$(shell mktemp -d) TEMP_DIR:=$(shell mktemp -d)

12
build/debian-hyperkube-base/README.md
View File

@ -1,6 +1,6 @@
### debian-hyperkube-base ### debian-hyperkube-base
Serves as the base image for `gcr.io/google-containers/hyperkube-${ARCH}` Serves as the base image for `k8s.gcr.io/hyperkube-${ARCH}`
images. images.
This image is compiled for multiple architectures. This image is compiled for multiple architectures.
@ -12,19 +12,19 @@ If you're editing the Dockerfile or some other thing, please bump the `TAG` in t
```console ```console
# Build for linux/amd64 (default) # Build for linux/amd64 (default)
$ make push ARCH=amd64 $ make push ARCH=amd64
# ---> gcr.io/google-containers/debian-hyperkube-base-amd64:TAG # ---> staging-k8s.gcr.io/debian-hyperkube-base-amd64:TAG
$ make push ARCH=arm $ make push ARCH=arm
# ---> gcr.io/google-containers/debian-hyperkube-base-arm:TAG # ---> staging-k8s.gcr.io/debian-hyperkube-base-arm:TAG
$ make push ARCH=arm64 $ make push ARCH=arm64
# ---> gcr.io/google-containers/debian-hyperkube-base-arm64:TAG # ---> staging-k8s.gcr.io/debian-hyperkube-base-arm64:TAG
$ make push ARCH=ppc64le $ make push ARCH=ppc64le
# ---> gcr.io/google-containers/debian-hyperkube-base-ppc64le:TAG # ---> staging-k8s.gcr.io/debian-hyperkube-base-ppc64le:TAG
$ make push ARCH=s390x $ make push ARCH=s390x
# ---> gcr.io/google-containers/debian-hyperkube-base-s390x:TAG # ---> staging-k8s.gcr.io/debian-hyperkube-base-s390x:TAG
``` ```
If you don't want to push the images, run `make build` instead If you don't want to push the images, run `make build` instead

4
build/debian-iptables/Makefile
View File

@ -14,7 +14,7 @@
.PHONY: build push .PHONY: build push
REGISTRY?="gcr.io/google-containers" REGISTRY?="staging-k8s.gcr.io"
IMAGE=debian-iptables IMAGE=debian-iptables
TAG=v10 TAG=v10
ARCH?=amd64 ARCH?=amd64
@ -34,7 +34,7 @@ ifeq ($(ARCH),s390x)
QEMUARCH=s390x QEMUARCH=s390x
endif endif
BASEIMAGE=gcr.io/google-containers/debian-base-$(ARCH):0.3 BASEIMAGE=k8s.gcr.io/debian-base-$(ARCH):0.3
build: build:
cp ./* $(TEMP_DIR) cp ./* $(TEMP_DIR)

12
build/debian-iptables/README.md
View File

@ -1,6 +1,6 @@
### debian-iptables ### debian-iptables
Serves as the base image for `gcr.io/google_containers/kube-proxy-${ARCH}` and multiarch (not `amd64`) `gcr.io/google_containers/flannel-${ARCH}` images. Serves as the base image for `k8s.gcr.io/kube-proxy-${ARCH}` and multiarch (not `amd64`) `k8s.gcr.io/flannel-${ARCH}` images.
This image is compiled for multiple architectures. This image is compiled for multiple architectures.
@ -11,19 +11,19 @@ If you're editing the Dockerfile or some other thing, please bump the `TAG` in t
```console ```console
# Build for linux/amd64 (default) # Build for linux/amd64 (default)
$ make push ARCH=amd64 $ make push ARCH=amd64
# ---> gcr.io/google_containers/debian-iptables-amd64:TAG # ---> staging-k8s.gcr.io/debian-iptables-amd64:TAG
$ make push ARCH=arm $ make push ARCH=arm
# ---> gcr.io/google_containers/debian-iptables-arm:TAG # ---> staging-k8s.gcr.io/debian-iptables-arm:TAG
$ make push ARCH=arm64 $ make push ARCH=arm64
# ---> gcr.io/google_containers/debian-iptables-arm64:TAG # ---> staging-k8s.gcr.io/debian-iptables-arm64:TAG
$ make push ARCH=ppc64le $ make push ARCH=ppc64le
# ---> gcr.io/google_containers/debian-iptables-ppc64le:TAG # ---> staging-k8s.gcr.io/debian-iptables-ppc64le:TAG
$ make push ARCH=s390x $ make push ARCH=s390x
# ---> gcr.io/google_containers/debian-iptables-s390x:TAG # ---> staging-k8s.gcr.io/debian-iptables-s390x:TAG
``` ```
If you don't want to push the images, run `make` or `make build` instead If you don't want to push the images, run `make` or `make build` instead

13
build/lib/release.sh
View File

@ -284,7 +284,11 @@ function kube::release::create_docker_images_for_server() {
local images_dir="${RELEASE_IMAGES}/${arch}" local images_dir="${RELEASE_IMAGES}/${arch}"
mkdir -p "${images_dir}" mkdir -p "${images_dir}"
local -r docker_registry="gcr.io/google_containers" local -r docker_registry="k8s.gcr.io"
# TODO(thockin): Remove all traces of this after 1.10 release.
# The following is the old non-indirected registry name. To ease the
# transition to the new name (above), we are double-tagging saved images.
local -r deprecated_registry="gcr.io/google_containers"
# Docker tags cannot contain '+' # Docker tags cannot contain '+'
local docker_tag="${KUBE_GIT_VERSION/+/_}" local docker_tag="${KUBE_GIT_VERSION/+/_}"
if [[ -z "${docker_tag}" ]]; then if [[ -z "${docker_tag}" ]]; then
@ -305,14 +309,17 @@ function kube::release::create_docker_images_for_server() {
local docker_file_path="${docker_build_path}/Dockerfile" local docker_file_path="${docker_build_path}/Dockerfile"
local binary_file_path="${binary_dir}/${binary_name}" local binary_file_path="${binary_dir}/${binary_name}"
local docker_image_tag="${docker_registry}" local docker_image_tag="${docker_registry}"
local deprecated_image_tag="${deprecated_registry}"
if [[ ${arch} == "amd64" ]]; then if [[ ${arch} == "amd64" ]]; then
# If we are building a amd64 docker image, preserve the original # If we are building a amd64 docker image, preserve the original
# image name # image name
docker_image_tag+="/${binary_name}:${docker_tag}" docker_image_tag+="/${binary_name}:${docker_tag}"
deprecated_image_tag+="/${binary_name}:${docker_tag}"
else else
# If we are building a docker image for another architecture, # If we are building a docker image for another architecture,
# append the arch in the image tag # append the arch in the image tag
docker_image_tag+="/${binary_name}-${arch}:${docker_tag}" docker_image_tag+="/${binary_name}-${arch}:${docker_tag}"
deprecated_image_tag+="/${binary_name}-${arch}:${docker_tag}"
fi fi
@ -324,7 +331,8 @@ function kube::release::create_docker_images_for_server() {
printf " FROM ${base_image} \n ADD ${binary_name} /usr/local/bin/${binary_name}\n" > ${docker_file_path} printf " FROM ${base_image} \n ADD ${binary_name} /usr/local/bin/${binary_name}\n" > ${docker_file_path}
"${DOCKER[@]}" build --pull -q -t "${docker_image_tag}" ${docker_build_path} >/dev/null "${DOCKER[@]}" build --pull -q -t "${docker_image_tag}" ${docker_build_path} >/dev/null
"${DOCKER[@]}" save "${docker_image_tag}" > "${binary_dir}/${binary_name}.tar" "${DOCKER[@]}" tag "${docker_image_tag}" ${deprecated_image_tag} >/dev/null
"${DOCKER[@]}" save "${docker_image_tag}" ${deprecated_image_tag} > "${binary_dir}/${binary_name}.tar"
echo "${docker_tag}" > ${binary_dir}/${binary_name}.docker_tag echo "${docker_tag}" > ${binary_dir}/${binary_name}.docker_tag
rm -rf ${docker_build_path} rm -rf ${docker_build_path}
ln "${binary_dir}/${binary_name}.tar" "${images_dir}/" ln "${binary_dir}/${binary_name}.tar" "${images_dir}/"
@ -343,6 +351,7 @@ function kube::release::create_docker_images_for_server() {
# not a release # not a release
kube::log::status "Deleting docker image ${docker_image_tag}" kube::log::status "Deleting docker image ${docker_image_tag}"
"${DOCKER[@]}" rmi ${docker_image_tag} &>/dev/null || true "${DOCKER[@]}" rmi ${docker_image_tag} &>/dev/null || true
"${DOCKER[@]}" rmi ${deprecated_image_tag} &>/dev/null || true
fi fi
) & ) &
done done

4
build/pause/Makefile
View File

@ -16,7 +16,7 @@
include ../../hack/make-rules/Makefile.manifest include ../../hack/make-rules/Makefile.manifest
REGISTRY ?= gcr.io/google_containers REGISTRY ?= staging-k8s.gcr.io
IMAGE = $(REGISTRY)/pause IMAGE = $(REGISTRY)/pause
IMAGE_WITH_ARCH = $(IMAGE)-$(ARCH) IMAGE_WITH_ARCH = $(IMAGE)-$(ARCH)
@ -29,7 +29,7 @@ ARCH ?= amd64
ALL_ARCH = amd64 arm arm64 ppc64le s390x ALL_ARCH = amd64 arm arm64 ppc64le s390x
CFLAGS = -Os -Wall -Werror -static -DVERSION=v$(TAG)-$(REV) CFLAGS = -Os -Wall -Werror -static -DVERSION=v$(TAG)-$(REV)
KUBE_CROSS_IMAGE ?= gcr.io/google_containers/kube-cross KUBE_CROSS_IMAGE ?= k8s.gcr.io/kube-cross
KUBE_CROSS_VERSION ?= $(shell cat ../build-image/cross/VERSION) KUBE_CROSS_VERSION ?= $(shell cat ../build-image/cross/VERSION)
BIN = pause BIN = pause

8
build/root/WORKSPACE
View File

@ -60,16 +60,16 @@ http_file(
docker_pull( docker_pull(
name = "debian-iptables-amd64", name = "debian-iptables-amd64",
digest = "sha256:a3b936c0fb98a934eecd2cfb91f73658d402b29116084e778ce9ddb68e55383e", digest = "sha256:a3b936c0fb98a934eecd2cfb91f73658d402b29116084e778ce9ddb68e55383e",
registry = "gcr.io", registry = "k8s.gcr.io",
repository = "google-containers/debian-iptables-amd64", repository = "debian-iptables-amd64",
tag = "v10", # ignored, but kept here for documentation tag = "v10", # ignored, but kept here for documentation
) )
docker_pull( docker_pull(
name = "debian-hyperkube-base-amd64", name = "debian-hyperkube-base-amd64",
digest = "sha256:fc1b461367730660ac5a40c1eb2d1b23221829acf8a892981c12361383b3742b", digest = "sha256:fc1b461367730660ac5a40c1eb2d1b23221829acf8a892981c12361383b3742b",
registry = "gcr.io", registry = "k8s.gcr.io",
repository = "google-containers/debian-hyperkube-base-amd64", repository = "debian-hyperkube-base-amd64",
tag = "0.8", # ignored, but kept here for documentation tag = "0.8", # ignored, but kept here for documentation
) )

2
cluster/addons/addon-manager/Makefile
View File

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
IMAGE=gcr.io/google-containers/kube-addon-manager IMAGE=staging-k8s.gcr.io/kube-addon-manager
ARCH?=amd64 ARCH?=amd64
TEMP_DIR:=$(shell mktemp -d) TEMP_DIR:=$(shell mktemp -d)
VERSION=v8.5 VERSION=v8.5

12
cluster/addons/addon-manager/README.md
View File

@ -40,20 +40,20 @@ The `addon-manager` is built for multiple architectures.
```console ```console
# Build for linux/amd64 (default) # Build for linux/amd64 (default)
$ make push ARCH=amd64 $ make push ARCH=amd64
# ---> gcr.io/google-containers/kube-addon-manager-amd64:VERSION # ---> staging-k8s.gcr.io/kube-addon-manager-amd64:VERSION
# ---> gcr.io/google-containers/kube-addon-manager:VERSION (image with backwards-compatible naming) # ---> staging-k8s.gcr.io/kube-addon-manager:VERSION (image with backwards-compatible naming)
$ make push ARCH=arm $ make push ARCH=arm
# ---> gcr.io/google-containers/kube-addon-manager-arm:VERSION # ---> staging-k8s.gcr.io/kube-addon-manager-arm:VERSION
$ make push ARCH=arm64 $ make push ARCH=arm64
# ---> gcr.io/google-containers/kube-addon-manager-arm64:VERSION # ---> staging-k8s.gcr.io/kube-addon-manager-arm64:VERSION
$ make push ARCH=ppc64le $ make push ARCH=ppc64le
# ---> gcr.io/google-containers/kube-addon-manager-ppc64le:VERSION # ---> staging-k8s.gcr.io/kube-addon-manager-ppc64le:VERSION
$ make push ARCH=s390x $ make push ARCH=s390x
# ---> gcr.io/google-containers/kube-addon-manager-s390x:VERSION # ---> staging-k8s.gcr.io/kube-addon-manager-s390x:VERSION
``` ```
If you don't want to push the images, run `make` or `make build` instead If you don't want to push the images, run `make` or `make build` instead

2
cluster/addons/calico-policy-controller/calico-node-vertical-autoscaler-deployment.yaml
View File

@ -17,7 +17,7 @@ spec:
scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/critical-pod: ''
spec: spec:
containers: containers:
- image: gcr.io/google_containers/cpvpa-amd64:v0.6.0 - image: k8s.gcr.io/cpvpa-amd64:v0.6.0
name: autoscaler name: autoscaler
command: command:
- /cpvpa - /cpvpa

2
cluster/addons/calico-policy-controller/typha-horizontal-autoscaler-deployment.yaml
View File

@ -17,7 +17,7 @@ spec:
scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/critical-pod: ''
spec: spec:
containers: containers:
- image: gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.1.2 - image: k8s.gcr.io/cluster-proportional-autoscaler-amd64:1.1.2
name: autoscaler name: autoscaler
command: command:
- /cluster-proportional-autoscaler - /cluster-proportional-autoscaler

2
cluster/addons/calico-policy-controller/typha-vertical-autoscaler-deployment.yaml
View File

@ -17,7 +17,7 @@ spec:
scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/critical-pod: ''
spec: spec:
containers: containers:
- image: gcr.io/google_containers/cpvpa-amd64:v0.6.0 - image: k8s.gcr.io/cpvpa-amd64:v0.6.0
name: autoscaler name: autoscaler
command: command:
- /cpvpa - /cpvpa

2
cluster/addons/cluster-loadbalancing/glbc/default-svc-controller.yaml
View File

@ -24,7 +24,7 @@ spec:
# Any image is permissible as long as: # Any image is permissible as long as:
# 1. It serves a 404 page at / # 1. It serves a 404 page at /
# 2. It serves 200 on a /healthz endpoint # 2. It serves 200 on a /healthz endpoint
image: gcr.io/google_containers/defaultbackend:1.4 image: k8s.gcr.io/defaultbackend:1.4
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /healthz path: /healthz

8
cluster/addons/cluster-monitoring/google/heapster-controller.yaml
View File

@ -58,7 +58,7 @@ spec:
scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/critical-pod: ''
spec: spec:
containers: containers:
- image: gcr.io/google_containers/heapster-amd64:v1.5.0 - image: k8s.gcr.io/heapster-amd64:v1.5.0
name: heapster name: heapster
livenessProbe: livenessProbe:
httpGet: httpGet:
@ -71,13 +71,13 @@ spec:
- /heapster - /heapster
- --source=kubernetes.summary_api:'' - --source=kubernetes.summary_api:''
- --sink=gcm - --sink=gcm
- image: gcr.io/google_containers/heapster-amd64:v1.5.0 - image: k8s.gcr.io/heapster-amd64:v1.5.0
name: eventer name: eventer
command: command:
- /eventer - /eventer
- --source=kubernetes:'' - --source=kubernetes:''
- --sink=gcl - --sink=gcl
- image: gcr.io/google_containers/addon-resizer:1.8.1 - image: k8s.gcr.io/addon-resizer:1.8.1
name: heapster-nanny name: heapster-nanny
resources: resources:
limits: limits:
@ -110,7 +110,7 @@ spec:
- --container=heapster - --container=heapster
- --poll-period=300000 - --poll-period=300000
- --estimator=exponential - --estimator=exponential
- image: gcr.io/google_containers/addon-resizer:1.8.1 - image: k8s.gcr.io/addon-resizer:1.8.1
name: eventer-nanny name: eventer-nanny
resources: resources:
limits: limits:

9
cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
View File

@ -58,8 +58,7 @@ spec:
scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/critical-pod: ''
spec: spec:
containers: containers:
- image: gcr.io/google_containers/heapster-amd64:v1.5.0 - image: k8s.gcr.io/heapster-amd64:v1.5.0
name: heapster name: heapster
livenessProbe: livenessProbe:
httpGet: httpGet:
@ -73,13 +72,13 @@ spec:
- --source=kubernetes.summary_api:'' - --source=kubernetes.summary_api:''
- --sink=influxdb:http://monitoring-influxdb:8086 - --sink=influxdb:http://monitoring-influxdb:8086
- --sink=gcm:?metrics=autoscaling - --sink=gcm:?metrics=autoscaling
- image: gcr.io/google_containers/heapster-amd64:v1.5.0 - image: k8s.gcr.io/heapster-amd64:v1.5.0
name: eventer name: eventer
command: command:
- /eventer - /eventer
- --source=kubernetes:'' - --source=kubernetes:''
- --sink=gcl - --sink=gcl
- image: gcr.io/google_containers/addon-resizer:1.8.1 - image: k8s.gcr.io/addon-resizer:1.8.1
name: heapster-nanny name: heapster-nanny
resources: resources:
limits: limits:
@ -112,7 +111,7 @@ spec:
- --container=heapster - --container=heapster
- --poll-period=300000 - --poll-period=300000
- --estimator=exponential - --estimator=exponential
- image: gcr.io/google_containers/addon-resizer:1.8.1 - image: k8s.gcr.io/addon-resizer:1.8.1
name: eventer-nanny name: eventer-nanny
resources: resources:
limits: limits:

8
cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
View File

@ -58,7 +58,7 @@ spec:
scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/critical-pod: ''
spec: spec:
containers: containers:
- image: gcr.io/google_containers/heapster-amd64:v1.5.0 - image: k8s.gcr.io/heapster-amd64:v1.5.0
name: heapster name: heapster
livenessProbe: livenessProbe:
httpGet: httpGet:
@ -71,13 +71,13 @@ spec:
- /heapster - /heapster
- --source=kubernetes.summary_api:'' - --source=kubernetes.summary_api:''
- --sink=influxdb:http://monitoring-influxdb:8086 - --sink=influxdb:http://monitoring-influxdb:8086
- image: gcr.io/google_containers/heapster-amd64:v1.5.0 - image: k8s.gcr.io/heapster-amd64:v1.5.0
name: eventer name: eventer
command: command:
- /eventer - /eventer
- --source=kubernetes:'' - --source=kubernetes:''
- --sink=influxdb:http://monitoring-influxdb:8086 - --sink=influxdb:http://monitoring-influxdb:8086
- image: gcr.io/google_containers/addon-resizer:1.8.1 - image: k8s.gcr.io/addon-resizer:1.8.1
name: heapster-nanny name: heapster-nanny
resources: resources:
limits: limits:
@ -110,7 +110,7 @@ spec:
- --container=heapster - --container=heapster
- --poll-period=300000 - --poll-period=300000
- --estimator=exponential - --estimator=exponential
- image: gcr.io/google_containers/addon-resizer:1.8.1 - image: k8s.gcr.io/addon-resizer:1.8.1
name: eventer-nanny name: eventer-nanny
resources: resources:
limits: limits:

4
cluster/addons/cluster-monitoring/influxdb/influxdb-grafana-controller.yaml
View File

@ -29,7 +29,7 @@ spec:
operator: "Exists" operator: "Exists"
containers: containers:
- name: influxdb - name: influxdb
image: gcr.io/google_containers/heapster-influxdb-amd64:v1.3.3 image: k8s.gcr.io/heapster-influxdb-amd64:v1.3.3
resources: resources:
limits: limits:
cpu: 100m cpu: 100m
@ -46,7 +46,7 @@ spec:
- name: influxdb-persistent-storage - name: influxdb-persistent-storage
mountPath: /data mountPath: /data
- name: grafana - name: grafana
image: gcr.io/google_containers/heapster-grafana-amd64:v4.4.3 image: k8s.gcr.io/heapster-grafana-amd64:v4.4.3
env: env:
resources: resources:
# keep request = limit to keep this container in guaranteed class # keep request = limit to keep this container in guaranteed class

6
cluster/addons/cluster-monitoring/stackdriver/heapster-controller.yaml
View File

@ -45,7 +45,7 @@ spec:
scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/critical-pod: ''
spec: spec:
containers: containers:
- image: gcr.io/google_containers/heapster-amd64:v1.5.0 - image: k8s.gcr.io/heapster-amd64:v1.5.0
name: heapster name: heapster
livenessProbe: livenessProbe:
httpGet: httpGet:
@ -60,7 +60,7 @@ spec:
- --sink=stackdriver:?cluster_name={{ cluster_name }}&use_old_resources={{ use_old_resources }}&use_new_resources={{ use_new_resources }}&min_interval_sec=100&batch_export_timeout_sec=110 - --sink=stackdriver:?cluster_name={{ cluster_name }}&use_old_resources={{ use_old_resources }}&use_new_resources={{ use_new_resources }}&min_interval_sec=100&batch_export_timeout_sec=110
# BEGIN_PROMETHEUS_TO_SD # BEGIN_PROMETHEUS_TO_SD
- name: prom-to-sd - name: prom-to-sd
image: gcr.io/google-containers/prometheus-to-sd:v0.2.2 image: k8s.gcr.io/prometheus-to-sd:v0.2.2
command: command:
- /monitor - /monitor
- --source=heapster:http://localhost:8082?whitelisted=stackdriver_requests_count,stackdriver_timeseries_count - --source=heapster:http://localhost:8082?whitelisted=stackdriver_requests_count,stackdriver_timeseries_count
@ -78,7 +78,7 @@ spec:
fieldRef: fieldRef:
fieldPath: metadata.namespace fieldPath: metadata.namespace
# END_PROMETHEUS_TO_SD # END_PROMETHEUS_TO_SD
- image: gcr.io/google_containers/addon-resizer:1.8.1 - image: k8s.gcr.io/addon-resizer:1.8.1
name: heapster-nanny name: heapster-nanny
resources: resources:
limits: limits:

4
cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
View File

@ -45,7 +45,7 @@ spec:
scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/critical-pod: ''
spec: spec:
containers: containers:
- image: gcr.io/google_containers/heapster-amd64:v1.5.0 - image: k8s.gcr.io/heapster-amd64:v1.5.0
name: heapster name: heapster
livenessProbe: livenessProbe:
httpGet: httpGet:
@ -57,7 +57,7 @@ spec:
command: command:
- /heapster - /heapster
- --source=kubernetes.summary_api:'' - --source=kubernetes.summary_api:''
- image: gcr.io/google_containers/addon-resizer:1.8.1 - image: k8s.gcr.io/addon-resizer:1.8.1
name: heapster-nanny name: heapster-nanny
resources: resources:
limits: limits:

2
cluster/addons/dashboard/dashboard-controller.yaml
View File

@ -29,7 +29,7 @@ spec:
spec: spec:
containers: containers:
- name: kubernetes-dashboard - name: kubernetes-dashboard
image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.8.0 image: k8s.gcr.io/kubernetes-dashboard-amd64:v1.8.0
resources: resources:
limits: limits:
cpu: 100m cpu: 100m

2
cluster/addons/device-plugins/nvidia-gpu/daemonset.yaml
View File

@ -36,7 +36,7 @@ spec:
hostPath: hostPath:
path: /dev path: /dev
containers: containers:
- image: "gcr.io/google-containers/nvidia-gpu-device-plugin@sha256:0e79da6998a61257585e0d3fb5848240129f0fa5b4ad972dfed4049448093c33" - image: "k8s.gcr.io/nvidia-gpu-device-plugin@sha256:0e79da6998a61257585e0d3fb5848240129f0fa5b4ad972dfed4049448093c33"
command: ["/usr/bin/nvidia-gpu-device-plugin", "-logtostderr"] command: ["/usr/bin/nvidia-gpu-device-plugin", "-logtostderr"]
name: nvidia-gpu-device-plugin name: nvidia-gpu-device-plugin
resources: resources:

2
cluster/addons/dns-horizontal-autoscaler/dns-horizontal-autoscaler.yaml
View File

@ -80,7 +80,7 @@ spec:
spec: spec:
containers: containers:
- name: autoscaler - name: autoscaler
image: gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.1.2-r2 image: k8s.gcr.io/cluster-proportional-autoscaler-amd64:1.1.2-r2
resources: resources:
requests: requests:
cpu: "20m" cpu: "20m"

6
cluster/addons/dns/kube-dns.yaml.base
View File

@ -94,7 +94,7 @@ spec:
optional: true optional: true
containers: containers:
- name: kubedns - name: kubedns
image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.8 image: k8s.gcr.io/k8s-dns-kube-dns-amd64:1.14.8
resources: resources:
# TODO: Set memory limits when we've profiled the container for large # TODO: Set memory limits when we've profiled the container for large
# clusters, then set request = limit to keep this container in # clusters, then set request = limit to keep this container in
@ -145,7 +145,7 @@ spec:
- name: kube-dns-config - name: kube-dns-config
mountPath: /kube-dns-config mountPath: /kube-dns-config
- name: dnsmasq - name: dnsmasq
image: gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.8 image: k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64:1.14.8
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /healthcheck/dnsmasq path: /healthcheck/dnsmasq
@ -184,7 +184,7 @@ spec:
- name: kube-dns-config - name: kube-dns-config
mountPath: /etc/k8s/dns/dnsmasq-nanny mountPath: /etc/k8s/dns/dnsmasq-nanny
- name: sidecar - name: sidecar
image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.8 image: k8s.gcr.io/k8s-dns-sidecar-amd64:1.14.8
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /metrics path: /metrics

6
cluster/addons/dns/kube-dns.yaml.in
View File

@ -94,7 +94,7 @@ spec:
optional: true optional: true
containers: containers:
- name: kubedns - name: kubedns
image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.8 image: k8s.gcr.io/k8s-dns-kube-dns-amd64:1.14.8
resources: resources:
# TODO: Set memory limits when we've profiled the container for large # TODO: Set memory limits when we've profiled the container for large
# clusters, then set request = limit to keep this container in # clusters, then set request = limit to keep this container in
@ -145,7 +145,7 @@ spec:
- name: kube-dns-config - name: kube-dns-config
mountPath: /kube-dns-config mountPath: /kube-dns-config
- name: dnsmasq - name: dnsmasq
image: gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.8 image: k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64:1.14.8
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /healthcheck/dnsmasq path: /healthcheck/dnsmasq
@ -184,7 +184,7 @@ spec:
- name: kube-dns-config - name: kube-dns-config
mountPath: /etc/k8s/dns/dnsmasq-nanny mountPath: /etc/k8s/dns/dnsmasq-nanny
- name: sidecar - name: sidecar
image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.8 image: k8s.gcr.io/k8s-dns-sidecar-amd64:1.14.8
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /metrics path: /metrics

6
cluster/addons/dns/kube-dns.yaml.sed
View File

@ -94,7 +94,7 @@ spec:
optional: true optional: true
containers: containers:
- name: kubedns - name: kubedns
image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.8 image: k8s.gcr.io/k8s-dns-kube-dns-amd64:1.14.8
resources: resources:
# TODO: Set memory limits when we've profiled the container for large # TODO: Set memory limits when we've profiled the container for large
# clusters, then set request = limit to keep this container in # clusters, then set request = limit to keep this container in
@ -145,7 +145,7 @@ spec:
- name: kube-dns-config - name: kube-dns-config
mountPath: /kube-dns-config mountPath: /kube-dns-config
- name: dnsmasq - name: dnsmasq
image: gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.8 image: k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64:1.14.8
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /healthcheck/dnsmasq path: /healthcheck/dnsmasq
@ -184,7 +184,7 @@ spec:
- name: kube-dns-config - name: kube-dns-config
mountPath: /etc/k8s/dns/dnsmasq-nanny mountPath: /etc/k8s/dns/dnsmasq-nanny
- name: sidecar - name: sidecar
image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.8 image: k8s.gcr.io/k8s-dns-sidecar-amd64:1.14.8
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /metrics path: /metrics

2
cluster/addons/etcd-empty-dir-cleanup/etcd-empty-dir-cleanup.yaml
View File

@ -23,4 +23,4 @@ spec:
dnsPolicy: Default dnsPolicy: Default
containers: containers:
- name: etcd-empty-dir-cleanup - name: etcd-empty-dir-cleanup
image: gcr.io/google-containers/etcd-empty-dir-cleanup:3.1.10.0 image: k8s.gcr.io/etcd-empty-dir-cleanup:3.1.10.0

2
cluster/addons/fluentd-elasticsearch/es-image/Makefile
View File

@ -14,7 +14,7 @@
.PHONY: binary build push .PHONY: binary build push
PREFIX = gcr.io/google-containers PREFIX = staging-k8s.gcr.io
IMAGE = elasticsearch IMAGE = elasticsearch
TAG = v5.6.4 TAG = v5.6.4

2
cluster/addons/fluentd-elasticsearch/es-statefulset.yaml
View File

@ -73,7 +73,7 @@ spec:
spec: spec:
serviceAccountName: elasticsearch-logging serviceAccountName: elasticsearch-logging
containers: containers:
- image: gcr.io/google-containers/elasticsearch:v5.6.4 - image: k8s.gcr.io/elasticsearch:v5.6.4
name: elasticsearch-logging name: elasticsearch-logging
resources: resources:
# need more cpu upon initialization, therefore burstable class # need more cpu upon initialization, therefore burstable class

2
cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml
View File

@ -75,7 +75,7 @@ spec:
serviceAccountName: fluentd-es serviceAccountName: fluentd-es
containers: containers:
- name: fluentd-es - name: fluentd-es
image: gcr.io/google-containers/fluentd-elasticsearch:v2.0.4 image: k8s.gcr.io/fluentd-elasticsearch:v2.0.4
env: env:
- name: FLUENTD_ARGS - name: FLUENTD_ARGS
value: --no-supervisor -q value: --no-supervisor -q

2
cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
View File

@ -14,7 +14,7 @@
.PHONY: build push .PHONY: build push
PREFIX = gcr.io/google-containers PREFIX = staging-k8s.gcr.io
IMAGE = fluentd-elasticsearch IMAGE = fluentd-elasticsearch
TAG = v2.0.4 TAG = v2.0.4

4
cluster/addons/fluentd-elasticsearch/fluentd-es-image/README.md
View File

@ -4,11 +4,11 @@ that collects Docker container log files using [Fluentd][fluentd]
and sends them to an instance of [Elasticsearch][elasticsearch]. and sends them to an instance of [Elasticsearch][elasticsearch].
This image is designed to be used as part of the [Kubernetes][kubernetes] This image is designed to be used as part of the [Kubernetes][kubernetes]
cluster bring up process. The image resides at GCR under the name cluster bring up process. The image resides at GCR under the name
[gcr.io/google-containers/fluentd-elasticsearch][image]. [k8s.gcr.io/fluentd-elasticsearch][image].
[fluentd]: http://www.fluentd.org/ [fluentd]: http://www.fluentd.org/
[elasticsearch]: https://www.elastic.co/products/elasticsearch [elasticsearch]: https://www.elastic.co/products/elasticsearch
[kubernetes]: https://kubernetes.io [kubernetes]: https://kubernetes.io
[image]: https://gcr.io/google-containers/fluentd-elasticsearch [image]: https://k8s.gcr.io/fluentd-elasticsearch
[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/cluster/addons/fluentd-elasticsearch/fluentd-es-image/README.md?pixel)]() [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/cluster/addons/fluentd-elasticsearch/fluentd-es-image/README.md?pixel)]()

4
cluster/addons/fluentd-gcp/event-exporter.yaml
View File

@ -47,12 +47,12 @@ spec:
serviceAccountName: event-exporter-sa serviceAccountName: event-exporter-sa
containers: containers:
- name: event-exporter - name: event-exporter
image: gcr.io/google-containers/event-exporter:v0.1.7 image: k8s.gcr.io/event-exporter:v0.1.7
command: command:
- '/event-exporter' - '/event-exporter'
# BEGIN_PROMETHEUS_TO_SD # BEGIN_PROMETHEUS_TO_SD
- name: prometheus-to-sd-exporter - name: prometheus-to-sd-exporter
image: gcr.io/google-containers/prometheus-to-sd:v0.2.2 image: k8s.gcr.io/prometheus-to-sd:v0.2.2
command: command:
- /monitor - /monitor
- --stackdriver-prefix={{ prometheus_to_sd_prefix }}/addons - --stackdriver-prefix={{ prometheus_to_sd_prefix }}/addons

4
cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml
View File

@ -27,7 +27,7 @@ spec:
dnsPolicy: Default dnsPolicy: Default
containers: containers:
- name: fluentd-gcp - name: fluentd-gcp
image: gcr.io/google-containers/fluentd-gcp:2.0.14 image: k8s.gcr.io/fluentd-gcp:2.0.14
env: env:
- name: FLUENTD_ARGS - name: FLUENTD_ARGS
value: --no-supervisor -q value: --no-supervisor -q
@ -82,7 +82,7 @@ spec:
fi; fi;
# BEGIN_PROMETHEUS_TO_SD # BEGIN_PROMETHEUS_TO_SD
- name: prometheus-to-sd-exporter - name: prometheus-to-sd-exporter
image: gcr.io/google-containers/prometheus-to-sd:v0.2.2 image: k8s.gcr.io/prometheus-to-sd:v0.2.2
command: command:
- /monitor - /monitor
- --stackdriver-prefix={{ prometheus_to_sd_prefix }}/addons - --stackdriver-prefix={{ prometheus_to_sd_prefix }}/addons

2
cluster/addons/ip-masq-agent/ip-masq-agent.yaml
View File

@ -28,7 +28,7 @@ spec:
hostNetwork: true hostNetwork: true
containers: containers:
- name: ip-masq-agent - name: ip-masq-agent
image: gcr.io/google-containers/ip-masq-agent-amd64:v2.0.2 image: k8s.gcr.io/ip-masq-agent-amd64:v2.0.2
resources: resources:
requests: requests:
cpu: 10m cpu: 10m

4
cluster/addons/metadata-proxy/gce/metadata-proxy.yaml
View File

@ -38,7 +38,7 @@ spec:
dnsPolicy: Default dnsPolicy: Default
containers: containers:
- name: metadata-proxy - name: metadata-proxy
image: gcr.io/google_containers/metadata-proxy:v0.1.9 image: k8s.gcr.io/metadata-proxy:v0.1.9
securityContext: securityContext:
privileged: true privileged: true
# Request and limit resources to get guaranteed QoS. # Request and limit resources to get guaranteed QoS.
@ -51,7 +51,7 @@ spec:
cpu: "30m" cpu: "30m"
# BEGIN_PROMETHEUS_TO_SD # BEGIN_PROMETHEUS_TO_SD
- name: prometheus-to-sd-exporter - name: prometheus-to-sd-exporter
image: gcr.io/google_containers/prometheus-to-sd:v0.2.2 image: k8s.gcr.io/prometheus-to-sd:v0.2.2
# Request and limit resources to get guaranteed QoS. # Request and limit resources to get guaranteed QoS.
resources: resources:
requests: requests:

4
cluster/addons/metrics-server/metrics-server-deployment.yaml
View File

@ -47,7 +47,7 @@ spec:
serviceAccountName: metrics-server serviceAccountName: metrics-server
containers: containers:
- name: metrics-server - name: metrics-server
image: gcr.io/google_containers/metrics-server-amd64:v0.2.1 image: k8s.gcr.io/metrics-server-amd64:v0.2.1
command: command:
- /metrics-server - /metrics-server
- --source=kubernetes.summary_api:'' - --source=kubernetes.summary_api:''
@ -56,7 +56,7 @@ spec:
name: https name: https
protocol: TCP protocol: TCP
- name: metrics-server-nanny - name: metrics-server-nanny
image: gcr.io/google_containers/addon-resizer:1.8.1 image: k8s.gcr.io/addon-resizer:1.8.1
resources: resources:
limits: limits:
cpu: 100m cpu: 100m

2
cluster/addons/node-problem-detector/npd.yaml
View File

@ -43,7 +43,7 @@ spec:
spec: spec:
containers: containers:
- name: node-problem-detector - name: node-problem-detector
image: gcr.io/google_containers/node-problem-detector:v0.4.1 image: k8s.gcr.io/node-problem-detector:v0.4.1
command: command:
- "/bin/sh" - "/bin/sh"
- "-c" - "-c"

2
cluster/addons/python-image/Makefile
View File

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
IMAGE=gcr.io/google_containers/python IMAGE=staging-k8s.gcr.io/python
VERSION=v1 VERSION=v1
.PHONY: build push .PHONY: build push

2
cluster/gce/config-test.sh
View File

@ -149,7 +149,7 @@ ENABLE_METRICS_SERVER="${KUBE_ENABLE_METRICS_SERVER:-true}"
# Useful for scheduling heapster in large clusters with nodes of small size. # Useful for scheduling heapster in large clusters with nodes of small size.
HEAPSTER_MACHINE_TYPE="${HEAPSTER_MACHINE_TYPE:-}" HEAPSTER_MACHINE_TYPE="${HEAPSTER_MACHINE_TYPE:-}"
# Set etcd image (e.g. gcr.io/google_containers/etcd) and version (e.g. 3.2.14) if you need # Set etcd image (e.g. k8s.gcr.io/etcd) and version (e.g. 3.2.14) if you need
# non-default version. # non-default version.
ETCD_IMAGE="${TEST_ETCD_IMAGE:-}" ETCD_IMAGE="${TEST_ETCD_IMAGE:-}"
ETCD_DOCKER_REPOSITORY="${TEST_ETCD_DOCKER_REPOSITORY:-}" ETCD_DOCKER_REPOSITORY="${TEST_ETCD_DOCKER_REPOSITORY:-}"

6
cluster/gce/gci/configure-helper.sh
View File

@ -1288,7 +1288,7 @@ function prepare-kube-proxy-manifest-variables {
local -r src_file=$1; local -r src_file=$1;
local -r kubeconfig="--kubeconfig=/var/lib/kube-proxy/kubeconfig" local -r kubeconfig="--kubeconfig=/var/lib/kube-proxy/kubeconfig"
local kube_docker_registry="gcr.io/google_containers" local kube_docker_registry="k8s.gcr.io"
if [[ -n "${KUBE_DOCKER_REGISTRY:-}" ]]; then if [[ -n "${KUBE_DOCKER_REGISTRY:-}" ]]; then
kube_docker_registry=${KUBE_DOCKER_REGISTRY} kube_docker_registry=${KUBE_DOCKER_REGISTRY}
fi fi
@ -1462,7 +1462,7 @@ function compute-master-manifest-variables {
CLOUD_CONFIG_VOLUME="{\"name\": \"cloudconfigmount\",\"hostPath\": {\"path\": \"/etc/gce.conf\", \"type\": \"FileOrCreate\"}}," CLOUD_CONFIG_VOLUME="{\"name\": \"cloudconfigmount\",\"hostPath\": {\"path\": \"/etc/gce.conf\", \"type\": \"FileOrCreate\"}},"
CLOUD_CONFIG_MOUNT="{\"name\": \"cloudconfigmount\",\"mountPath\": \"/etc/gce.conf\", \"readOnly\": true}," CLOUD_CONFIG_MOUNT="{\"name\": \"cloudconfigmount\",\"mountPath\": \"/etc/gce.conf\", \"readOnly\": true},"
fi fi
DOCKER_REGISTRY="gcr.io/google_containers" DOCKER_REGISTRY="k8s.gcr.io"
if [[ -n "${KUBE_DOCKER_REGISTRY:-}" ]]; then if [[ -n "${KUBE_DOCKER_REGISTRY:-}" ]]; then
DOCKER_REGISTRY="${KUBE_DOCKER_REGISTRY}" DOCKER_REGISTRY="${KUBE_DOCKER_REGISTRY}"
fi fi
@ -2325,7 +2325,7 @@ spec:
- name: vol - name: vol
containers: containers:
- name: pv-recycler - name: pv-recycler
image: gcr.io/google_containers/busybox:1.27 image: k8s.gcr.io/busybox:1.27
command: command:
- /bin/sh - /bin/sh
args: args:

8
cluster/gce/gci/configure.sh
View File

@ -234,12 +234,12 @@ function install-kube-manifests {
echo "Downloading k8s manifests tar" echo "Downloading k8s manifests tar"
download-or-bust "${manifests_tar_hash}" "${manifests_tar_urls[@]}" download-or-bust "${manifests_tar_hash}" "${manifests_tar_urls[@]}"
tar xzf "${KUBE_HOME}/${manifests_tar}" -C "${dst_dir}" --overwrite tar xzf "${KUBE_HOME}/${manifests_tar}" -C "${dst_dir}" --overwrite
local -r kube_addon_registry="${KUBE_ADDON_REGISTRY:-gcr.io/google_containers}" local -r kube_addon_registry="${KUBE_ADDON_REGISTRY:-k8s.gcr.io}"
if [[ "${kube_addon_registry}" != "gcr.io/google_containers" ]]; then if [[ "${kube_addon_registry}" != "k8s.gcr.io" ]]; then
find "${dst_dir}" -name \*.yaml -or -name \*.yaml.in | \ find "${dst_dir}" -name \*.yaml -or -name \*.yaml.in | \
xargs sed -ri "s@(image:\s.*)gcr.io/google_containers@\1${kube_addon_registry}@" xargs sed -ri "s@(image:\s.*)k8s.gcr.io@\1${kube_addon_registry}@"
find "${dst_dir}" -name \*.manifest -or -name \*.json | \ find "${dst_dir}" -name \*.manifest -or -name \*.json | \
xargs sed -ri "s@(image\":\s+\")gcr.io/google_containers@\1${kube_addon_registry}@" xargs sed -ri "s@(image\":\s+\")k8s.gcr.io@\1${kube_addon_registry}@"
fi fi
cp "${dst_dir}/kubernetes/gci-trusty/gci-configure-helper.sh" "${KUBE_BIN}/configure-helper.sh" cp "${dst_dir}/kubernetes/gci-trusty/gci-configure-helper.sh" "${KUBE_BIN}/configure-helper.sh"
cp "${dst_dir}/kubernetes/gci-trusty/health-monitor.sh" "${KUBE_BIN}/health-monitor.sh" cp "${dst_dir}/kubernetes/gci-trusty/health-monitor.sh" "${KUBE_BIN}/health-monitor.sh"

2
cluster/gce/gci/mounter/Makefile
View File

@ -13,7 +13,7 @@
# limitations under the License. # limitations under the License.
TAG=v2 TAG=v2
REGISTRY=gcr.io/google_containers REGISTRY=staging-k8s.gcr.io
IMAGE=gci-mounter IMAGE=gci-mounter
all: container all: container

6
cluster/gce/manifests/cluster-autoscaler.manifest
View File

@ -14,15 +14,15 @@
"containers": [ "containers": [
{ {
"name": "cluster-autoscaler", "name": "cluster-autoscaler",
"image": "gcr.io/google_containers/cluster-autoscaler:v1.1.1", "image": "k8s.gcr.io/cluster-autoscaler:v1.1.1",
"livenessProbe": { "livenessProbe": {
"httpGet": { "httpGet": {
"path": "/health-check", "path": "/health-check",
"port": 8085 "port": 8085
}, },
"initialDelaySeconds": 600, "initialDelaySeconds": 600,
"periodSeconds": 60 "periodSeconds": 60
}, },
"command": [ "command": [
"./run.sh", "./run.sh",
"--kubernetes=http://127.0.0.1:8080?inClusterConfig=f", "--kubernetes=http://127.0.0.1:8080?inClusterConfig=f",

94
cluster/gce/manifests/e2e-image-puller.manifest
View File

@ -14,13 +14,13 @@ spec:
cpu: 100m cpu: 100m
limits: limits:
cpu: 100m cpu: 100m
image: gcr.io/google_containers/busybox:1.24 image: k8s.gcr.io/busybox:1.24
# TODO: Replace this with a go script that pulls in parallel? # TODO: Replace this with a go script that pulls in parallel?
# Currently it takes ~5m to pull all e2e images, so this is OK, and # Currently it takes ~5m to pull all e2e images, so this is OK, and
# fewer moving parts is always better. # fewer moving parts is always better.
# TODO: Replace the hardcoded image list with an autogen list; the list is # TODO: Replace the hardcoded image list with an autogen list; the list is
# currently hard-coded for static verification. It was generated via: # currently hard-coded for static verification. It was generated via:
# grep -Iiroh "gcr.io/google_.*" "${KUBE_ROOT}/test/e2e" | \ # grep -Iiroh "gcr.io/.*" "${KUBE_ROOT}/test/e2e" | \
# sed -e "s/[,\")}]//g" | awk '{print $1}' | sort | uniq | tr '\n' ' ' # sed -e "s/[,\")}]//g" | awk '{print $1}' | sort | uniq | tr '\n' ' '
# We always want the subshell to exit 0 so this pod doesn't end up # We always want the subshell to exit 0 so this pod doesn't end up
# blocking tests in an Error state. # blocking tests in an Error state.
@ -29,52 +29,52 @@ spec:
- -c - -c
- > - >
for i in for i in
gcr.io/google_containers/alpine-with-bash:1.0 k8s.gcr.io/alpine-with-bash:1.0
gcr.io/google_containers/apparmor-loader:0.1 k8s.gcr.io/apparmor-loader:0.1
gcr.io/google_containers/busybox:1.24 k8s.gcr.io/busybox:1.24
gcr.io/google_containers/dnsutils:e2e k8s.gcr.io/dnsutils:e2e
gcr.io/google_containers/e2e-net-amd64:1.0 k8s.gcr.io/e2e-net-amd64:1.0
gcr.io/google_containers/echoserver:1.6 k8s.gcr.io/echoserver:1.6
gcr.io/google_containers/eptest:0.1 k8s.gcr.io/eptest:0.1
gcr.io/google_containers/fakegitserver:0.1 k8s.gcr.io/fakegitserver:0.1
gcr.io/google_containers/galera-install:0.1 k8s.gcr.io/galera-install:0.1
gcr.io/google_containers/invalid-image:invalid-tag k8s.gcr.io/invalid-image:invalid-tag
gcr.io/google_containers/iperf:e2e k8s.gcr.io/iperf:e2e
gcr.io/google_containers/jessie-dnsutils:e2e k8s.gcr.io/jessie-dnsutils:e2e
gcr.io/google_containers/k8s-dns-dnsmasq-amd64:1.14.5 k8s.gcr.io/k8s-dns-dnsmasq-amd64:1.14.5
gcr.io/google_containers/liveness:e2e k8s.gcr.io/liveness:e2e
gcr.io/google_containers/logs-generator:v0.1.0 k8s.gcr.io/logs-generator:v0.1.0
gcr.io/google_containers/mounttest:0.8 k8s.gcr.io/mounttest:0.8
gcr.io/google_containers/mounttest-user:0.5 k8s.gcr.io/mounttest-user:0.5
gcr.io/google_containers/mysql-galera:e2e k8s.gcr.io/mysql-galera:e2e
gcr.io/google_containers/mysql-healthz:1.0 k8s.gcr.io/mysql-healthz:1.0
gcr.io/google_containers/netexec:1.4 k8s.gcr.io/netexec:1.4
gcr.io/google_containers/netexec:1.5 k8s.gcr.io/netexec:1.5
gcr.io/google_containers/netexec:1.7 k8s.gcr.io/netexec:1.7
gcr.io/google_containers/nettest:1.7 k8s.gcr.io/nettest:1.7
gcr.io/google_containers/nginx:1.7.9 k8s.gcr.io/nginx:1.7.9
gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.1 k8s.gcr.io/nginx-ingress-controller:0.9.0-beta.1
gcr.io/google_containers/nginx-slim:0.7 k8s.gcr.io/nginx-slim:0.7
gcr.io/google_containers/nginx-slim:0.8 k8s.gcr.io/nginx-slim:0.8
gcr.io/google_containers/node-problem-detector:v0.3.0 k8s.gcr.io/node-problem-detector:v0.3.0
gcr.io/google_containers/pause k8s.gcr.io/pause
gcr.io/google_containers/porter:4524579c0eb935c056c8e75563b4e1eda31587e0 k8s.gcr.io/porter:4524579c0eb935c056c8e75563b4e1eda31587e0
gcr.io/google_containers/portforwardtester:1.2 k8s.gcr.io/portforwardtester:1.2
gcr.io/google_containers/redis-install-3.2.0:e2e k8s.gcr.io/redis-install-3.2.0:e2e
gcr.io/google_containers/resource_consumer:beta4 k8s.gcr.io/resource_consumer:beta4
gcr.io/google_containers/resource_consumer/controller:beta4 k8s.gcr.io/resource_consumer/controller:beta4
gcr.io/kubernetes-e2e-test-images/serve-hostname-amd64:1.1 gcr.io/kubernetes-e2e-test-images/serve-hostname-amd64:1.1
gcr.io/kubernetes-e2e-test-images/hostexec-amd64:1.1 gcr.io/kubernetes-e2e-test-images/hostexec-amd64:1.1
gcr.io/google_containers/servicelb:0.1 k8s.gcr.io/servicelb:0.1
gcr.io/google_containers/test-webserver:e2e k8s.gcr.io/test-webserver:e2e
gcr.io/google_containers/update-demo:kitten k8s.gcr.io/update-demo:kitten
gcr.io/google_containers/update-demo:nautilus k8s.gcr.io/update-demo:nautilus
gcr.io/google_containers/volume-ceph:0.1 k8s.gcr.io/volume-ceph:0.1
gcr.io/google_containers/volume-gluster:0.2 k8s.gcr.io/volume-gluster:0.2
gcr.io/google_containers/volume-iscsi:0.1 k8s.gcr.io/volume-iscsi:0.1
gcr.io/google_containers/volume-nfs:0.8 k8s.gcr.io/volume-nfs:0.8
gcr.io/google_containers/volume-rbd:0.1 k8s.gcr.io/volume-rbd:0.1
gcr.io/google_containers/zookeeper-install-3.5.0-alpha:e2e k8s.gcr.io/zookeeper-install-3.5.0-alpha:e2e
gcr.io/google_samples/gb-redisslave:nonexistent gcr.io/google_samples/gb-redisslave:nonexistent
; do echo $(date '+%X') pulling $i; docker pull $i 1>/dev/null; done; exit 0; ; do echo $(date '+%X') pulling $i; docker pull $i 1>/dev/null; done; exit 0;
securityContext: securityContext:
@ -91,7 +91,7 @@ spec:
cpu: 100m cpu: 100m
limits: limits:
cpu: 100m cpu: 100m
image: gcr.io/google_containers/kube-nethealth-amd64:1.0 image: k8s.gcr.io/kube-nethealth-amd64:1.0
command: command:
- /bin/sh - /bin/sh
- -c - -c

2
cluster/gce/manifests/etcd.manifest
View File

@ -13,7 +13,7 @@
"containers":[ "containers":[
{ {
"name": "etcd-container", "name": "etcd-container",
"image": "{{ pillar.get('etcd_docker_repository', 'gcr.io/google_containers/etcd') }}:{{ pillar.get('etcd_docker_tag', '3.2.14') }}", "image": "{{ pillar.get('etcd_docker_repository', 'k8s.gcr.io/etcd') }}:{{ pillar.get('etcd_docker_tag', '3.2.14') }}",
"resources": { "resources": {
"requests": { "requests": {
"cpu": {{ cpulimit }} "cpu": {{ cpulimit }}

2
cluster/gce/manifests/glbc.manifest
View File

@ -13,7 +13,7 @@ spec:
terminationGracePeriodSeconds: 600 terminationGracePeriodSeconds: 600
hostNetwork: true hostNetwork: true
containers: containers:
- image: gcr.io/google_containers/glbc:0.9.7 - image: k8s.gcr.io/glbc:0.9.7
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /healthz path: /healthz

2
cluster/gce/manifests/kube-addon-manager.yaml
View File

@ -13,7 +13,7 @@ spec:
- name: kube-addon-manager - name: kube-addon-manager
# When updating version also bump it in: # When updating version also bump it in:
# - test/kubemark/resources/manifests/kube-addon-manager.yaml # - test/kubemark/resources/manifests/kube-addon-manager.yaml
image: gcr.io/google-containers/kube-addon-manager:v8.5 image: k8s.gcr.io/kube-addon-manager:v8.5
command: command:
- /bin/bash - /bin/bash
- -c - -c

2
cluster/gce/manifests/rescheduler.manifest
View File

@ -13,7 +13,7 @@ metadata:
spec: spec:
hostNetwork: true hostNetwork: true
containers: containers:
- image: gcr.io/google-containers/rescheduler:v0.3.1 - image: k8s.gcr.io/rescheduler:v0.3.1
name: rescheduler name: rescheduler
volumeMounts: volumeMounts:
- mountPath: /var/log/rescheduler.log - mountPath: /var/log/rescheduler.log

21
cluster/gce/util.sh
View File

@ -210,7 +210,6 @@ function copy-to-staging() {
# ZONE # ZONE
# Vars set: # Vars set:
# PREFERRED_REGION # PREFERRED_REGION
# KUBE_ADDON_REGISTRY
function set-preferred-region() { function set-preferred-region() {
case ${ZONE} in case ${ZONE} in
asia-*) asia-*)
@ -223,26 +222,12 @@ function set-preferred-region() {
PREFERRED_REGION=("us" "eu" "asia") PREFERRED_REGION=("us" "eu" "asia")
;; ;;
esac esac
local -r preferred="${PREFERRED_REGION[0]}"
if [[ "${RELEASE_REGION_FALLBACK}" != "true" ]]; then if [[ "${RELEASE_REGION_FALLBACK}" != "true" ]]; then
PREFERRED_REGION=( "${preferred}" ) PREFERRED_REGION=( "${PREFERRED_REGION[0]}" )
fi
# If we're using regional GCR, and we're outside the US, go to the
# regional registry. The gcr.io/google_containers registry is
# appropriate for US (for now).
if [[ "${REGIONAL_KUBE_ADDONS}" == "true" ]] && [[ "${preferred}" != "us" ]]; then
KUBE_ADDON_REGISTRY="${preferred}.gcr.io/google_containers"
else
KUBE_ADDON_REGISTRY="gcr.io/google_containers"
fi fi
} }
if [[ "${ENABLE_DOCKER_REGISTRY_CACHE:-}" == "true" ]]; then
DOCKER_REGISTRY_MIRROR_URL="https://mirror.gcr.io"
fi
# Take the local tar files and upload them to Google Storage. They will then be # Take the local tar files and upload them to Google Storage. They will then be
# downloaded by the master as part of the start up script for the master. # downloaded by the master as part of the start up script for the master.
# #
@ -275,6 +260,10 @@ function upload-server-tars() {
set-preferred-region set-preferred-region
if [[ "${ENABLE_DOCKER_REGISTRY_CACHE:-}" == "true" ]]; then
DOCKER_REGISTRY_MIRROR_URL="https://mirror.gcr.io"
fi
SERVER_BINARY_TAR_HASH=$(sha1sum-file "${SERVER_BINARY_TAR}") SERVER_BINARY_TAR_HASH=$(sha1sum-file "${SERVER_BINARY_TAR}")
if [[ -n "${KUBE_MANIFESTS_TAR:-}" ]]; then if [[ -n "${KUBE_MANIFESTS_TAR:-}" ]]; then
KUBE_MANIFESTS_TAR_HASH=$(sha1sum-file "${KUBE_MANIFESTS_TAR}") KUBE_MANIFESTS_TAR_HASH=$(sha1sum-file "${KUBE_MANIFESTS_TAR}")

2
cluster/get-kube-local.sh
View File

@ -97,7 +97,7 @@ function create_cluster {
--pid=host \ --pid=host \
--privileged=true \ --privileged=true \
-d \ -d \
gcr.io/google_containers/hyperkube-${arch}:${release} \ k8s.gcr.io/hyperkube-${arch}:${release} \
/hyperkube kubelet \ /hyperkube kubelet \
--containerized \ --containerized \
--hostname-override="127.0.0.1" \ --hostname-override="127.0.0.1" \

2
cluster/images/etcd-empty-dir-cleanup/Makefile
View File

@ -15,7 +15,7 @@
.PHONY: build push .PHONY: build push
ETCD_VERSION = 3.1.10 ETCD_VERSION = 3.1.10
IMAGE = gcr.io/google-containers/etcd-empty-dir-cleanup IMAGE = staging-k8s.gcr.io/etcd-empty-dir-cleanup
TAG = 3.1.10.0 TAG = 3.1.10.0
clean: clean:

12
cluster/images/etcd-version-monitor/Makefile
View File

@ -15,11 +15,11 @@
# Build the etcd-version-monitor image # Build the etcd-version-monitor image
# #
# Usage: # Usage:
# [GOLANG_VERSION=1.8.3] [REGISTRY=gcr.io/google-containers] [TAG=test] make (build|push) # [GOLANG_VERSION=1.8.3] [REGISTRY=staging-k8s.gcr.io] [TAG=test] make (build|push)
# TODO(shyamjvs): Support architectures other than amd64 if needed. # TODO(shyamjvs): Support architectures other than amd64 if needed.
ARCH:=amd64 ARCH:=amd64
GOLANG_VERSION?=1.8.3 GOLANG_VERSION?=1.8.3
REGISTRY?=gcr.io/google-containers REGISTRY?=staging-k8s.gcr.io
TAG?=0.1.1 TAG?=0.1.1
IMAGE:=$(REGISTRY)/etcd-version-monitor:$(TAG) IMAGE:=$(REGISTRY)/etcd-version-monitor:$(TAG)
CURRENT_DIR:=$(pwd) CURRENT_DIR:=$(pwd)
@ -30,8 +30,12 @@ build:
cp etcd-version-monitor.go Dockerfile $(TEMP_DIR) cp etcd-version-monitor.go Dockerfile $(TEMP_DIR)
# Compile etcd-version-monitor. # Compile etcd-version-monitor.
docker run -it -v $(shell pwd)/../../../:/go/src/k8s.io/kubernetes -v $(TEMP_DIR):/build -e GOARCH=$(ARCH) golang:$(GOLANG_VERSION) \ docker run -it \
/bin/bash -c "CGO_ENABLED=0 go build -o /build/etcd-version-monitor k8s.io/kubernetes/cluster/images/etcd-version-monitor" -v $(shell pwd)/../../../:/go/src/k8s.io/kubernetes \
-v $(TEMP_DIR):/build \
-e GOARCH=$(ARCH) \
golang:$(GOLANG_VERSION) \
/bin/bash -c "CGO_ENABLED=0 go build -o /build/etcd-version-monitor k8s.io/kubernetes/cluster/images/etcd-version-monitor"
docker build -t $(IMAGE) $(TEMP_DIR) docker build -t $(IMAGE) $(TEMP_DIR)

2
cluster/images/etcd-version-monitor/README.md
View File

@ -18,7 +18,7 @@ latency metrics (`etcd_grpc_unary_requests_duration_seconds`) to be exposed.
To run this tool as a docker container: To run this tool as a docker container:
- make build - make build
- docker run --net=host -i -t gcr.io/google_containers/etcd-version-monitor:test /etcd-version-monitor --logtostderr - docker run --net=host -i -t k8s.gcr.io/etcd-version-monitor:test /etcd-version-monitor --logtostderr
To run this as a pod on the kubernetes cluster: To run this as a pod on the kubernetes cluster:
- Place the 'etcd-version-monitor.yaml' in the manifests directory of - Place the 'etcd-version-monitor.yaml' in the manifests directory of

2
cluster/images/etcd-version-monitor/etcd-version-monitor.yaml
View File

@ -7,7 +7,7 @@ spec:
hostNetwork: true hostNetwork: true
containers: containers:
- name: etcd-version-monitor - name: etcd-version-monitor
image: gcr.io/google-containers/etcd-version-monitor:0.1.0 image: k8s.gcr.io/etcd-version-monitor:0.1.0
command: command:
- /etcd-version-monitor - /etcd-version-monitor
- --logtostderr - --logtostderr

4
cluster/images/etcd/Makefile
View File

@ -15,7 +15,7 @@
# Build the etcd image # Build the etcd image
# #
# Usage: # Usage:
# [TAGS=2.2.1 2.3.7 3.0.17 3.1.11 3.2.14] [REGISTRY=gcr.io/google_containers] [ARCH=amd64] [BASEIMAGE=busybox] make (build|push) # [TAGS=2.2.1 2.3.7 3.0.17 3.1.11 3.2.14] [REGISTRY=k8s.gcr.io] [ARCH=amd64] [BASEIMAGE=busybox] make (build|push)
# The image contains different etcd versions to simplify # The image contains different etcd versions to simplify
# upgrades. Thus be careful when removing any tag from here. # upgrades. Thus be careful when removing any tag from here.
@ -29,7 +29,7 @@
TAGS?=2.2.1 2.3.7 3.0.17 3.1.11 3.2.14 TAGS?=2.2.1 2.3.7 3.0.17 3.1.11 3.2.14
REGISTRY_TAG?=3.2.14 REGISTRY_TAG?=3.2.14
ARCH?=amd64 ARCH?=amd64
REGISTRY?=gcr.io/google_containers REGISTRY?=k8s.gcr.io
# golang version should match the golang version from https://github.com/coreos/etcd/releases for REGISTRY_TAG version of etcd. # golang version should match the golang version from https://github.com/coreos/etcd/releases for REGISTRY_TAG version of etcd.
GOLANG_VERSION?=1.8.5 GOLANG_VERSION?=1.8.5
GOARM=7 GOARM=7

12
cluster/images/etcd/README.md
View File

@ -10,20 +10,20 @@ For other architectures, `etcd` is cross-compiled from source. Arch-specific `bu
```console ```console
# Build for linux/amd64 (default) # Build for linux/amd64 (default)
$ make push ARCH=amd64 $ make push ARCH=amd64
# ---> gcr.io/google_containers/etcd-amd64:TAG # ---> staging-k8s.gcr.io/etcd-amd64:TAG
# ---> gcr.io/google_containers/etcd:TAG # ---> staging-k8s.gcr.io/etcd:TAG
$ make push ARCH=arm $ make push ARCH=arm
# ---> gcr.io/google_containers/etcd-arm:TAG # ---> staging-k8s.gcr.io/etcd-arm:TAG
$ make push ARCH=arm64 $ make push ARCH=arm64
# ---> gcr.io/google_containers/etcd-arm64:TAG # ---> staging-k8s.gcr.io/etcd-arm64:TAG
$ make push ARCH=ppc64le $ make push ARCH=ppc64le
# ---> gcr.io/google_containers/etcd-ppc64le:TAG # ---> staging-k8s.gcr.io/etcd-ppc64le:TAG
$ make push ARCH=s390x $ make push ARCH=s390x
# ---> gcr.io/google_containers/etcd-s390x:TAG # ---> staging-k8s.gcr.io/etcd-s390x:TAG
``` ```
If you don't want to push the images, run `make` or `make build` instead If you don't want to push the images, run `make` or `make build` instead

2
cluster/images/hyperkube/BUILD
View File

@ -27,7 +27,7 @@ docker_build(
docker_bundle( docker_bundle(
name = "hyperkube", name = "hyperkube",
images = {"gcr.io/google-containers/hyperkube-amd64:{STABLE_DOCKER_TAG}": "hyperkube-internal"}, images = {"k8s.gcr.io/hyperkube-amd64:{STABLE_DOCKER_TAG}": "hyperkube-internal"},
stamp = True, stamp = True,
) )

2
cluster/images/hyperkube/Dockerfile
View File

@ -16,7 +16,7 @@ FROM BASEIMAGE
# Create symlinks for each hyperkube server # Create symlinks for each hyperkube server
# Also create symlinks to /usr/local/bin/ where the server image binaries live, so the hyperkube image may be # Also create symlinks to /usr/local/bin/ where the server image binaries live, so the hyperkube image may be
# used instead of gcr.io/google_containers/kube-* without any modifications. # used instead of k8s.gcr.io/kube-* without any modifications.
# TODO: replace manual symlink creation with --make-symlink command once # TODO: replace manual symlink creation with --make-symlink command once
# cross-building with qemu supports go binaries. See #28702 # cross-building with qemu supports go binaries. See #28702
# RUN /hyperkube --make-symlinks # RUN /hyperkube --make-symlinks

6
cluster/images/hyperkube/Makefile
View File

@ -15,14 +15,14 @@
# Build the hyperkube image. # Build the hyperkube image.
# #
# Usage: # Usage:
# [ARCH=amd64] [REGISTRY="gcr.io/google-containers"] make (build|push) VERSION={some_released_version_of_kubernetes} # [ARCH=amd64] [REGISTRY="staging-k8s.gcr.io"] make (build|push) VERSION={some_released_version_of_kubernetes}
REGISTRY?=gcr.io/google-containers REGISTRY?=staging-k8s.gcr.io
ARCH?=amd64 ARCH?=amd64
OUT_DIR?=_output OUT_DIR?=_output
HYPERKUBE_BIN?=$(OUT_DIR)/dockerized/bin/linux/$(ARCH)/hyperkube HYPERKUBE_BIN?=$(OUT_DIR)/dockerized/bin/linux/$(ARCH)/hyperkube
BASEIMAGE=gcr.io/google-containers/debian-hyperkube-base-$(ARCH):0.8 BASEIMAGE=k8s.gcr.io/debian-hyperkube-base-$(ARCH):0.8
TEMP_DIR:=$(shell mktemp -d -t hyperkubeXXXXXX) TEMP_DIR:=$(shell mktemp -d -t hyperkubeXXXXXX)
all: build all: build

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

@ -10,23 +10,23 @@
$ build/run.sh make cross $ build/run.sh make cross
# Build for linux/amd64 (default) # Build for linux/amd64 (default)
# export REGISTRY=$HOST/$ORG to switch from gcr.io/google_containers # export REGISTRY=$HOST/$ORG to switch from staging-k8s.gcr.io
$ make push VERSION={target_version} ARCH=amd64 $ make push VERSION={target_version} ARCH=amd64
# ---> gcr.io/google_containers/hyperkube-amd64:VERSION # ---> staging-k8s.gcr.io/hyperkube-amd64:VERSION
# ---> gcr.io/google_containers/hyperkube:VERSION (image with backwards-compatible naming) # ---> staging-k8s.gcr.io/hyperkube:VERSION (image with backwards-compatible naming)
$ make push VERSION={target_version} ARCH=arm $ make push VERSION={target_version} ARCH=arm
# ---> gcr.io/google_containers/hyperkube-arm:VERSION # ---> staging-k8s.gcr.io/hyperkube-arm:VERSION
$ make push VERSION={target_version} ARCH=arm64 $ make push VERSION={target_version} ARCH=arm64
# ---> gcr.io/google_containers/hyperkube-arm64:VERSION # ---> staging-k8s.gcr.io/hyperkube-arm64:VERSION
$ make push VERSION={target_version} ARCH=ppc64le $ make push VERSION={target_version} ARCH=ppc64le
# ---> gcr.io/google_containers/hyperkube-ppc64le:VERSION # ---> staging-k8s.gcr.io/hyperkube-ppc64le:VERSION
$ make push VERSION={target_version} ARCH=s390x $ make push VERSION={target_version} ARCH=s390x
# ---> gcr.io/google_containers/hyperkube-s390x:VERSION # ---> staging-k8s.gcr.io/hyperkube-s390x:VERSION
``` ```
If you don't want to push the images, run `make` or `make build` instead If you don't want to push the images, run `make` or `make build` instead

4
cluster/images/kubemark/BUILD
View File

@ -12,8 +12,8 @@ docker_build(
docker_push( docker_push(
name = "push", name = "push",
image = ":image", image = ":image",
registry = "gcr.io", registry = "$(REGISTRY)",
repository = "$(PROJECT)/kubemark", repository = "kubemark",
stamp = True, stamp = True,
tag = "latest", tag = "latest",
tags = ["manual"], tags = ["manual"],

13
cluster/images/kubemark/Makefile
View File

@ -15,18 +15,21 @@
# build Kubemark image from currently built binaries containing both 'real' master and Hollow Node. # build Kubemark image from currently built binaries containing both 'real' master and Hollow Node.
# This makefile assumes that the kubemark binary is present in this directory. # This makefile assumes that the kubemark binary is present in this directory.
REGISTRY?=gcr.io # Allow the caller to override this. Beware make's precedence. This:
PROJECT?=google_containers # REGISTRY=$VAR make
# .. is not the same as:
# make REGISTRY=$VAR
REGISTRY := $(if $(REGISTRY),$(REGISTRY),staging-k8s.gcr.io)
all: gcloudpush all: gcloudpush
build: build:
docker build --pull -t $(REGISTRY)/$(PROJECT)/kubemark . docker build --pull -t $(REGISTRY)/kubemark .
gcloudpush: build gcloudpush: build
gcloud docker -- push $(REGISTRY)/$(PROJECT)/kubemark gcloud docker -- push $(REGISTRY)/kubemark
push: build push: build
docker -- push $(REGISTRY)/$(PROJECT)/kubemark docker -- push $(REGISTRY)/kubemark
.PHONY: all build gcloudpush push .PHONY: all build gcloudpush push

6
cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py
View File

@ -686,10 +686,10 @@ def launch_default_ingress_controller():
context['defaultbackend_image'] == "auto"): context['defaultbackend_image'] == "auto"):
if context['arch'] == 's390x': if context['arch'] == 's390x':
context['defaultbackend_image'] = \ context['defaultbackend_image'] = \
"gcr.io/google_containers/defaultbackend-s390x:1.4" "k8s.gcr.io/defaultbackend-s390x:1.4"
else: else:
context['defaultbackend_image'] = \ context['defaultbackend_image'] = \
"gcr.io/google_containers/defaultbackend:1.4" "k8s.gcr.io/defaultbackend:1.4"
# Render the default http backend (404) replicationcontroller manifest # Render the default http backend (404) replicationcontroller manifest
manifest = addon_path.format('default-http-backend.yaml') manifest = addon_path.format('default-http-backend.yaml')
@ -712,7 +712,7 @@ def launch_default_ingress_controller():
"docker.io/cdkbot/nginx-ingress-controller-s390x:0.9.0-beta.13" "docker.io/cdkbot/nginx-ingress-controller-s390x:0.9.0-beta.13"
else: else:
context['ingress_image'] = \ context['ingress_image'] = \
"gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.15" # noqa "k8s.gcr.io/nginx-ingress-controller:0.9.0-beta.15" # noqa
context['juju_application'] = hookenv.service_name() context['juju_application'] = hookenv.service_name()
manifest = addon_path.format('ingress-daemon-set.yaml') manifest = addon_path.format('ingress-daemon-set.yaml')
render('ingress-daemon-set.yaml', manifest, context) render('ingress-daemon-set.yaml', manifest, context)

2
cluster/kubemark/gce/config-default.sh
View File

@ -62,7 +62,7 @@ TERMINATED_POD_GC_THRESHOLD=${TERMINATED_POD_GC_THRESHOLD:-100}
KUBE_APISERVER_REQUEST_TIMEOUT=300 KUBE_APISERVER_REQUEST_TIMEOUT=300
ETCD_COMPACTION_INTERVAL_SEC="${KUBEMARK_ETCD_COMPACTION_INTERVAL_SEC:-}" ETCD_COMPACTION_INTERVAL_SEC="${KUBEMARK_ETCD_COMPACTION_INTERVAL_SEC:-}"
# Set etcd image (e.g. gcr.io/google_containers/etcd) and version (e.g. 3.1.10) if you need # Set etcd image (e.g. k8s.gcr.io/etcd) and version (e.g. 3.1.10) if you need
# non-default version. # non-default version.
ETCD_IMAGE="${TEST_ETCD_IMAGE:-}" ETCD_IMAGE="${TEST_ETCD_IMAGE:-}"
ETCD_VERSION="${TEST_ETCD_VERSION:-}" ETCD_VERSION="${TEST_ETCD_VERSION:-}"

2
cluster/log-dump/logexporter-daemonset.yaml
View File

@ -36,7 +36,7 @@ spec:
spec: spec:
containers: containers:
- name: logexporter-test - name: logexporter-test
image: gcr.io/google-containers/logexporter:v0.1.1 image: k8s.gcr.io/logexporter:v0.1.1
env: env:
- name: NODE_NAME - name: NODE_NAME
valueFrom: valueFrom:

4
cluster/restore-from-backup.sh
View File

@ -160,7 +160,7 @@ if [ "${ETCD_API}" == "etcd2" ]; then
echo "Starting etcd ${ETCD_VERSION} to restore data" echo "Starting etcd ${ETCD_VERSION} to restore data"
image=$(docker run -d -v ${BACKUP_DIR}:/var/etcd/data \ image=$(docker run -d -v ${BACKUP_DIR}:/var/etcd/data \
--net=host -p ${etcd_port}:${etcd_port} \ --net=host -p ${etcd_port}:${etcd_port} \
"gcr.io/google_containers/etcd:${ETCD_VERSION}" /bin/sh -c \ "k8s.gcr.io/etcd:${ETCD_VERSION}" /bin/sh -c \
"/usr/local/bin/etcd --data-dir /var/etcd/data --force-new-cluster") "/usr/local/bin/etcd --data-dir /var/etcd/data --force-new-cluster")
if [ "$?" -ne "0" ]; then if [ "$?" -ne "0" ]; then
echo "Docker container didn't started correctly" echo "Docker container didn't started correctly"
@ -191,7 +191,7 @@ elif [ "${ETCD_API}" == "etcd3" ]; then
# Run etcdctl snapshot restore command and wait until it is finished. # Run etcdctl snapshot restore command and wait until it is finished.
# setting with --name in the etcd manifest file and then it seems to work. # setting with --name in the etcd manifest file and then it seems to work.
docker run -v ${BACKUP_DIR}:/var/tmp/backup --env ETCDCTL_API=3 \ docker run -v ${BACKUP_DIR}:/var/tmp/backup --env ETCDCTL_API=3 \
"gcr.io/google_containers/etcd:${ETCD_VERSION}" /bin/sh -c \ "k8s.gcr.io/etcd:${ETCD_VERSION}" /bin/sh -c \
"/usr/local/bin/etcdctl snapshot restore ${BACKUP_DIR}/${snapshot} --name ${NAME} --initial-cluster ${INITIAL_CLUSTER} --initial-advertise-peer-urls ${INITIAL_ADVERTISE_PEER_URLS}; mv /${NAME}.etcd/member /var/tmp/backup/" "/usr/local/bin/etcdctl snapshot restore ${BACKUP_DIR}/${snapshot} --name ${NAME} --initial-cluster ${INITIAL_CLUSTER} --initial-advertise-peer-urls ${INITIAL_ADVERTISE_PEER_URLS}; mv /${NAME}.etcd/member /var/tmp/backup/"
if [ "$?" -ne "0" ]; then if [ "$?" -ne "0" ]; then
echo "Docker container didn't started correctly" echo "Docker container didn't started correctly"

2
cmd/kubeadm/app/apis/kubeadm/v1alpha1/defaults.go
View File

@ -47,7 +47,7 @@ const (
// DefaultCertificatesDir defines default certificate directory // DefaultCertificatesDir defines default certificate directory
DefaultCertificatesDir = "/etc/kubernetes/pki" DefaultCertificatesDir = "/etc/kubernetes/pki"
// DefaultImageRepository defines default image registry // DefaultImageRepository defines default image registry
DefaultImageRepository = "gcr.io/google_containers" DefaultImageRepository = "k8s.gcr.io"
// DefaultManifestsDir defines default manifests directory // DefaultManifestsDir defines default manifests directory
DefaultManifestsDir = "/etc/kubernetes/manifests" DefaultManifestsDir = "/etc/kubernetes/manifests"

2
cmd/kubeadm/app/images/images_test.go
View File

@ -27,7 +27,7 @@ import (
const ( const (
testversion = "v10.1.2-alpha.1.100+0123456789abcdef+SOMETHING" testversion = "v10.1.2-alpha.1.100+0123456789abcdef+SOMETHING"
expected = "v10.1.2-alpha.1.100_0123456789abcdef_SOMETHING" expected = "v10.1.2-alpha.1.100_0123456789abcdef_SOMETHING"
gcrPrefix = "gcr.io/google_containers" gcrPrefix = "k8s.gcr.io"
) )
func TestGetCoreImage(t *testing.T) { func TestGetCoreImage(t *testing.T) {

18
cmd/kubeadm/app/phases/selfhosting/selfhosting_test.go
View File

@ -66,7 +66,7 @@ spec:
- --proxy-client-key-file=/etc/kubernetes/pki/front-proxy-client.key - --proxy-client-key-file=/etc/kubernetes/pki/front-proxy-client.key
- --authorization-mode=Node,RBAC - --authorization-mode=Node,RBAC
- --etcd-servers=http://127.0.0.1:2379 - --etcd-servers=http://127.0.0.1:2379
image: gcr.io/google_containers/kube-apiserver-amd64:v1.7.4 image: k8s.gcr.io/kube-apiserver-amd64:v1.7.4
livenessProbe: livenessProbe:
failureThreshold: 8 failureThreshold: 8
httpGet: httpGet:
@ -153,7 +153,7 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: status.hostIP fieldPath: status.hostIP
image: gcr.io/google_containers/kube-apiserver-amd64:v1.7.4 image: k8s.gcr.io/kube-apiserver-amd64:v1.7.4
livenessProbe: livenessProbe:
failureThreshold: 8 failureThreshold: 8
httpGet: httpGet:
@ -225,7 +225,7 @@ spec:
- --cluster-signing-key-file=/etc/kubernetes/pki/ca.key - --cluster-signing-key-file=/etc/kubernetes/pki/ca.key
- --address=127.0.0.1 - --address=127.0.0.1
- --use-service-account-credentials=true - --use-service-account-credentials=true
image: gcr.io/google_containers/kube-controller-manager-amd64:v1.7.4 image: k8s.gcr.io/kube-controller-manager-amd64:v1.7.4
livenessProbe: livenessProbe:
failureThreshold: 8 failureThreshold: 8
httpGet: httpGet:
@ -300,7 +300,7 @@ spec:
- --cluster-signing-key-file=/etc/kubernetes/pki/ca.key - --cluster-signing-key-file=/etc/kubernetes/pki/ca.key
- --address=127.0.0.1 - --address=127.0.0.1
- --use-service-account-credentials=true - --use-service-account-credentials=true
image: gcr.io/google_containers/kube-controller-manager-amd64:v1.7.4 image: k8s.gcr.io/kube-controller-manager-amd64:v1.7.4
livenessProbe: livenessProbe:
failureThreshold: 8 failureThreshold: 8
httpGet: httpGet:
@ -373,7 +373,7 @@ spec:
- --leader-elect=true - --leader-elect=true
- --kubeconfig=/etc/kubernetes/scheduler.conf - --kubeconfig=/etc/kubernetes/scheduler.conf
- --address=127.0.0.1 - --address=127.0.0.1
image: gcr.io/google_containers/kube-scheduler-amd64:v1.7.4 image: k8s.gcr.io/kube-scheduler-amd64:v1.7.4
livenessProbe: livenessProbe:
failureThreshold: 8 failureThreshold: 8
httpGet: httpGet:
@ -424,7 +424,7 @@ spec:
- --leader-elect=true - --leader-elect=true
- --kubeconfig=/etc/kubernetes/scheduler.conf - --kubeconfig=/etc/kubernetes/scheduler.conf
- --address=127.0.0.1 - --address=127.0.0.1
image: gcr.io/google_containers/kube-scheduler-amd64:v1.7.4 image: k8s.gcr.io/kube-scheduler-amd64:v1.7.4
livenessProbe: livenessProbe:
failureThreshold: 8 failureThreshold: 8
httpGet: httpGet:
@ -526,7 +526,7 @@ metadata:
name: testpod name: testpod
spec: spec:
containers: containers:
- image: gcr.io/google_containers/busybox - image: k8s.gcr.io/busybox
`, `,
expectError: false, expectError: false,
}, },
@ -542,7 +542,7 @@ spec:
"spec": { "spec": {
"containers": [ "containers": [
{ {
"image": "gcr.io/google_containers/busybox" "image": "k8s.gcr.io/busybox"
} }
] ]
} }
@ -557,7 +557,7 @@ kind: Pod
metadata: metadata:
name: testpod name: testpod
spec: spec:
- image: gcr.io/google_containers/busybox - image: k8s.gcr.io/busybox
`, `,
expectError: true, expectError: true,
}, },

2
cmd/kubeadm/app/phases/upgrade/staticpods_test.go
View File

@ -61,7 +61,7 @@ etcd:
image: "" image: ""
keyFile: "" keyFile: ""
featureFlags: null featureFlags: null
imageRepository: gcr.io/google_containers imageRepository: k8s.gcr.io
kubernetesVersion: %s kubernetesVersion: %s
networking: networking:
dnsDomain: cluster.local dnsDomain: cluster.local

8
cmd/kubeadm/app/util/template_test.go
View File

@ -22,8 +22,8 @@ import (
const ( const (
validTmpl = "image: {{ .ImageRepository }}/pause-{{ .Arch }}:3.1" validTmpl = "image: {{ .ImageRepository }}/pause-{{ .Arch }}:3.1"
validTmplOut = "image: gcr.io/google_containers/pause-amd64:3.1" validTmplOut = "image: k8s.gcr.io/pause-amd64:3.1"
doNothing = "image: gcr.io/google_containers/pause-amd64:3.1" doNothing = "image: k8s.gcr.io/pause-amd64:3.1"
invalidTmpl1 = "{{ .baz }/d}" invalidTmpl1 = "{{ .baz }/d}"
invalidTmpl2 = "{{ !foobar }}" invalidTmpl2 = "{{ !foobar }}"
) )
@ -39,7 +39,7 @@ func TestParseTemplate(t *testing.T) {
{ {
template: validTmpl, template: validTmpl,
data: struct{ ImageRepository, Arch string }{ data: struct{ ImageRepository, Arch string }{
ImageRepository: "gcr.io/google_containers", ImageRepository: "k8s.gcr.io",
Arch: "amd64", Arch: "amd64",
}, },
output: validTmplOut, output: validTmplOut,
@ -49,7 +49,7 @@ func TestParseTemplate(t *testing.T) {
{ {
template: doNothing, template: doNothing,
data: struct{ ImageRepository, Arch string }{ data: struct{ ImageRepository, Arch string }{
ImageRepository: "gcr.io/google_containers", ImageRepository: "k8s.gcr.io",
Arch: "amd64", Arch: "amd64",
}, },
output: doNothing, output: doNothing,

4
cmd/kubelet/app/options/container_runtime.go
View File

@ -26,8 +26,8 @@ import (
) )
const ( const (
// When these values are updated, also update test/utils/image/manifest.go // When these values are updated, also update test/e2e/framework/util.go
defaultPodSandboxImageName = "gcr.io/google_containers/pause" defaultPodSandboxImageName = "k8s.gcr.io/pause"
defaultPodSandboxImageVersion = "3.1" defaultPodSandboxImageVersion = "3.1"
// From pkg/kubelet/rkt/rkt.go to avoid circular import // From pkg/kubelet/rkt/rkt.go to avoid circular import
defaultRktAPIServiceEndpoint = "localhost:15441" defaultRktAPIServiceEndpoint = "localhost:15441"

2
docs/api-reference/v1/definitions.html generated
View File

@ -5201,7 +5201,7 @@ Examples:<br>
<tbody> <tbody>
<tr> <tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">names</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">names</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">Names by which this image is known. e.g. ["gcr.io/google_containers/hyperkube:v1.0.7", "dockerhub.io/google_containers/hyperkube:v1.0.7"]</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">Names by which this image is known. e.g. ["k8s.gcr.io/hyperkube:v1.0.7", "dockerhub.io/google_containers/hyperkube:v1.0.7"]</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">true</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">true</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">string array</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">string array</p></td>
<td class="tableblock halign-left valign-top"></td> <td class="tableblock halign-left valign-top"></td>

2
examples/cluster-dns/dns-backend-rc.yaml
View File

@ -15,7 +15,7 @@ spec:
spec: spec:
containers: containers:
- name: dns-backend - name: dns-backend
image: gcr.io/google_containers/example-dns-backend:v1 image: k8s.gcr.io/example-dns-backend:v1
ports: ports:
- name: backend-port - name: backend-port
containerPort: 8000 containerPort: 8000

2
examples/cluster-dns/dns-frontend-pod.yaml
View File

@ -7,7 +7,7 @@ metadata:
spec: spec:
containers: containers:
- name: dns-frontend - name: dns-frontend
image: gcr.io/google_containers/example-dns-frontend:v1 image: k8s.gcr.io/example-dns-frontend:v1
command: command:
- python - python
- client.py - client.py

2
examples/cluster-dns/images/backend/Makefile
View File

@ -13,7 +13,7 @@
# limitations under the License. # limitations under the License.
TAG = v1 TAG = v1
PREFIX = gcr.io/google_containers PREFIX = staging-k8s.gcr.io
IMAGE = example-dns-backend IMAGE = example-dns-backend
all: push all: push

2
examples/cluster-dns/images/frontend/Makefile
View File

@ -13,7 +13,7 @@
# limitations under the License. # limitations under the License.
TAG = v1 TAG = v1
PREFIX = gcr.io/google_containers PREFIX = staging-k8s.gcr.io
IMAGE = example-dns-frontend IMAGE = example-dns-frontend
all: push all: push

4
examples/explorer/Makefile
View File

@ -21,10 +21,10 @@ explorer: explorer.go
CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-w' ./explorer.go CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-w' ./explorer.go
container: explorer container: explorer
docker build --pull -t gcr.io/google_containers/explorer:$(TAG) . docker build --pull -t staging-k8s.gcr.io/explorer:$(TAG) .
push: container push: container
gcloud docker -- push gcr.io/google_containers/explorer:$(TAG) gcloud docker -- push staging-k8s.gcr.io/explorer:$(TAG)
clean: clean:
rm -f explorer rm -f explorer

2
examples/explorer/pod.yaml
View File

@ -5,7 +5,7 @@ metadata:
spec: spec:
containers: containers:
- name: explorer - name: explorer
image: gcr.io/google_containers/explorer:1.0 image: k8s.gcr.io/explorer:1.0
args: ["-port=8080"] args: ["-port=8080"]
ports: ports:
- containerPort: 8080 - containerPort: 8080

4
examples/guestbook-go/Makefile
View File

@ -15,9 +15,9 @@
# Build the guestbook-go example # Build the guestbook-go example
# Usage: # Usage:
# [VERSION=v3] [REGISTRY="gcr.io/google_containers"] make build # [VERSION=v3] [REGISTRY="staging-k8s.gcr.io"] make build
VERSION?=v3 VERSION?=v3
REGISTRY?=gcr.io/google_containers REGISTRY?=staging-k8s.gcr.io
release: clean build push clean release: clean build push clean

2
examples/guestbook-go/guestbook-controller.json
View File

@ -22,7 +22,7 @@
"containers":[ "containers":[
{ {
"name":"guestbook", "name":"guestbook",
"image":"gcr.io/google_containers/guestbook:v3", "image":"k8s.gcr.io/guestbook:v3",
"ports":[ "ports":[
{ {
"name":"http-server", "name":"http-server",

2
examples/guestbook/all-in-one/guestbook-all-in-one.yaml
View File

@ -30,7 +30,7 @@ spec:
spec: spec:
containers: containers:
- name: master - name: master
image: gcr.io/google_containers/redis:e2e # or just image: redis image: k8s.gcr.io/redis:e2e # or just image: redis
resources: resources:
requests: requests:
cpu: 100m cpu: 100m

2
examples/guestbook/legacy/redis-master-controller.yaml
View File

@ -17,7 +17,7 @@ spec:
spec: spec:
containers: containers:
- name: master - name: master
image: gcr.io/google_containers/redis:e2e # or just image: redis image: k8s.gcr.io/redis:e2e # or just image: redis
resources: resources:
requests: requests:
cpu: 100m cpu: 100m

2
examples/guestbook/redis-master-deployment.yaml
View File

@ -13,7 +13,7 @@ spec:
spec: spec:
containers: containers:
- name: master - name: master
image: gcr.io/google_containers/redis:e2e # or just image: redis image: k8s.gcr.io/redis:e2e # or just image: redis
resources: resources:
requests: requests:
cpu: 100m cpu: 100m

4
examples/kubectl-container/Makefile
View File

@ -37,11 +37,11 @@ tag: .tag
container: container:
$(if $(TAG),,$(error TAG is not defined. Use 'make tag' to see a suggestion)) $(if $(TAG),,$(error TAG is not defined. Use 'make tag' to see a suggestion))
docker build --pull -t gcr.io/google_containers/kubectl:$(TAG) . docker build --pull -t staging-k8s.gcr.io/kubectl:$(TAG) .
push: container push: container
$(if $(TAG),,$(error TAG is not defined. Use 'make tag' to see a suggestion)) $(if $(TAG),,$(error TAG is not defined. Use 'make tag' to see a suggestion))
gcloud docker -- push gcr.io/google_containers/kubectl:$(TAG) gcloud docker -- push staging-k8s.gcr.io/kubectl:$(TAG)
clean: clean:
rm -f kubectl rm -f kubectl

4
examples/kubectl-container/pod.json
View File

@ -8,7 +8,7 @@
"containers": [ "containers": [
{ {
"name": "bb", "name": "bb",
"image": "gcr.io/google_containers/busybox", "image": "k8s.gcr.io/busybox",
"command": [ "command": [
"sh", "-c", "sleep 5; wget -O - ${KUBERNETES_RO_SERVICE_HOST}:${KUBERNETES_RO_SERVICE_PORT}/api/v1/pods/; sleep 10000" "sh", "-c", "sleep 5; wget -O - ${KUBERNETES_RO_SERVICE_HOST}:${KUBERNETES_RO_SERVICE_PORT}/api/v1/pods/; sleep 10000"
], ],
@ -36,7 +36,7 @@
}, },
{ {
"name": "kubectl", "name": "kubectl",
"image": "gcr.io/google_containers/kubectl:v0.18.0-120-gaeb4ac55ad12b1-dirty", "image": "k8s.gcr.io/kubectl:v0.18.0-120-gaeb4ac55ad12b1-dirty",
"imagePullPolicy": "Always", "imagePullPolicy": "Always",
"args": [ "args": [
"proxy", "-p", "8001" "proxy", "-p", "8001"

2
examples/spark/spark-gluster/spark-master-controller.yaml
View File

@ -16,7 +16,7 @@ spec:
spec: spec:
containers: containers:
- name: spark-master - name: spark-master
image: gcr.io/google_containers/spark:1.5.2_v1 image: k8s.gcr.io/spark:1.5.2_v1
command: ["/start-master"] command: ["/start-master"]
ports: ports:
- containerPort: 7077 - containerPort: 7077

2
examples/spark/spark-gluster/spark-worker-controller.yaml
View File

@ -17,7 +17,7 @@ spec:
spec: spec:
containers: containers:
- name: spark-worker - name: spark-worker
image: gcr.io/google_containers/spark:1.5.2_v1 image: k8s.gcr.io/spark:1.5.2_v1
command: ["/start-worker"] command: ["/start-worker"]
ports: ports:
- containerPort: 8888 - containerPort: 8888

2
examples/spark/spark-master-controller.yaml
View File

@ -13,7 +13,7 @@ spec:
spec: spec:
containers: containers:
- name: spark-master - name: spark-master
image: gcr.io/google_containers/spark:1.5.2_v1 image: k8s.gcr.io/spark:1.5.2_v1
command: ["/start-master"] command: ["/start-master"]
ports: ports:
- containerPort: 7077 - containerPort: 7077

2
examples/spark/spark-worker-controller.yaml
View File

@ -13,7 +13,7 @@ spec:
spec: spec:
containers: containers:
- name: spark-worker - name: spark-worker
image: gcr.io/google_containers/spark:1.5.2_v1 image: k8s.gcr.io/spark:1.5.2_v1
command: ["/start-worker"] command: ["/start-worker"]
ports: ports:
- containerPort: 8081 - containerPort: 8081

2
examples/spark/zeppelin-controller.yaml
View File

@ -13,7 +13,7 @@ spec:
spec: spec:
containers: containers:
- name: zeppelin - name: zeppelin
image: gcr.io/google_containers/zeppelin:v0.5.6_v1 image: k8s.gcr.io/zeppelin:v0.5.6_v1
ports: ports:
- containerPort: 8080 - containerPort: 8080
resources: resources:

2
examples/storage/cassandra/image/Dockerfile
View File

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
FROM gcr.io/google_containers/ubuntu-slim:0.9 FROM k8s.gcr.io/ubuntu-slim:0.9
ARG BUILD_DATE ARG BUILD_DATE
ARG VCS_REF ARG VCS_REF

2
examples/storage/redis/redis-controller.yaml
View File

@ -13,7 +13,7 @@ spec:
spec: spec:
containers: containers:
- name: redis - name: redis
image: gcr.io/google_containers/redis:v1 image: k8s.gcr.io/redis:v1
ports: ports:
- containerPort: 6379 - containerPort: 6379
resources: resources:

Some files were not shown because too many files have changed in this diff Show More