Skip to content

Commit c72a2df

Browse files
committed
images: add keycloak image and use it in the external OIDC tests
Signed-off-by: Bryce Palmer <[email protected]>
1 parent 755c0d2 commit c72a2df

File tree

3 files changed

+6
-1
lines changed

3 files changed

+6
-1
lines changed

test/extended/authentication/keycloak_helpers.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010
routev1 "github.com/openshift/api/route/v1"
1111
typedroutev1 "github.com/openshift/client-go/route/clientset/versioned/typed/route/v1"
1212
exutil "github.com/openshift/origin/test/extended/util"
13+
"github.com/openshift/origin/test/extended/util/image"
1314
appsv1 "k8s.io/api/apps/v1"
1415
corev1 "k8s.io/api/core/v1"
1516
apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -316,7 +317,7 @@ func keycloakContainers() []corev1.Container {
316317
return []corev1.Container{
317318
{
318319
Name: "keycloak",
319-
Image: keycloakImage,
320+
Image: image.LocationFor(keycloakImage),
320321
Env: keycloakEnvVars(),
321322
VolumeMounts: keycloakVolumeMounts(),
322323
Ports: []corev1.ContainerPort{

test/extended/util/image/image.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@ var (
5858

5959
// used by KubeVirt test to start fedora VMs
6060
"quay.io/kubevirt/fedora-with-test-tooling-container-disk:20241024_891122a6fc": -1,
61+
62+
// used by external OIDC tests to simulate an external IdP
63+
"quay.io/keycloak/keycloak:25.0": -1,
6164
}
6265
)
6366

test/extended/util/image/zz_generated.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# This file is generated by hack/update-generated.sh
22
docker.io/library/registry:2.8.0-beta.1 quay.io/openshift/community-e2e-images:e2e-docker-io-library-registry-2-8-0-beta-1-8x_YFKSuz9Xw6lZD
3+
quay.io/keycloak/keycloak:25.0 quay.io/openshift/community-e2e-images:e2e-quay-io-keycloak-keycloak-25-0-rEIw9B2Zcc3L1M6k
34
quay.io/kubevirt/fedora-with-test-tooling-container-disk:20241024_891122a6fc quay.io/openshift/community-e2e-images:e2e-quay-io-kubevirt-fedora-with-test-tooling-container-disk-20241024_891122a6fc-IycYTh-87XrXse4E
45
quay.io/openshifttest/ldap:1.2 quay.io/openshift/community-e2e-images:e2e-quay-io-openshifttest-ldap-1-2-O3f5zPgtmWzEtasv
56
quay.io/openshifttest/multicast:1.1 quay.io/openshift/community-e2e-images:e2e-quay-io-openshifttest-multicast-1-1-XSI8Fm3bAh556UCx

0 commit comments

Comments
 (0)