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

Support numbers in subdomains for image registry

pull/17496/head
Chase, Justin M 2024-03-18 08:41:20 -05:00
parent 65b212b94a
commit 410000eaca
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/minikube/cmd/start.go
View File

@ -1596,7 +1596,7 @@ func validateRegistryMirror() {
// args match the format of registry.cn-hangzhou.aliyuncs.com/google_containers
// also "<hostname>[:<port>]"
func validateImageRepository(imageRepo string) (validImageRepo string) {
expression := regexp.MustCompile(`^(?:(\w+)\:\/\/)?([-a-zA-Z0-9]{1,}(?:\.[-a-zA-Z]{1,}){0,})(?:\:(\d+))?(\/.*)?$`)
expression := regexp.MustCompile(`^(?:(\w+)\:\/\/)?([-a-zA-Z0-9]{1,}(?:\.[-a-zA-Z0-9]{1,}){0,})(?:\:(\d+))?(\/.*)?$`)
if strings.ToLower(imageRepo) == "auto" {
imageRepo = "auto"

17
cmd/minikube/cmd/start_test.go
View File

@ -384,6 +384,22 @@ func TestValidateImageRepository(t *testing.T) {
imageRepository: "registry.test.com:6666/google_containers",
validImageRepository: "registry.test.com:6666/google_containers",
},
{
imageRepository: "registry.1test.com:6666/google_containers",
validImageRepository: "registry.1test.com:6666/google_containers",
},
{
imageRepository: "registry.t1est.com:6666/google_containers",
validImageRepository: "registry.t1est.com:6666/google_containers",
},
{
imageRepository: "registry.test1.com:6666/google_containers",
validImageRepository: "registry.test1.com:6666/google_containers",
},
{
imageRepository: "abc.xyz1.example.com",
validImageRepository: "abc.xyz1.example.com",
},
}
for _, test := range tests {
@ -395,7 +411,6 @@ func TestValidateImageRepository(t *testing.T) {
}
})
}
}
func TestValidateDiskSize(t *testing.T) {