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

Check errors, remove docker.io prefix used by crio

pull/6043/head
Thomas Stromberg 2019-12-10 14:28:40 -08:00
parent 661ebf843f
commit a1ddd283fe
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkg/minikube/bootstrapper/images/kubeadm_test.go
View File

@ -39,8 +39,8 @@ func TestKubeadmImages(t *testing.T) {
"k8s.gcr.io/pause:3.1",
"k8s.gcr.io/kube-addon-manager:v9.0.2",
"gcr.io/k8s-minikube/storage-provisioner:v1.8.1",
"docker.io/kubernetesui/dashboard:v2.0.0-beta8",
"docker.io/kubernetesui/metrics-scraper:v1.0.2",
"kubernetesui/dashboard:v2.0.0-beta8",
"kubernetesui/metrics-scraper:v1.0.2",
}},
{"v1.16.1", "mirror.k8s.io", []string{
"mirror.k8s.io/kube-proxy:v1.16.1",
@ -65,8 +65,8 @@ func TestKubeadmImages(t *testing.T) {
"k8s.gcr.io/pause:3.1",
"k8s.gcr.io/kube-addon-manager:v9.0.2",
"gcr.io/k8s-minikube/storage-provisioner:v1.8.1",
"docker.io/kubernetesui/dashboard:v2.0.0-beta8",
"docker.io/kubernetesui/metrics-scraper:v1.0.2",
"kubernetesui/dashboard:v2.0.0-beta8",
"kubernetesui/metrics-scraper:v1.0.2",
}},
{"v1.14.0", "", []string{
"k8s.gcr.io/kube-proxy:v1.14.0",
@ -78,8 +78,8 @@ func TestKubeadmImages(t *testing.T) {
"k8s.gcr.io/pause:3.1",
"k8s.gcr.io/kube-addon-manager:v9.0.2",
"gcr.io/k8s-minikube/storage-provisioner:v1.8.1",
"docker.io/kubernetesui/dashboard:v2.0.0-beta8",
"docker.io/kubernetesui/metrics-scraper:v1.0.2",
"kubernetesui/dashboard:v2.0.0-beta8",
"kubernetesui/metrics-scraper:v1.0.2",
}},
{"v1.13.0", "", []string{
"k8s.gcr.io/kube-proxy:v1.13.0",
@ -91,8 +91,8 @@ func TestKubeadmImages(t *testing.T) {
"k8s.gcr.io/pause:3.1",
"k8s.gcr.io/kube-addon-manager:v9.0.2",
"gcr.io/k8s-minikube/storage-provisioner:v1.8.1",
"docker.io/kubernetesui/dashboard:v2.0.0-beta8",
"docker.io/kubernetesui/metrics-scraper:v1.0.2",
"kubernetesui/dashboard:v2.0.0-beta8",
"kubernetesui/metrics-scraper:v1.0.2",
}},
{"v1.12.0", "", []string{
"k8s.gcr.io/kube-proxy:v1.12.0",
@ -104,8 +104,8 @@ func TestKubeadmImages(t *testing.T) {
"k8s.gcr.io/pause:3.1",
"k8s.gcr.io/kube-addon-manager:v9.0.2",
"gcr.io/k8s-minikube/storage-provisioner:v1.8.1",
"docker.io/kubernetesui/dashboard:v2.0.0-beta8",
"docker.io/kubernetesui/metrics-scraper:v1.0.2",
"kubernetesui/dashboard:v2.0.0-beta8",
"kubernetesui/metrics-scraper:v1.0.2",
}},
{"v1.11.10", "", []string{
"k8s.gcr.io/kube-proxy-amd64:v1.11.10",
@ -117,8 +117,8 @@ func TestKubeadmImages(t *testing.T) {
"k8s.gcr.io/pause:3.1",
"k8s.gcr.io/kube-addon-manager:v9.0.2",
"gcr.io/k8s-minikube/storage-provisioner:v1.8.1",
"docker.io/kubernetesui/dashboard:v2.0.0-beta8",
"docker.io/kubernetesui/metrics-scraper:v1.0.2",
"kubernetesui/dashboard:v2.0.0-beta8",
"kubernetesui/metrics-scraper:v1.0.2",
}},
}
for _, tc := range tests {

6
test/integration/start_stop_delete_test.go
View File

@ -156,12 +156,16 @@ func TestStartStop(t *testing.T) {
Tags []string `json:"repoTags"`
}{}
err = json.Unmarshal(rr.Stdout.Bytes(), &jv)
if err != nil {
t.Errorf("images unmarshal: %v", err)
}
gotImages := []string{}
for _, img := range jv["images"] {
for _, i := range img.Tags {
// Ignore non-Kubernetes images
if !strings.Contains(i, "ingress") && !strings.Contains(i, "busybox") {
gotImages = append(gotImages, i)
// Remove docker.io for naming consistency between container runtimes
gotImages = append(gotImages, strings.TrimPrefix(i, "docker.io/"))
}
}
}