github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-25 04:11:46 +00:00
Code Issues Projects Releases Wiki Activity

Revert k8s.gcr.io vanity domain

Browse Source 
This reverts commit eba5b6092a.

Fixes https://github.com/kubernetes/kubernetes/issues/57526
This commit is contained in:
Tim Hockin
2017-12-22 14:36:16 -08:00
parent 475d5c32e8
commit e9dd8a68f6
233 changed files with 470 additions and 486 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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:
- make build
- docker run --net=host -i -t k8s.gcr.io/etcd-version-monitor:test /etcd-version-monitor --logtostderr
- docker run --net=host -i -t gcr.io/google_containers/etcd-version-monitor:test /etcd-version-monitor --logtostderr
To run this as a pod on the kubernetes cluster:
- 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
containers:
- name: etcd-version-monitor
image: k8s.gcr.io/etcd-version-monitor:0.1.0
image: gcr.io/google-containers/etcd-version-monitor:0.1.0
command:
- /etcd-version-monitor
- --logtostderr

4
cluster/images/etcd/Makefile
View File

@@ -15,7 +15,7 @@
# Build the etcd image
#
# Usage:
# [TAGS=2.2.1 2.3.7 3.0.17 3.1.11] [REGISTRY=k8s.gcr.io] [ARCH=amd64] [BASEIMAGE=busybox] make (build|push)
# [TAGS=2.2.1 2.3.7 3.0.17 3.1.11] [REGISTRY=gcr.io/google_containers] [ARCH=amd64] [BASEIMAGE=busybox] make (build|push)
# The image contains different etcd versions to simplify
# 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
REGISTRY_TAG?=3.1.11
ARCH?=amd64
REGISTRY?=k8s.gcr.io
REGISTRY?=gcr.io/google_containers
GOLANG_VERSION?=1.7.6
GOARM=7
TEMP_DIR:=$(shell mktemp -d)

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
# Build for linux/amd64 (default)
$ make push ARCH=amd64
# ---> k8s.gcr.io/etcd-amd64:TAG
# ---> k8s.gcr.io/etcd:TAG
# ---> gcr.io/google_containers/etcd-amd64:TAG
# ---> gcr.io/google_containers/etcd:TAG
$ make push ARCH=arm
# ---> k8s.gcr.io/etcd-arm:TAG
# ---> gcr.io/google_containers/etcd-arm:TAG
$ make push ARCH=arm64
# ---> k8s.gcr.io/etcd-arm64:TAG
# ---> gcr.io/google_containers/etcd-arm64:TAG
$ make push ARCH=ppc64le
# ---> k8s.gcr.io/etcd-ppc64le:TAG
# ---> gcr.io/google_containers/etcd-ppc64le:TAG
$ make push ARCH=s390x
# ---> k8s.gcr.io/etcd-s390x:TAG
# ---> gcr.io/google_containers/etcd-s390x:TAG
```
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(
name = "hyperkube",
images = {"k8s.gcr.io/hyperkube-amd64:{STABLE_DOCKER_TAG}": "hyperkube-internal"},
images = {"gcr.io/google-containers/hyperkube-amd64:{STABLE_DOCKER_TAG}": "hyperkube-internal"},
stamp = True,
)

2
cluster/images/hyperkube/Dockerfile
View File

@@ -16,7 +16,7 @@ FROM BASEIMAGE
# 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
# used instead of k8s.gcr.io/kube-* without any modifications.
# used instead of gcr.io/google_containers/kube-* without any modifications.
# TODO: replace manual symlink creation with --make-symlink command once
# cross-building with qemu supports go binaries. See #28702
# RUN /hyperkube --make-symlinks

6
cluster/images/hyperkube/Makefile
View File

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

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

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

4
cluster/images/kubemark/Makefile
View File

@@ -15,8 +15,8 @@
# 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.
REGISTRY ?= gcr.io
PROJECT ?=
REGISTRY?=gcr.io
PROJECT?=google_containers
all: gcloudpush