diff --git a/apis/management.cattle.io/v3/k8s_defaults.go b/apis/management.cattle.io/v3/k8s_defaults.go index cde6f265..4bb0609f 100644 --- a/apis/management.cattle.io/v3/k8s_defaults.go +++ b/apis/management.cattle.io/v3/k8s_defaults.go @@ -773,7 +773,7 @@ var ( Ingress: m("rancher/nginx-ingress-controller:0.16.2-rancher1"), IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.3.1"), - CoreDNS: m("coredns/coredns:1.2.2"), + CoreDNS: "coredns/coredns:1.2.2", CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0"), }, "v1.12.1-rancher1-1": { @@ -801,7 +801,7 @@ var ( Ingress: m("rancher/nginx-ingress-controller:0.16.2-rancher1"), IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.3.1"), - CoreDNS: m("coredns/coredns:1.2.2"), + CoreDNS: "coredns/coredns:1.2.2", CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0"), }, "v1.12.3-rancher1-1": { @@ -829,7 +829,7 @@ var ( Ingress: m("rancher/nginx-ingress-controller:0.16.2-rancher1"), IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.3.1"), - CoreDNS: m("coredns/coredns:1.2.2"), + CoreDNS: "coredns/coredns:1.2.2", CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0"), }, "v1.12.4-rancher1-1": { @@ -857,7 +857,7 @@ var ( Ingress: m("rancher/nginx-ingress-controller:0.16.2-rancher1"), IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.3.1"), - CoreDNS: m("coredns/coredns:1.2.2"), + CoreDNS: "coredns/coredns:1.2.2", CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0"), }, "v1.12.5-rancher1-2": { @@ -885,7 +885,7 @@ var ( Ingress: m("rancher/nginx-ingress-controller:0.21.0-rancher1"), IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.3.1"), - CoreDNS: m("coredns/coredns:1.2.2"), + CoreDNS: "coredns/coredns:1.2.2", CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0"), }, "v1.12.6-rancher1-2": { @@ -913,7 +913,7 @@ var ( Ingress: m("rancher/nginx-ingress-controller:0.21.0-rancher3"), IngressBackend: m("k8s.gcr.io/defaultbackend:1.4-rancher1"), MetricsServer: m("gcr.io/google_containers/metrics-server:v0.3.1"), - CoreDNS: m("coredns/coredns:1.2.2"), + CoreDNS: "coredns/coredns:1.2.2", CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.0.0"), }, "v1.12.7-rancher1-2": { @@ -941,7 +941,7 @@ var ( Ingress: m("rancher/nginx-ingress-controller:0.21.0-rancher3"), IngressBackend: m("k8s.gcr.io/defaultbackend:1.4-rancher1"), MetricsServer: m("gcr.io/google_containers/metrics-server:v0.3.1"), - CoreDNS: m("coredns/coredns:1.2.2"), + CoreDNS: "coredns/coredns:1.2.2", CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.0.0"), }, // Enabled in Rancher v2.2.3 @@ -998,7 +998,7 @@ var ( Ingress: m("rancher/nginx-ingress-controller:0.21.0-rancher1"), IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.3.1"), - CoreDNS: m("coredns/coredns:1.2.6"), + CoreDNS: "coredns/coredns:1.2.6", CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0"), }, "v1.13.4-rancher1-2": { @@ -1026,7 +1026,7 @@ var ( Ingress: m("rancher/nginx-ingress-controller:0.21.0-rancher3"), IngressBackend: m("k8s.gcr.io/defaultbackend:1.4-rancher1"), MetricsServer: m("gcr.io/google_containers/metrics-server:v0.3.1"), - CoreDNS: m("coredns/coredns:1.2.6"), + CoreDNS: "coredns/coredns:1.2.6", CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.0.0"), }, "v1.13.5-rancher1-2": { @@ -1054,7 +1054,7 @@ var ( Ingress: m("rancher/nginx-ingress-controller:0.21.0-rancher3"), IngressBackend: m("k8s.gcr.io/defaultbackend:1.4-rancher1"), MetricsServer: m("gcr.io/google_containers/metrics-server:v0.3.1"), - CoreDNS: m("coredns/coredns:1.2.6"), + CoreDNS: "coredns/coredns:1.2.6", CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.0.0"), }, // Enabled in Rancher v2.2.3 @@ -1112,7 +1112,7 @@ var ( Ingress: m("rancher/nginx-ingress-controller:0.21.0-rancher3"), IngressBackend: m("k8s.gcr.io/defaultbackend:1.5-rancher1"), MetricsServer: m("gcr.io/google_containers/metrics-server:v0.3.1"), - CoreDNS: m("coredns/coredns:1.3.1"), + CoreDNS: "coredns/coredns:1.3.1", CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.3.0"), }, // k8s version from 2.1.x release with old rke-tools to allow upgrade from 2.1.x clusters diff --git a/image/mirror.go b/image/mirror.go index 811e76e0..7bab3097 100644 --- a/image/mirror.go +++ b/image/mirror.go @@ -21,6 +21,7 @@ func Mirror(image string) string { image = strings.Replace(image, "prom/", "rancher/prom-", 1) image = strings.Replace(image, "quay.io/pires", "rancher", 1) image = strings.Replace(image, "coredns/", "rancher/coredns-", 1) + image = strings.Replace(image, "minio/", "rancher/minio-", 1) Mirrors[image] = orig return image