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

Fix containerRegistry for Kubernetes < 1.10

This commit is contained in:
Christian Kampka 2018-06-20 09:44:11 +02:00
parent 9a4c553fde
commit 921591343a
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/assets/builder.go
View File

@ -151,7 +151,11 @@ func (a *AssetBuilder) RemapImage(image string) (string, error) {
normalized := image normalized := image
// Remove the 'standard' kubernetes image prefix, just for sanity // Remove the 'standard' kubernetes image prefix, just for sanity
normalized = strings.TrimPrefix(normalized, "k8s.gcr.io/") if !util.IsKubernetesGTE("1.10", a.KubernetesVersion) && strings.HasPrefix(normalized, "gcr.io/google_containers/") {
normalized = strings.TrimPrefix(normalized, "gcr.io/google_containers/")
} else {
normalized = strings.TrimPrefix(normalized, "k8s.gcr.io/")
}
// We can't nest arbitrarily // We can't nest arbitrarily
// Some risk of collisions, but also -- and __ in the names appear to be blocked by docker hub // Some risk of collisions, but also -- and __ in the names appear to be blocked by docker hub