Skip to content

OCPBUGS-42251: Fix oauth-proxy e2e-component tests #285

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 2, 2024
Merged

OCPBUGS-42251: Fix oauth-proxy e2e-component tests #285

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 4 additions & 12 deletions test/e2e/proxy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -187,18 +188,9 @@ func TestOAuthProxyE2E(t *testing.T) {
// },
}

// 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)
image := registry + "/" + os.Getenv("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{})
Expand Down