Remove registryFQDN

Signed-off-by: Tamal Saha <[email protected]>
kmodules · Oct 31, 2023 · 20003b3 · 20003b3
1 parent 136a623
commit 20003b3
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 61 deletions.
diff --git a/apis/core/v1alpha1/openapi_generated.go b/apis/core/v1alpha1/openapi_generated.go
diff --git a/apis/management/v1alpha1/openapi_generated.go b/apis/management/v1alpha1/openapi_generated.go
diff --git a/apis/meta/v1alpha1/openapi_generated.go b/apis/meta/v1alpha1/openapi_generated.go
diff --git a/apis/shared/helm.go b/apis/shared/helm.go
@@ -28,8 +28,6 @@ type BootstrapPresets struct {
 }
 
 type ImageRegistrySpec struct {
-	//+optional
-	RegistryFQDN string `json:"registryFQDN"`
 	//+optional
 	Proxies RegistryProxies `json:"proxies"`
 }

diff --git a/apis/shared/helpers.go b/apis/shared/helpers.go
@@ -95,9 +95,6 @@ func (r ResourceLocator) GraphQuery(oid kmapi.OID) (string, map[string]interface
 
 func (r ImageRegistrySpec) DockerHubProxy() string {
 	addr := r.Proxies.DockerHub
-	if addr == "" {
-		addr = r.RegistryFQDN
-	}
 	addr = strings.TrimSpace(addr)
 	addr = strings.TrimSuffix(addr, "/")
 	return addr
@@ -108,49 +105,34 @@ func (r ImageRegistrySpec) DockerLibraryProxy() string {
 	if addr == "" {
 		addr = r.Proxies.DockerHub
 	}
-	if addr == "" {
-		addr = r.RegistryFQDN
-	}
 	addr = strings.TrimSpace(addr)
 	addr = strings.TrimSuffix(addr, "/")
 	return addr
 }
 
 func (r ImageRegistrySpec) GHCRProxy() string {
 	addr := r.Proxies.GHCR
-	if addr == "" {
-		addr = r.RegistryFQDN
-	}
 	addr = strings.TrimSpace(addr)
 	addr = strings.TrimSuffix(addr, "/")
 	return addr
 }
 
 func (r ImageRegistrySpec) QuayProxy() string {
 	addr := r.Proxies.Quay
-	if addr == "" {
-		addr = r.RegistryFQDN
-	}
 	addr = strings.TrimSpace(addr)
 	addr = strings.TrimSuffix(addr, "/")
 	return addr
 }
 
 func (r ImageRegistrySpec) KubernetesRegistryProxy() string {
 	addr := r.Proxies.Kubernetes
-	if addr == "" {
-		addr = r.RegistryFQDN
-	}
 	addr = strings.TrimSpace(addr)
 	addr = strings.TrimSuffix(addr, "/")
 	return addr
 }
 
 func (r ImageRegistrySpec) AppsCodeRegistryProxy() string {
 	addr := r.Proxies.AppsCode
-	if addr == "" {
-		addr = r.RegistryFQDN
-	}
 	addr = strings.TrimSpace(addr)
 	addr = strings.TrimSuffix(addr, "/")
 	return addr
@@ -159,10 +141,6 @@ func (r ImageRegistrySpec) AppsCodeRegistryProxy() string {
 const defaultTag = "latest"
 
 func NewRef(spec ImageRegistrySpec, img string) (string, error) {
-	if spec.RegistryFQDN == "" {
-		return img, nil
-	}
-
 	ref, err := name.ParseReference(img)
 	if err != nil {
 		return "", err
@@ -174,9 +152,19 @@ func NewRef(spec ImageRegistrySpec, img string) (string, error) {
 		var result string
 		_, bin, found := strings.Cut(ref.Repository, "library/")
 		if found {
-			result = spec.DockerLibraryProxy() + "/" + bin
+			addr := spec.DockerLibraryProxy()
+			if addr != "" {
+				result = addr + "/" + bin
+			} else {
+				result = bin
+			}
 		} else {
-			result = spec.DockerHubProxy() + "/" + ref.Repository
+			addr := spec.DockerHubProxy()
+			if addr != "" {
+				result = addr + "/" + ref.Repository
+			} else {
+				addr = ref.Repository
+			}
 		}
 		if ref.Tag != "" && ref.Tag != defaultTag {
 			result += ":" + ref.Tag

diff --git a/apis/shared/openapi_generated.go b/apis/shared/openapi_generated.go
diff --git a/apis/ui/v1alpha1/openapi_generated.go b/apis/ui/v1alpha1/openapi_generated.go