Removes netapp keyword in case of private image registry

NetApp · Aug 9, 2024 · e4d93bd · e4d93bd
1 parent c0d43e2
commit e4d93bd
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 25 deletions.
diff --git a/operator/controllers/orchestrator/installer/config.go b/operator/controllers/orchestrator/installer/config.go
@@ -11,7 +11,7 @@ import (
 var (
  DefaultTridentVersion = config.DefaultOrchestratorVersion
 
- DefaultTridentRepo = "netapp/trident:" // Default repo from where to pull Trident Image
+ DefaultTridentRepo = "trident:" // Default repo from where to pull Trident Image
 
  // TridentImage is the image that the operator installs by default
  TridentImage = DefaultTridentRepo + DefaultTridentVersion

diff --git a/utils/utils.go b/utils/utils.go
@@ -530,21 +530,17 @@ func RemoveStringFromSliceConditionally(slice []string, s string, fn func(string
  return
 }
 
-// SplitImageDomain accepts a container image name and splits off the domain portion, if any.
-func SplitImageDomain(name string) (domain, remainder string) {
- i := strings.IndexRune(name, '/')
- if i == -1 || (!strings.ContainsAny(name[:i], ".:") && name[:i] != "localhost") {
- domain, remainder = "", name
- } else {
- domain, remainder = name[:i], name[i+1:]
- }
- return
+// GetBaseImageName accepts a container image name and return just the base image.
+func GetBaseImageName(name string) string {
+ imageParts := strings.Split(name, "/")
+ remainder := imageParts[len(imageParts)-1]
+ return remainder
 }
 
-// ReplaceImageRegistry accepts a container image name and a registry name (FQDN[:port]) and
+// ReplaceImageRegistry accepts a container image name and a registry name (FQDN[:port]/[subdir]*) and
 // returns the same image name with the supplied registry.
 func ReplaceImageRegistry(image, registry string) string {
- _, remainder := SplitImageDomain(image)
+ remainder := GetBaseImageName(image)
  if registry == "" {
  return remainder
  }

diff --git a/utils/utils_test.go b/utils/utils_test.go
@@ -465,33 +465,36 @@ func TestSliceContainsStringConditionally(t *testing.T) {
  }
 }
 
-func TestSplitImageDomain(t *testing.T) {
+func TestGetBaseImageName(t *testing.T) {
  Log().Debug("Running TestSplitImageDomain...")
 
- domain, remainder := SplitImageDomain("netapp/trident:19.10.0")
- assert.Equal(t, "", domain)
- assert.Equal(t, "netapp/trident:19.10.0", remainder)
+ remainder := GetBaseImageName("netapp/trident:19.10.0")
+ assert.Equal(t, "trident:19.10.0", remainder)
 
- domain, remainder = SplitImageDomain("quay.io/k8scsi/csi-node-driver-registrar:v1.0.2")
- assert.Equal(t, "quay.io", domain)
- assert.Equal(t, "k8scsi/csi-node-driver-registrar:v1.0.2", remainder)
+ remainder = GetBaseImageName("")
+ assert.Equal(t, "", remainder)
 
- domain, remainder = SplitImageDomain("mydomain:5000/k8scsi/csi-node-driver-registrar:v1.0.2")
- assert.Equal(t, "mydomain:5000", domain)
- assert.Equal(t, "k8scsi/csi-node-driver-registrar:v1.0.2", remainder)
+ remainder = GetBaseImageName("trident:19.10.0")
+ assert.Equal(t, "trident:19.10.0", remainder)
+
+ remainder = GetBaseImageName("quay.io/k8scsi/csi-node-driver-registrar:v1.0.2")
+ assert.Equal(t, "csi-node-driver-registrar:v1.0.2", remainder)
+
+ remainder = GetBaseImageName("mydomain:5000/k8scsi/csi-node-driver-registrar:v1.0.2")
+ assert.Equal(t, "csi-node-driver-registrar:v1.0.2", remainder)
 }
 
 func TestReplaceImageRegistry(t *testing.T) {
  Log().Debug("Running ReplaceImageRegistry...")
 
  image := ReplaceImageRegistry("netapp/trident:19.10.0", "")
- assert.Equal(t, "netapp/trident:19.10.0", image)
+ assert.Equal(t, "trident:19.10.0", image)
 
  image = ReplaceImageRegistry("netapp/trident:19.10.0", "mydomain:5000")
- assert.Equal(t, "mydomain:5000/netapp/trident:19.10.0", image)
+ assert.Equal(t, "mydomain:5000/trident:19.10.0", image)
 
  image = ReplaceImageRegistry("quay.io/k8scsi/csi-node-driver-registrar:v1.0.2", "mydomain:5000")
- assert.Equal(t, "mydomain:5000/k8scsi/csi-node-driver-registrar:v1.0.2", image)
+ assert.Equal(t, "mydomain:5000/csi-node-driver-registrar:v1.0.2", image)
 }
 
 func TestFilterIPs(t *testing.T) {