Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

minikube start --image-repository will now accept URLs with port #11585

Merged
merged 6 commits into from
Jul 12, 2021
Merged

minikube start --image-repository will now accept URLs with port #11585

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
445684d
fix(start): minikube start with --image-repository: add new test for …
dmpe Jun 5, 2021
8badb78
smaller documentation fix
dmpe Jun 5, 2021
12f2d69
Merge remote-tracking branch 'upstream' into mytests
dmpe Jul 6, 2021
6ccc6e7
Merge branch 'master' into mytests
dmpe Jul 12, 2021
a60b337
fix an issue with hasPorts variable - further simplification
dmpe Jul 12, 2021
0c721cb
remove whitespace
dmpe Jul 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fix(start): minikube start with --image-repository: add new test for … 
…URLs with ports, fixing fix validation logic
  • Loading branch information
@dmpe
dmpe committed Jun 5, 2021
commit 445684d44d270c8f6bfd1c7e92bf72228cebf7e2
35 changes: 25 additions & 10 deletions cmd/minikube/cmd/start.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1263,26 +1263,41 @@ func validateRegistryMirror() {

// This function validates if the --image-repository
// args match the format of registry.cn-hangzhou.aliyuncs.com/google_containers
func validateImageRepository(imagRepo string) (vaildImageRepo string) {
// also "<hostname>[:<port>]"
func validateImageRepository(imageRepo string) (validImageRepo string) {

if strings.ToLower(imagRepo) == "auto" {
vaildImageRepo = "auto"
if strings.ToLower(imageRepo) == "auto" {
validImageRepo = "auto"
}
URL, err := url.Parse(imagRepo)
URL, err := url.Parse(imageRepo)

if err != nil {
klog.Errorln("Error Parsing URL: ", err)
}
// tips when imagRepo ended with a trailing /.
if strings.HasSuffix(imagRepo, "/") {

var hasPorts = false
var imageRepoPort string

if URL.Port() != "" && strings.Contains(imageRepo, ":"+URL.Port()) {
hasPorts = true
imageRepoPort = ":" + URL.Port()
}
// tips when imageRepo ended with a trailing /.
if strings.HasSuffix(imageRepo, "/") {
out.Infof("The --image-repository flag your provided ended with a trailing / that could cause conflict in kuberentes, removed automatically")
}
// tips when imageRepo started with scheme.
// tips when imageRepo started with scheme "http(s)".
if URL.Scheme != "" {
out.Infof("The --image-repository flag your provided contains Scheme: {{.scheme}}, it will be as a domian, removed automatically", out.V{"scheme": URL.Scheme})
out.Infof("The --image-repository flag your provided contains Scheme: {{.scheme}}, which will be removed automatically", out.V{"scheme": URL.Scheme})
}

if hasPorts {
validImageRepo = URL.Hostname() + imageRepoPort + strings.TrimSuffix(URL.Path, "/")
} else {
validImageRepo = URL.Hostname() + strings.TrimSuffix(URL.Path, "/")
dmpe marked this conversation as resolved.
Show resolved Hide resolved
}

vaildImageRepo = URL.Hostname() + strings.TrimSuffix(URL.Path, "/")
return
return validImageRepo
}

// This function validates if the --listen-address
Expand Down
24 changes: 14 additions & 10 deletions cmd/minikube/cmd/start_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,40 +320,44 @@ func TestBaseImageFlagDriverCombo(t *testing.T) {
func TestValidateImageRepository(t *testing.T) {
var tests = []struct {
imageRepository string
vaildImageRepository string
validImageRepository string
}{
{
imageRepository: "auto",
vaildImageRepository: "auto",
validImageRepository: "auto",
},
{
imageRepository: "http://registry.test.com/google_containers/",
vaildImageRepository: "registry.test.com/google_containers",
validImageRepository: "registry.test.com/google_containers",
},
{
imageRepository: "https://registry.test.com/google_containers/",
vaildImageRepository: "registry.test.com/google_containers",
validImageRepository: "registry.test.com/google_containers",
},
{
imageRepository: "registry.test.com/google_containers/",
vaildImageRepository: "registry.test.com/google_containers",
validImageRepository: "registry.test.com/google_containers",
},
{
imageRepository: "http://registry.test.com/google_containers",
vaildImageRepository: "registry.test.com/google_containers",
validImageRepository: "registry.test.com/google_containers",
},
{
imageRepository: "https://registry.test.com/google_containers",
vaildImageRepository: "registry.test.com/google_containers",
validImageRepository: "registry.test.com/google_containers",
},
{
imageRepository: "https://registry.test.com:6666/google_containers",
validImageRepository: "registry.test.com:6666/google_containers",
},
}

for _, test := range tests {
t.Run(test.imageRepository, func(t *testing.T) {
vaildImageRepository := validateImageRepository(test.imageRepository)
if vaildImageRepository != test.vaildImageRepository {
validImageRepository := validateImageRepository(test.imageRepository)
if validImageRepository != test.validImageRepository {
t.Errorf("validateImageRepository(imageRepo=%v): got %v, expected %v",
test.imageRepository, vaildImageRepository, test.vaildImageRepository)
test.imageRepository, validImageRepository, test.validImageRepository)
}
})
}
Expand Down