Merge pull request #893 from lukas8219/issue-858

fix(imageupdateautomation_controller.go): fixed tag parsing logic misinterpreting [host:port] registry url

Author: matheuscscp

internal/controller/imageupdateautomation_controller.go

@@ -557,18 +557,26 @@ func getPolicies(ctx context.Context, kclient client.Client, namespace string, s
 func observedPolicies(policies []imagev1_reflect.ImagePolicy) (imagev1.ObservedPolicies, error) {
 	observedPolicies := imagev1.ObservedPolicies{}
 	for _, policy := range policies {
-		parts := strings.SplitN(policy.Status.LatestImage, ":", 2)
-		if len(parts) != 2 {
+		name, tag := splitByLastColon(policy.Status.LatestImage)
+		if name == "" || tag == "" {
 			return nil, fmt.Errorf("failed parsing image: %s", policy.Status.LatestImage)
 		}
 		observedPolicies[policy.Name] = imagev1.ImageRef{
-			Name: parts[0],
-			Tag:  parts[1],
+			Name: name,
+			Tag:  tag,
 		}
 	}
 	return observedPolicies, nil
 }
 
+func splitByLastColon(latestImage string) (string, string) {
+	idx := strings.LastIndex(latestImage, ":")
+	if idx == -1 {
+		return latestImage, ""
+	}
+	return latestImage[:idx], latestImage[idx+1:]
+}
+
 // observedPoliciesChanged returns if the previous and current observedPolicies
 // have changed.
 func observedPoliciesChanged(previous, current imagev1.ObservedPolicies) bool {

internal/controller/update_test.go

@@ -1568,13 +1568,13 @@ func Test_observedPolicies(t *testing.T) {
 				"p1": "aaa:bbb",
 				"p2": "ccc:ddd",
 				"p3": "eee:latest",
-				"p4": "fff:ggg:hhh",
+				"p4": "registry.localhost:5000/sample-web:0.1.0",
 			},
 			want: imagev1.ObservedPolicies{
 				"p1": imagev1.ImageRef{Name: "aaa", Tag: "bbb"},
 				"p2": imagev1.ImageRef{Name: "ccc", Tag: "ddd"},
 				"p3": imagev1.ImageRef{Name: "eee", Tag: "latest"},
-				"p4": imagev1.ImageRef{Name: "fff", Tag: "ggg:hhh"},
+				"p4": imagev1.ImageRef{Name: "registry.localhost:5000/sample-web", Tag: "0.1.0"},
 			},
 		},
 		{