From 410000eacae8aaa8b7ffc99176a32cf2ae8d72cf Mon Sep 17 00:00:00 2001 From: "Chase, Justin M" Date: Mon, 18 Mar 2024 08:41:20 -0500 Subject: [PATCH] Support numbers in subdomains for image registry --- cmd/minikube/cmd/start.go | 2 +- cmd/minikube/cmd/start_test.go | 17 ++++++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go index 1d186623c0..add01e1555 100644 --- a/cmd/minikube/cmd/start.go +++ b/cmd/minikube/cmd/start.go @@ -1596,7 +1596,7 @@ func validateRegistryMirror() { // args match the format of registry.cn-hangzhou.aliyuncs.com/google_containers // also "[:]" 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" diff --git a/cmd/minikube/cmd/start_test.go b/cmd/minikube/cmd/start_test.go index 7f11deaeff..6a5b799c30 100644 --- a/cmd/minikube/cmd/start_test.go +++ b/cmd/minikube/cmd/start_test.go @@ -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) {