Skip to content

Commit 410000e

Browse files
committed
Support numbers in subdomains for image registry
1 parent 65b212b commit 410000e

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

cmd/minikube/cmd/start.go

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

16011601
if strings.ToLower(imageRepo) == "auto" {
16021602
imageRepo = "auto"

cmd/minikube/cmd/start_test.go

+16-1
Original file line numberDiff line numberDiff line change
@@ -384,6 +384,22 @@ func TestValidateImageRepository(t *testing.T) {
384384
imageRepository: "registry.test.com:6666/google_containers",
385385
validImageRepository: "registry.test.com:6666/google_containers",
386386
},
387+
{
388+
imageRepository: "registry.1test.com:6666/google_containers",
389+
validImageRepository: "registry.1test.com:6666/google_containers",
390+
},
391+
{
392+
imageRepository: "registry.t1est.com:6666/google_containers",
393+
validImageRepository: "registry.t1est.com:6666/google_containers",
394+
},
395+
{
396+
imageRepository: "registry.test1.com:6666/google_containers",
397+
validImageRepository: "registry.test1.com:6666/google_containers",
398+
},
399+
{
400+
imageRepository: "abc.xyz1.example.com",
401+
validImageRepository: "abc.xyz1.example.com",
402+
},
387403
}
388404

389405
for _, test := range tests {
@@ -395,7 +411,6 @@ func TestValidateImageRepository(t *testing.T) {
395411
}
396412
})
397413
}
398-
399414
}
400415

401416
func TestValidateDiskSize(t *testing.T) {

0 commit comments

Comments
 (0)