kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Convert registry to k8s.gcr.io

pull/2356/head
Tim Hockin 2017-12-22 09:55:16 -08:00
parent 5661ba0b5e
commit 51ee9a1423
8 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -23,7 +23,7 @@ BUILDROOT_BRANCH ?= 2017.11
REGISTRY?=gcr.io/k8s-minikube
HYPERKIT_BUILD_IMAGE ?= karalabe/xgo-1.8.3
BUILD_IMAGE ?= gcr.io/google_containers/kube-cross:v1.9.1-1
BUILD_IMAGE ?= k8s.gcr.io/kube-cross:v1.9.1-1
ISO_BUILD_IMAGE ?= $(REGISTRY)/buildroot-image
ISO_VERSION ?= v0.24.0

2
README.md
View File

@ -110,7 +110,7 @@ Connecting to cluster...
Setting up kubeconfig...
Kubectl is now configured to use the cluster.
$ kubectl run hello-minikube --image=gcr.io/google_containers/echoserver:1.4 --port=8080
$ kubectl run hello-minikube --image=k8s.gcr.io/echoserver:1.4 --port=8080
deployment "hello-minikube" created
$ kubectl expose deployment hello-minikube --type=NodePort
service "hello-minikube" exposed

2
deploy/addons/dashboard/dashboard-rc.yaml
View File

@ -36,7 +36,7 @@ spec:
spec:
containers:
- name: kubernetes-dashboard
image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.8.1
image: k8s.gcr.io/kubernetes-dashboard-amd64:v1.8.1
imagePullPolicy: IfNotPresent
ports:
- containerPort: 9090

2
deploy/addons/heapster/heapster-rc.yaml
View File

@ -34,7 +34,7 @@ spec:
spec:
containers:
- name: heapster
image: gcr.io/google_containers/heapster-amd64:v1.5.0
image: k8s.gcr.io/heapster-amd64:v1.5.0
imagePullPolicy: IfNotPresent
command:
- /heapster

4
deploy/addons/heapster/influx-grafana-rc.yaml
View File

@ -34,7 +34,7 @@ spec:
spec:
containers:
- name: influxdb
image: gcr.io/google_containers/heapster-influxdb-amd64:v1.3.3
image: k8s.gcr.io/heapster-influxdb-amd64:v1.3.3
imagePullPolicy: IfNotPresent
ports:
- name: http
@ -45,7 +45,7 @@ spec:
- mountPath: /data
name: influxdb-storage
- name: grafana
image: gcr.io/google_containers/heapster-grafana-amd64:v4.4.3
image: k8s.gcr.io/heapster-grafana-amd64:v4.4.3
imagePullPolicy: IfNotPresent
env:
- name: INFLUXDB_SERVICE_URL

2
deploy/addons/ingress/ingress-rc.yaml
View File

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

6
deploy/addons/kube-dns/kube-dns-controller.yaml
View File

@ -44,7 +44,7 @@ spec:
optional: true
containers:
- name: kubedns
image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.5
image: k8s.gcr.io/k8s-dns-kube-dns-amd64:1.14.5
imagePullPolicy: IfNotPresent
resources:
# TODO: Set memory limits when we've profiled the container for large
@ -96,7 +96,7 @@ spec:
- name: kube-dns-config
mountPath: /kube-dns-config
- name: dnsmasq
image: gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.5
image: k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64:1.14.5
imagePullPolicy: IfNotPresent
livenessProbe:
httpGet:
@ -135,7 +135,7 @@ spec:
- name: kube-dns-config
mountPath: /etc/k8s/dns/dnsmasq-nanny
- name: sidecar
image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.5
image: k8s.gcr.io/k8s-dns-sidecar-amd64:1.14.5
imagePullPolicy: IfNotPresent
livenessProbe:
httpGet:

30
pkg/minikube/constants/constants.go
View File

@ -168,18 +168,18 @@ const FileScheme = "file"
var LocalkubeCachedImages = []string{
// Dashboard
"gcr.io/google_containers/kubernetes-dashboard-amd64:v1.6.3",
"k8s.gcr.io/kubernetes-dashboard-amd64:v1.6.3",
// DNS
"gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.5",
"gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.5",
"gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.5",
"k8s.gcr.io/k8s-dns-kube-dns-amd64:1.14.5",
"k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64:1.14.5",
"k8s.gcr.io/k8s-dns-sidecar-amd64:1.14.5",
// Addon Manager
"gcr.io/google-containers/kube-addon-manager:v6.4-beta.2",
// Pause
"gcr.io/google_containers/pause-amd64:3.0",
"k8s.gcr.io/pause-amd64:3.0",
//Storage Provisioner
"gcr.io/k8s-minikube/storage-provisioner:v1.8.0",
@ -188,26 +188,26 @@ var LocalkubeCachedImages = []string{
func GetKubeadmCachedImages(version string) []string {
return []string{
// Dashboard
"gcr.io/google_containers/kubernetes-dashboard-amd64:v1.6.3",
"k8s.gcr.io/kubernetes-dashboard-amd64:v1.6.3",
// Addon Manager
"gcr.io/google-containers/kube-addon-manager:v6.4-beta.2",
// Pause
"gcr.io/google_containers/pause-amd64:3.0",
"k8s.gcr.io/pause-amd64:3.0",
// DNS
"gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.4",
"gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.4",
"gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.4",
"k8s.gcr.io/k8s-dns-kube-dns-amd64:1.14.4",
"k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64:1.14.4",
"k8s.gcr.io/k8s-dns-sidecar-amd64:1.14.4",
// etcd
"gcr.io/google_containers/etcd-amd64:3.0.17",
"k8s.gcr.io/etcd-amd64:3.0.17",
"gcr.io/google_containers/kube-proxy-amd64:" + version,
"gcr.io/google_containers/kube-scheduler-amd64:" + version,
"gcr.io/google_containers/kube-controller-manager-amd64:" + version,
"gcr.io/google_containers/kube-apiserver-amd64:" + version,
"k8s.gcr.io/kube-proxy-amd64:" + version,
"k8s.gcr.io/kube-scheduler-amd64:" + version,
"k8s.gcr.io/kube-controller-manager-amd64:" + version,
"k8s.gcr.io/kube-apiserver-amd64:" + version,
//Storage Provisioner
"gcr.io/k8s-minikube/storage-provisioner:v1.8.0",