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

Run gofmt

This commit is contained in:
Christian Kampka 2018-07-06 10:58:27 +02:00
parent 4d87fb6a74
commit cbcd7d43c0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/assets/builder.go
View File

@ -22,6 +22,7 @@ import (
"net/url" "net/url"
"os" "os"
"path" "path"
"regexp"
"strings" "strings"
"github.com/blang/semver" "github.com/blang/semver"
@ -34,7 +35,6 @@ import (
"k8s.io/kops/pkg/values" "k8s.io/kops/pkg/values"
"k8s.io/kops/util/pkg/hashing" "k8s.io/kops/util/pkg/hashing"
"k8s.io/kops/util/pkg/vfs" "k8s.io/kops/util/pkg/vfs"
"regexp"
) )
// RewriteManifests controls whether we rewrite manifests // RewriteManifests controls whether we rewrite manifests
@ -153,7 +153,7 @@ func (a *AssetBuilder) RemapImage(image string) (string, error) {
// If the image name contains only a single / we need to determine if the image is located on docker-hub or if it's using a convenient URL like k8s.gcr.io/<image-name> // If the image name contains only a single / we need to determine if the image is located on docker-hub or if it's using a convenient URL like k8s.gcr.io/<image-name>
// In case of a hub image it should be sufficient to just prepend the proxy url, producing eg docker-proxy.example.com/weaveworks/weave-kube // In case of a hub image it should be sufficient to just prepend the proxy url, producing eg docker-proxy.example.com/weaveworks/weave-kube
if strings.Count(normalized, "/") == 1 && !strings.ContainsAny(strings.Split(normalized, "/")[0], ".:"){ if strings.Count(normalized, "/") == 1 && !strings.ContainsAny(strings.Split(normalized, "/")[0], ".:") {
normalized = containerProxy + "/" + normalized normalized = containerProxy + "/" + normalized
} else { } else {
var re = regexp.MustCompile(`^[^/]+`) var re = regexp.MustCompile(`^[^/]+`)