Merge pull request #289 from ShazaAldawamneh/ibihim-fix-tests

OCPBUGS-44319: Fix oauth-proxy e2e-component tests

Author: openshift-merge-bot[bot]

test/e2e/proxy_test.go

@@ -40,6 +40,7 @@ func TestOAuthProxyE2E(t *testing.T) {
 	routeClient, err := routeclient.NewForConfig(testConfig)
 	require.NoError(t, err)
 	userClient, err := userclient.NewForConfig(testConfig)
+	require.NoError(t, err)
 	ns := CreateTestProject(t, kubeClient, projectClient)
 	defer func() {
 		if len(os.Getenv("DEBUG_TEST")) > 0 {
@@ -186,19 +187,11 @@ func TestOAuthProxyE2E(t *testing.T) {
 		// 	expectedErr: "did not reach upstream site",
 		// },
 	}
-
-	// Get the image from a pod that we know uses oauth-proxy to wrap
-	// its endpoints with OpenShift auth
-	// TODO: is there a better way?
-	alertmanagerPod, err := kubeClient.CoreV1().Pods("openshift-monitoring").Get(testCtx, "alertmanager-main-0", metav1.GetOptions{})
-	require.NoError(t, err)
-	var image string
-	for _, c := range alertmanagerPod.Spec.Containers {
-		if c.Name == "alertmanager-proxy" {
-			image = c.Image
-		}
-	}
-	require.NotEmpty(t, image)
+	registry := strings.Split(os.Getenv("RELEASE_IMAGE_LATEST"), "/")[0]
+	require.NotEmpty(t, registry, "Registry is empty. Check RELEASE_IMAGE_LATEST environment variable.")
+	namespace := os.Getenv("NAMESPACE")
+	require.NotEmpty(t, namespace, "Namespace is empty. Check NAMESPACE environment variable.")
+	image := registry + "/" + namespace + "/pipeline:oauth-proxy"
 
 	// get rid of kubeadmin user to remove the additional step of choosing an idp
 	err = kubeClient.CoreV1().Secrets("kube-system").Delete(context.TODO(), "kubeadmin", metav1.DeleteOptions{})