Convert registry to k8s.gcr.io
parent
5661ba0b5e
commit
51ee9a1423
2
Makefile
2
Makefile
|
@ -23,7 +23,7 @@ BUILDROOT_BRANCH ?= 2017.11
|
||||||
REGISTRY?=gcr.io/k8s-minikube
|
REGISTRY?=gcr.io/k8s-minikube
|
||||||
|
|
||||||
HYPERKIT_BUILD_IMAGE ?= karalabe/xgo-1.8.3
|
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_BUILD_IMAGE ?= $(REGISTRY)/buildroot-image
|
||||||
|
|
||||||
ISO_VERSION ?= v0.24.0
|
ISO_VERSION ?= v0.24.0
|
||||||
|
|
|
@ -110,7 +110,7 @@ Connecting to cluster...
|
||||||
Setting up kubeconfig...
|
Setting up kubeconfig...
|
||||||
Kubectl is now configured to use the cluster.
|
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
|
deployment "hello-minikube" created
|
||||||
$ kubectl expose deployment hello-minikube --type=NodePort
|
$ kubectl expose deployment hello-minikube --type=NodePort
|
||||||
service "hello-minikube" exposed
|
service "hello-minikube" exposed
|
||||||
|
|
|
@ -36,7 +36,7 @@ spec:
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: kubernetes-dashboard
|
- 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
|
imagePullPolicy: IfNotPresent
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 9090
|
- containerPort: 9090
|
||||||
|
|
|
@ -34,7 +34,7 @@ spec:
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: heapster
|
- name: heapster
|
||||||
image: gcr.io/google_containers/heapster-amd64:v1.5.0
|
image: k8s.gcr.io/heapster-amd64:v1.5.0
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
command:
|
command:
|
||||||
- /heapster
|
- /heapster
|
||||||
|
|
|
@ -34,7 +34,7 @@ spec:
|
||||||
spec:
|
spec:
|
||||||
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
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
ports:
|
ports:
|
||||||
- name: http
|
- name: http
|
||||||
|
@ -45,7 +45,7 @@ spec:
|
||||||
- mountPath: /data
|
- mountPath: /data
|
||||||
name: influxdb-storage
|
name: influxdb-storage
|
||||||
- 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
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
env:
|
env:
|
||||||
- name: INFLUXDB_SERVICE_URL
|
- name: INFLUXDB_SERVICE_URL
|
||||||
|
|
|
@ -36,7 +36,7 @@ spec:
|
||||||
# Any image is permissable as long as:
|
# Any image is permissable 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
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
httpGet:
|
httpGet:
|
||||||
|
|
|
@ -44,7 +44,7 @@ spec:
|
||||||
optional: true
|
optional: true
|
||||||
containers:
|
containers:
|
||||||
- name: kubedns
|
- 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
|
imagePullPolicy: IfNotPresent
|
||||||
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
|
||||||
|
@ -96,7 +96,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.5
|
image: k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64:1.14.5
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
httpGet:
|
httpGet:
|
||||||
|
@ -135,7 +135,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.5
|
image: k8s.gcr.io/k8s-dns-sidecar-amd64:1.14.5
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
httpGet:
|
httpGet:
|
||||||
|
|
|
@ -168,18 +168,18 @@ const FileScheme = "file"
|
||||||
|
|
||||||
var LocalkubeCachedImages = []string{
|
var LocalkubeCachedImages = []string{
|
||||||
// Dashboard
|
// Dashboard
|
||||||
"gcr.io/google_containers/kubernetes-dashboard-amd64:v1.6.3",
|
"k8s.gcr.io/kubernetes-dashboard-amd64:v1.6.3",
|
||||||
|
|
||||||
// DNS
|
// DNS
|
||||||
"gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.5",
|
"k8s.gcr.io/k8s-dns-kube-dns-amd64:1.14.5",
|
||||||
"gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.5",
|
"k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64:1.14.5",
|
||||||
"gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.5",
|
"k8s.gcr.io/k8s-dns-sidecar-amd64:1.14.5",
|
||||||
|
|
||||||
// Addon Manager
|
// Addon Manager
|
||||||
"gcr.io/google-containers/kube-addon-manager:v6.4-beta.2",
|
"gcr.io/google-containers/kube-addon-manager:v6.4-beta.2",
|
||||||
|
|
||||||
// Pause
|
// Pause
|
||||||
"gcr.io/google_containers/pause-amd64:3.0",
|
"k8s.gcr.io/pause-amd64:3.0",
|
||||||
|
|
||||||
//Storage Provisioner
|
//Storage Provisioner
|
||||||
"gcr.io/k8s-minikube/storage-provisioner:v1.8.0",
|
"gcr.io/k8s-minikube/storage-provisioner:v1.8.0",
|
||||||
|
@ -188,26 +188,26 @@ var LocalkubeCachedImages = []string{
|
||||||
func GetKubeadmCachedImages(version string) []string {
|
func GetKubeadmCachedImages(version string) []string {
|
||||||
return []string{
|
return []string{
|
||||||
// Dashboard
|
// Dashboard
|
||||||
"gcr.io/google_containers/kubernetes-dashboard-amd64:v1.6.3",
|
"k8s.gcr.io/kubernetes-dashboard-amd64:v1.6.3",
|
||||||
|
|
||||||
// Addon Manager
|
// Addon Manager
|
||||||
"gcr.io/google-containers/kube-addon-manager:v6.4-beta.2",
|
"gcr.io/google-containers/kube-addon-manager:v6.4-beta.2",
|
||||||
|
|
||||||
// Pause
|
// Pause
|
||||||
"gcr.io/google_containers/pause-amd64:3.0",
|
"k8s.gcr.io/pause-amd64:3.0",
|
||||||
|
|
||||||
// DNS
|
// DNS
|
||||||
"gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.4",
|
"k8s.gcr.io/k8s-dns-kube-dns-amd64:1.14.4",
|
||||||
"gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.4",
|
"k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64:1.14.4",
|
||||||
"gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.4",
|
"k8s.gcr.io/k8s-dns-sidecar-amd64:1.14.4",
|
||||||
|
|
||||||
// etcd
|
// 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,
|
"k8s.gcr.io/kube-proxy-amd64:" + version,
|
||||||
"gcr.io/google_containers/kube-scheduler-amd64:" + version,
|
"k8s.gcr.io/kube-scheduler-amd64:" + version,
|
||||||
"gcr.io/google_containers/kube-controller-manager-amd64:" + version,
|
"k8s.gcr.io/kube-controller-manager-amd64:" + version,
|
||||||
"gcr.io/google_containers/kube-apiserver-amd64:" + version,
|
"k8s.gcr.io/kube-apiserver-amd64:" + version,
|
||||||
|
|
||||||
//Storage Provisioner
|
//Storage Provisioner
|
||||||
"gcr.io/k8s-minikube/storage-provisioner:v1.8.0",
|
"gcr.io/k8s-minikube/storage-provisioner:v1.8.0",
|
||||||
|
|
Loading…
Reference in New Issue