Update tests for v1.20

Author: E2E Test Bot

test/openshift/e2e/ginkgo/parallel/1-121_validate_image_updater_test.go

@@ -86,8 +86,6 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 			output, err := osFixture.ExecCommand("oc", "auth", "can-i", "use", "scc/anyuid", "--as", serviceAccountUser)
 			hasPermission := false
 			if err == nil && len(output) > 0 {
-				// Check if the service account user is already in the users list
-				// Remove quotes and whitespace for comparison
 				output = strings.TrimSpace(strings.Trim(output, "'\""))
 				if strings.Contains(output, serviceAccountUser) {
 					hasPermission = true
@@ -146,6 +144,12 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 						RepoURL:        "https://github.com/argoproj-labs/argocd-image-updater/",
 						Path:           "test/e2e/testdata/005-public-guestbook",
 						TargetRevision: "HEAD",
+						// multi-arch image 
+						Kustomize: &appv1alpha1.ApplicationSourceKustomize{
+							Images: appv1alpha1.KustomizeImages{
+								"quay.io/dkarpele/my-guestbook=quay.io/prometheus/node-exporter:v1.6.0",
+							},
+						},
 					},
 					Destination: appv1alpha1.ApplicationDestination{
 						Server:    "https://kubernetes.default.svc",
@@ -175,8 +179,9 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 							NamePattern: "app*",
 							Images: []imageUpdaterApi.ImageConfig{
 								{
-									Alias:     "guestbook",
-									ImageName: "quay.io/dkarpele/my-guestbook:~29437546.0",
+									Alias: "guestbook",
+									// Watch for the v1.7.x bumps
+									ImageName: "quay.io/prometheus/node-exporter:~v1.7.0",
 									CommonUpdateSettings: &imageUpdaterApi.CommonUpdateSettings{
 										UpdateStrategy: &updateStrategy,
 									},
@@ -188,7 +193,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 			}
 			Expect(k8sClient.Create(ctx, imageUpdater)).To(Succeed())
 
-			By("ensuring that the Application image has `29437546.0` version after update")
+			By("ensuring that the Application image has been updated by Image Updater")
 			Eventually(func() string {
 				err := k8sClient.Get(ctx, client.ObjectKeyFromObject(app), app)
 
@@ -197,17 +202,19 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 					return "" // Let Eventually retry on error
 				}
 
-				// Nil-safe check: The Kustomize block is only added by the Image Updater after its first run.
-				// We must check that it and its Images field exist before trying to access them.
 				if app.Spec.Source.Kustomize != nil && len(app.Spec.Source.Kustomize.Images) > 0 {
-					imageStr := string(app.Spec.Source.Kustomize.Images[0])
-					GinkgoWriter.Printf("Found Kustomize image: %s\n", imageStr)
+					// Join all images to handle any appending behaviors
+					var allImages []string
+					for _, img := range app.Spec.Source.Kustomize.Images {
+						allImages = append(allImages, string(img))
+					}
+					imageStr := strings.Join(allImages, ", ")
+					GinkgoWriter.Printf("Found Kustomize image string: %s\n", imageStr)
 					return imageStr
 				}
 
-				// Return an empty string to signify the condition is not yet met.
 				return ""
-			}, "10m", "10s").Should(Equal("quay.io/dkarpele/my-guestbook:29437546.0"), "Image Updater did not update the Application image within timeout")
+			}, "10m", "10s").Should(ContainSubstring("v1.7."), "Image Updater did not update the Application image within timeout")
 		})
 	})
 })

test/openshift/e2e/ginkgo/sequential/1-051_validate_argocd_agent_principal_test.go

@@ -355,7 +355,14 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 
 			container := deploymentFixture.GetTemplateSpecContainerByName(argoCDAgentPrincipalName, *principalDeployment)
 			Expect(container).ToNot(BeNil())
-			Expect(container.Image).To(Equal(common.ArgoCDAgentPrincipalDefaultImageName))
+
+			if fixture.RunningOnOpenShift() {
+				// downstream
+				Expect(container.Image).To(ContainSubstring("argocd-agent-rhel9"))
+			} else {
+				// Upstream
+				Expect(container.Image).To(Equal(common.ArgoCDAgentPrincipalDefaultImageName))
+			}
 
 			By("Create required secrets and certificates for principal pod to start properly")
 
@@ -405,7 +412,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 
 			By("Create ArgoCD instance")
 
-			argoCD.Spec.ArgoCDAgent.Principal.Image = "quay.io/argoprojlabs/argocd-agent:v0.5.0"
+			argoCD.Spec.ArgoCDAgent.Principal.Image = "quay.io/argoprojlabs/argocd-agent:v0.5.1"
 			Expect(k8sClient.Create(ctx, argoCD)).To(Succeed())
 
 			By("Verify expected resources are created for principal pod")
