mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-10-22 15:09:39 +00:00
Revert k8s.gcr.io vanity domain
This reverts commit eba5b6092a
.
Fixes https://github.com/kubernetes/kubernetes/issues/57526
This commit is contained in:
@@ -15,7 +15,7 @@ spec:
|
||||
spec:
|
||||
containers:
|
||||
- name: dns-backend
|
||||
image: k8s.gcr.io/example-dns-backend:v1
|
||||
image: gcr.io/google_containers/example-dns-backend:v1
|
||||
ports:
|
||||
- name: backend-port
|
||||
containerPort: 8000
|
||||
|
@@ -7,7 +7,7 @@ metadata:
|
||||
spec:
|
||||
containers:
|
||||
- name: dns-frontend
|
||||
image: k8s.gcr.io/example-dns-frontend:v1
|
||||
image: gcr.io/google_containers/example-dns-frontend:v1
|
||||
command:
|
||||
- python
|
||||
- client.py
|
||||
|
@@ -13,7 +13,7 @@
|
||||
# limitations under the License.
|
||||
|
||||
TAG = v1
|
||||
PREFIX = k8s.gcr.io
|
||||
PREFIX = gcr.io/google_containers
|
||||
IMAGE = example-dns-backend
|
||||
|
||||
all: push
|
||||
|
@@ -13,7 +13,7 @@
|
||||
# limitations under the License.
|
||||
|
||||
TAG = v1
|
||||
PREFIX = k8s.gcr.io
|
||||
PREFIX = gcr.io/google_containers
|
||||
IMAGE = example-dns-frontend
|
||||
|
||||
all: push
|
||||
|
@@ -21,10 +21,10 @@ explorer: explorer.go
|
||||
CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-w' ./explorer.go
|
||||
|
||||
container: explorer
|
||||
docker build --pull -t k8s.gcr.io/explorer:$(TAG) .
|
||||
docker build --pull -t gcr.io/google_containers/explorer:$(TAG) .
|
||||
|
||||
push: container
|
||||
gcloud docker -- push k8s.gcr.io/explorer:$(TAG)
|
||||
gcloud docker -- push gcr.io/google_containers/explorer:$(TAG)
|
||||
|
||||
clean:
|
||||
rm -f explorer
|
||||
|
@@ -5,7 +5,7 @@ metadata:
|
||||
spec:
|
||||
containers:
|
||||
- name: explorer
|
||||
image: k8s.gcr.io/explorer:1.0
|
||||
image: gcr.io/google_containers/explorer:1.0
|
||||
args: ["-port=8080"]
|
||||
ports:
|
||||
- containerPort: 8080
|
||||
|
@@ -15,9 +15,9 @@
|
||||
# Build the guestbook-go example
|
||||
|
||||
# Usage:
|
||||
# [VERSION=v3] [REGISTRY="k8s.gcr.io"] make build
|
||||
# [VERSION=v3] [REGISTRY="gcr.io/google_containers"] make build
|
||||
VERSION?=v3
|
||||
REGISTRY?=k8s.gcr.io
|
||||
REGISTRY?=gcr.io/google_containers
|
||||
|
||||
release: clean build push clean
|
||||
|
||||
|
@@ -22,7 +22,7 @@
|
||||
"containers":[
|
||||
{
|
||||
"name":"guestbook",
|
||||
"image":"k8s.gcr.io/guestbook:v3",
|
||||
"image":"gcr.io/google_containers/guestbook:v3",
|
||||
"ports":[
|
||||
{
|
||||
"name":"http-server",
|
||||
|
@@ -30,7 +30,7 @@ spec:
|
||||
spec:
|
||||
containers:
|
||||
- name: master
|
||||
image: k8s.gcr.io/redis:e2e # or just image: redis
|
||||
image: gcr.io/google_containers/redis:e2e # or just image: redis
|
||||
resources:
|
||||
requests:
|
||||
cpu: 100m
|
||||
|
@@ -17,7 +17,7 @@ spec:
|
||||
spec:
|
||||
containers:
|
||||
- name: master
|
||||
image: k8s.gcr.io/redis:e2e # or just image: redis
|
||||
image: gcr.io/google_containers/redis:e2e # or just image: redis
|
||||
resources:
|
||||
requests:
|
||||
cpu: 100m
|
||||
|
@@ -13,7 +13,7 @@ spec:
|
||||
spec:
|
||||
containers:
|
||||
- name: master
|
||||
image: k8s.gcr.io/redis:e2e # or just image: redis
|
||||
image: gcr.io/google_containers/redis:e2e # or just image: redis
|
||||
resources:
|
||||
requests:
|
||||
cpu: 100m
|
||||
|
@@ -37,11 +37,11 @@ tag: .tag
|
||||
|
||||
container:
|
||||
$(if $(TAG),,$(error TAG is not defined. Use 'make tag' to see a suggestion))
|
||||
docker build --pull -t k8s.gcr.io/kubectl:$(TAG) .
|
||||
docker build --pull -t gcr.io/google_containers/kubectl:$(TAG) .
|
||||
|
||||
push: container
|
||||
$(if $(TAG),,$(error TAG is not defined. Use 'make tag' to see a suggestion))
|
||||
gcloud docker -- push k8s.gcr.io/kubectl:$(TAG)
|
||||
gcloud docker -- push gcr.io/google_containers/kubectl:$(TAG)
|
||||
|
||||
clean:
|
||||
rm -f kubectl
|
||||
|
@@ -8,7 +8,7 @@
|
||||
"containers": [
|
||||
{
|
||||
"name": "bb",
|
||||
"image": "k8s.gcr.io/busybox",
|
||||
"image": "gcr.io/google_containers/busybox",
|
||||
"command": [
|
||||
"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",
|
||||
"image": "k8s.gcr.io/kubectl:v0.18.0-120-gaeb4ac55ad12b1-dirty",
|
||||
"image": "gcr.io/google_containers/kubectl:v0.18.0-120-gaeb4ac55ad12b1-dirty",
|
||||
"imagePullPolicy": "Always",
|
||||
"args": [
|
||||
"proxy", "-p", "8001"
|
||||
|
@@ -16,7 +16,7 @@ spec:
|
||||
spec:
|
||||
containers:
|
||||
- name: spark-master
|
||||
image: k8s.gcr.io/spark:1.5.2_v1
|
||||
image: gcr.io/google_containers/spark:1.5.2_v1
|
||||
command: ["/start-master"]
|
||||
ports:
|
||||
- containerPort: 7077
|
||||
|
@@ -17,7 +17,7 @@ spec:
|
||||
spec:
|
||||
containers:
|
||||
- name: spark-worker
|
||||
image: k8s.gcr.io/spark:1.5.2_v1
|
||||
image: gcr.io/google_containers/spark:1.5.2_v1
|
||||
command: ["/start-worker"]
|
||||
ports:
|
||||
- containerPort: 8888
|
||||
|
@@ -13,7 +13,7 @@ spec:
|
||||
spec:
|
||||
containers:
|
||||
- name: spark-master
|
||||
image: k8s.gcr.io/spark:1.5.2_v1
|
||||
image: gcr.io/google_containers/spark:1.5.2_v1
|
||||
command: ["/start-master"]
|
||||
ports:
|
||||
- containerPort: 7077
|
||||
|
@@ -13,7 +13,7 @@ spec:
|
||||
spec:
|
||||
containers:
|
||||
- name: spark-worker
|
||||
image: k8s.gcr.io/spark:1.5.2_v1
|
||||
image: gcr.io/google_containers/spark:1.5.2_v1
|
||||
command: ["/start-worker"]
|
||||
ports:
|
||||
- containerPort: 8081
|
||||
|
@@ -13,7 +13,7 @@ spec:
|
||||
spec:
|
||||
containers:
|
||||
- name: zeppelin
|
||||
image: k8s.gcr.io/zeppelin:v0.5.6_v1
|
||||
image: gcr.io/google_containers/zeppelin:v0.5.6_v1
|
||||
ports:
|
||||
- containerPort: 8080
|
||||
resources:
|
||||
|
@@ -12,7 +12,7 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
FROM k8s.gcr.io/ubuntu-slim:0.9
|
||||
FROM gcr.io/google_containers/ubuntu-slim:0.9
|
||||
|
||||
ARG BUILD_DATE
|
||||
ARG VCS_REF
|
||||
|
@@ -13,7 +13,7 @@ spec:
|
||||
spec:
|
||||
containers:
|
||||
- name: redis
|
||||
image: k8s.gcr.io/redis:v1
|
||||
image: gcr.io/google_containers/redis:v1
|
||||
ports:
|
||||
- containerPort: 6379
|
||||
resources:
|
||||
|
@@ -9,7 +9,7 @@ metadata:
|
||||
spec:
|
||||
containers:
|
||||
- name: master
|
||||
image: k8s.gcr.io/redis:v1
|
||||
image: gcr.io/google_containers/redis:v1
|
||||
env:
|
||||
- name: MASTER
|
||||
value: "true"
|
||||
|
@@ -15,7 +15,7 @@ spec:
|
||||
spec:
|
||||
containers:
|
||||
- name: sentinel
|
||||
image: k8s.gcr.io/redis:v1
|
||||
image: gcr.io/google_containers/redis:v1
|
||||
env:
|
||||
- name: SENTINEL
|
||||
value: "true"
|
||||
|
@@ -7,7 +7,7 @@ metadata:
|
||||
name: rethinkdb-admin
|
||||
spec:
|
||||
containers:
|
||||
- image: k8s.gcr.io/rethinkdb:1.16.0_1
|
||||
- image: gcr.io/google_containers/rethinkdb:1.16.0_1
|
||||
name: rethinkdb
|
||||
env:
|
||||
- name: POD_NAMESPACE
|
||||
|
@@ -16,7 +16,7 @@ spec:
|
||||
role: replicas
|
||||
spec:
|
||||
containers:
|
||||
- image: k8s.gcr.io/rethinkdb:1.16.0_1
|
||||
- image: gcr.io/google_containers/rethinkdb:1.16.0_1
|
||||
name: rethinkdb
|
||||
env:
|
||||
- name: POD_NAMESPACE
|
||||
|
@@ -4,7 +4,7 @@ metadata:
|
||||
name: test-portworx-volume-pod
|
||||
spec:
|
||||
containers:
|
||||
- image: k8s.gcr.io/test-webserver
|
||||
- image: gcr.io/google_containers/test-webserver
|
||||
name: test-container
|
||||
volumeMounts:
|
||||
- mountPath: /test-portworx-volume
|
||||
|
@@ -5,7 +5,7 @@ metadata:
|
||||
spec:
|
||||
containers:
|
||||
- name: test-container
|
||||
image: k8s.gcr.io/test-webserver
|
||||
image: gcr.io/google_containers/test-webserver
|
||||
volumeMounts:
|
||||
- name: test-volume
|
||||
mountPath: /test-portworx-volume
|
||||
|
@@ -5,7 +5,7 @@ metadata:
|
||||
spec:
|
||||
containers:
|
||||
- name: test-container
|
||||
image: k8s.gcr.io/test-webserver
|
||||
image: gcr.io/google_containers/test-webserver
|
||||
volumeMounts:
|
||||
- name: test-volume
|
||||
mountPath: /test-portworx-volume
|
||||
|
@@ -5,7 +5,7 @@ metadata:
|
||||
spec:
|
||||
containers:
|
||||
- name: pod-sio-small-container
|
||||
image: k8s.gcr.io/test-webserver
|
||||
image: gcr.io/google_containers/test-webserver
|
||||
volumeMounts:
|
||||
- mountPath: /test
|
||||
name: test-data
|
||||
|
@@ -4,7 +4,7 @@ metadata:
|
||||
name: pod-0
|
||||
spec:
|
||||
containers:
|
||||
- image: k8s.gcr.io/test-webserver
|
||||
- image: gcr.io/google_containers/test-webserver
|
||||
name: pod-0
|
||||
volumeMounts:
|
||||
- mountPath: /test-pd
|
||||
|
@@ -27,7 +27,7 @@ spec:
|
||||
spec:
|
||||
containers:
|
||||
- name: nginx
|
||||
image: k8s.gcr.io/nginx-slim:0.8
|
||||
image: gcr.io/google_containers/nginx-slim:0.8
|
||||
ports:
|
||||
- containerPort: 80
|
||||
name: web
|
||||
|
@@ -4,7 +4,7 @@ metadata:
|
||||
name: test-vmdk
|
||||
spec:
|
||||
containers:
|
||||
- image: k8s.gcr.io/test-webserver
|
||||
- image: gcr.io/google_containers/test-webserver
|
||||
name: test-container
|
||||
volumeMounts:
|
||||
- mountPath: /test-vmdk
|
||||
|
@@ -5,7 +5,7 @@ metadata:
|
||||
spec:
|
||||
containers:
|
||||
- name: test-container
|
||||
image: k8s.gcr.io/test-webserver
|
||||
image: gcr.io/google_containers/test-webserver
|
||||
volumeMounts:
|
||||
- name: test-volume
|
||||
mountPath: /test-vmdk
|
||||
|
@@ -5,7 +5,7 @@ metadata:
|
||||
spec:
|
||||
containers:
|
||||
- name: test-container
|
||||
image: k8s.gcr.io/test-webserver
|
||||
image: gcr.io/google_containers/test-webserver
|
||||
volumeMounts:
|
||||
- name: test-volume
|
||||
mountPath: /test-vmdk
|
||||
|
Reference in New Issue
Block a user