@@ -416,7 +423,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 
 			container := deploymentFixture.GetTemplateSpecContainerByName(argoCDAgentPrincipalName, *principalDeployment)
 			Expect(container).ToNot(BeNil())
-			Expect(container.Image).To(Equal("quay.io/argoprojlabs/argocd-agent:v0.5.0"))
+			Expect(container.Image).To(Equal("quay.io/argoprojlabs/argocd-agent:v0.5.1"))
 
 			By("Verify environment variables are set correctly")
 
@@ -435,7 +442,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 				ac.Spec.ArgoCDAgent.Principal.LogFormat = "json"
 				ac.Spec.ArgoCDAgent.Principal.Server.KeepAliveMinInterval = "60s"
 				ac.Spec.ArgoCDAgent.Principal.Server.EnableWebSocket = ptr.To(true)
-				ac.Spec.ArgoCDAgent.Principal.Image = "quay.io/argoprojlabs/argocd-agent:v0.5.1"
+				ac.Spec.ArgoCDAgent.Principal.Image = "quay.io/argoprojlabs/argocd-agent:v0.6.0"
 
 				ac.Spec.ArgoCDAgent.Principal.Namespace.AllowedNamespaces = []string{"agent-managed", "agent-autonomous"}
 				ac.Spec.ArgoCDAgent.Principal.Namespace.EnableNamespaceCreate = ptr.To(true)
@@ -482,7 +489,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 					if container == nil {
 						return false
 					}
-					return container.Image == "quay.io/argoprojlabs/argocd-agent:v0.5.1"
+					return container.Image == "quay.io/argoprojlabs/argocd-agent:v0.6.0"
 				}, "120s", "5s").Should(BeTrue(), "Principal deployment should have the updated image")
 
 			By("verify that deployment is in Ready state")

test/openshift/e2e/ginkgo/sequential/1-052_validate_argocd_agent_agent_test.go

@@ -338,7 +338,14 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 
 			container := deploymentFixture.GetTemplateSpecContainerByName(argoCDAgentAgentName, *agentDeployment)
 			Expect(container).ToNot(BeNil())
-			Expect(container.Image).To(Equal(common.ArgoCDAgentAgentDefaultImageName))
+
+			if fixture.RunningOnOpenShift() {
+				// downstream
+				Expect(container.Image).To(ContainSubstring("argocd-agent-rhel9"))
+			} else {
+				// Upstream
+				Expect(container.Image).To(Equal("quay.io/argoprojlabs/argocd-agent:v0.7.0"))
+			}
 
 			By("Verify environment variables are set correctly")
 
@@ -372,7 +379,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 
 			By("Create ArgoCD instance")
 
-			argoCD.Spec.ArgoCDAgent.Agent.Image = "quay.io/argoprojlabs/argocd-agent:v0.5.0"
+			argoCD.Spec.ArgoCDAgent.Agent.Image = "quay.io/argoprojlabs/argocd-agent:v0.5.1"
 			Expect(k8sClient.Create(ctx, argoCD)).To(Succeed())
 
 			By("Verify expected resources are created for agent pod")
@@ -383,7 +390,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 
 			container := deploymentFixture.GetTemplateSpecContainerByName(argoCDAgentAgentName, *agentDeployment)
 			Expect(container).ToNot(BeNil())
-			Expect(container.Image).To(Equal("quay.io/argoprojlabs/argocd-agent:v0.5.0"))
+			Expect(container.Image).To(Equal("quay.io/argoprojlabs/argocd-agent:v0.5.1"))
 
 			By("Verify environment variables are set correctly")
 
@@ -400,7 +407,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 
 				ac.Spec.ArgoCDAgent.Agent.LogLevel = "trace"
 				ac.Spec.ArgoCDAgent.Agent.LogFormat = "json"
-				ac.Spec.ArgoCDAgent.Agent.Image = "quay.io/argoprojlabs/argocd-agent:v0.5.1"
+				ac.Spec.ArgoCDAgent.Agent.Image = "quay.io/argoprojlabs/argocd-agent:v0.6.0"
 
 				ac.Spec.ArgoCDAgent.Agent.Client.KeepAliveInterval = "60s"
 				ac.Spec.ArgoCDAgent.Agent.Client.EnableWebSocket = ptr.To(true)
@@ -430,7 +437,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 					if container == nil {
 						return false
 					}
-					return container.Image == "quay.io/argoprojlabs/argocd-agent:v0.5.1"
+					return container.Image == "quay.io/argoprojlabs/argocd-agent:v0.6.0"
 				}, "120s", "5s").Should(BeTrue(), "Agent deployment should have the updated image")
 
 			By("Verify environment variables are updated correctly")