Skip to content

Commit

Permalink
Merge pull request #97 from fabiobrz/fix.enable-keycloak-test
Browse files Browse the repository at this point in the history 
[issue 67] - Fixing leftover from #94, i.e. enable the Keycloak Realm Import test
  • Loading branch information
@tommaso-borgato
tommaso-borgato authored Oct 13, 2023
2 parents 112f820 + c7f2a9b commit 6dc3b4a
Show file tree
Hide file tree
Showing 5 changed files with 162 additions and 42 deletions.
3 changes: 1 addition & 2 deletions global-test.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,8 @@ intersmash.activemq.operators.index_image=quay.io/jbossqe-eap/intersmash-activem
intersmash.activemq.operators.package_manifest=activemq-artemis-operator
intersmash.activemq.operators.channel=upstream

intersmash.keycloak.realm_import.image=quay.io/keycloak/keycloak:21.1.1
intersmash.keycloak.realm_import.image=quay.io/keycloak/keycloak:latest
intersmash.keycloak.realm_import.operators.catalog_source=community-operators
intersmash.keycloak.realm_import.operators.index_image=registry.redhat.io/redhat/community-operator-index:v4.12
intersmash.keycloak.realm_import.operators.channel=fast

intersmash.kafka.operators.channel=stable
Expand Down
2 changes: 0 additions & 2 deletions .../intersmash/testsuite/provision/openshift/KeycloakRealmImportOperatorProvisionerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.keycloak.k8s.v2alpha1.Keycloak;
import org.keycloak.k8s.v2alpha1.KeycloakRealmImport;
Expand Down Expand Up @@ -74,7 +73,6 @@
@Slf4j
@CleanBeforeAll
@NotForProductizedExecutionProfile
@Disabled("Need updated JOSDK, i.e. XTF supporting Fabric8 kubernetes-client v. 6")
public class KeycloakRealmImportOperatorProvisionerTest {
private static KeycloakRealmImportOperatorProvisioner KEYCLOAK_OPERATOR_PROVISIONER;

Expand Down
1 change: 0 additions & 1 deletion ...a/org/jboss/intersmash/testsuite/provision/openshift/WildflyHelmChartProvisionerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
public class WildflyHelmChartProvisionerTest {

@Test
//@Disabled("No artifacts on a Maven repo which is reachable by the Pod")
public void basicProvisioningTest() {
// initialize the application service descriptor
final WildflyHelmChartOpenShiftApplication application = new WildflyHelmChartOpenShiftExampleApplicaton();
Expand Down
86 changes: 64 additions & 22 deletions ...h-tools-provisioners/src/main/resources/crds/keycloakrealmimports.k8s.keycloak.org-v1.yml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# See https://raw.githubusercontent.com/keycloak/keycloak-k8s-resources/22.0.1/kubernetes/keycloakrealmimports.k8s.keycloak.org-v1.yml
# See https://raw.githubusercontent.com/keycloak/keycloak-k8s-resources/22.0.4/kubernetes/keycloakrealmimports.k8s.keycloak.org-v1.yml
# Generated by Fabric8 CRDGenerator, manual edits might get overwritten!
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
Expand Down Expand Up @@ -67,6 +67,32 @@ spec:
items:
type: string
type: array
userProfileMetadata:
properties:
attributes:
items:
properties:
annotations:
additionalProperties:
type: object
type: object
validators:
additionalProperties:
additionalProperties:
type: object
type: object
type: object
displayName:
type: string
readOnly:
type: boolean
name:
type: string
required:
type: boolean
type: object
type: array
type: object
createdTimestamp:
type: integer
emailVerified:
Expand Down Expand Up @@ -252,6 +278,32 @@ spec:
items:
type: string
type: array
userProfileMetadata:
properties:
attributes:
items:
properties:
annotations:
additionalProperties:
type: object
type: object
validators:
additionalProperties:
additionalProperties:
type: object
type: object
type: object
displayName:
type: string
readOnly:
type: boolean
name:
type: string
required:
type: boolean
type: object
type: array
type: object
createdTimestamp:
type: integer
emailVerified:
Expand Down Expand Up @@ -548,7 +600,6 @@ spec:
id:
type: string
clientPolicies:
type: object
x-kubernetes-preserve-unknown-fields: true
webAuthnPolicyUserVerificationRequirement:
type: string
Expand Down Expand Up @@ -704,16 +755,14 @@ spec:
type: array
decisionStrategy:
enum:
- AFFIRMATIVE
- stableIndex
- CONSENSUS
- UNANIMOUS
- AFFIRMATIVE
type: string
name:
type: string
policyEnforcementMode:
enum:
- stableIndex
- PERMISSIVE
- ENFORCING
- DISABLED
Expand Down Expand Up @@ -752,14 +801,12 @@ spec:
type: array
decisionStrategy:
enum:
- AFFIRMATIVE
- stableIndex
- CONSENSUS
- UNANIMOUS
- AFFIRMATIVE
type: string
logic:
enum:
- stableIndex
- POSITIVE
- NEGATIVE
type: string
Expand Down Expand Up @@ -942,7 +989,6 @@ spec:
otpPolicyCodeReusable:
type: boolean
clientProfiles:
type: object
x-kubernetes-preserve-unknown-fields: true
userFederationMappers:
items:
Expand Down Expand Up @@ -1564,16 +1610,14 @@ spec:
type: array
decisionStrategy:
enum:
- AFFIRMATIVE
- stableIndex
- CONSENSUS
- UNANIMOUS
- AFFIRMATIVE
type: string
name:
type: string
policyEnforcementMode:
enum:
- stableIndex
- PERMISSIVE
- ENFORCING
- DISABLED
Expand Down Expand Up @@ -1612,14 +1656,12 @@ spec:
type: array
decisionStrategy:
enum:
- AFFIRMATIVE
- stableIndex
- CONSENSUS
- UNANIMOUS
- AFFIRMATIVE
type: string
logic:
enum:
- stableIndex
- POSITIVE
- NEGATIVE
type: string
Expand Down Expand Up @@ -1940,16 +1982,14 @@ spec:
type: array
decisionStrategy:
enum:
- AFFIRMATIVE
- stableIndex
- CONSENSUS
- UNANIMOUS
- AFFIRMATIVE
type: string
name:
type: string
policyEnforcementMode:
enum:
- stableIndex
- PERMISSIVE
- ENFORCING
- DISABLED
Expand Down Expand Up @@ -1988,14 +2028,12 @@ spec:
type: array
decisionStrategy:
enum:
- AFFIRMATIVE
- stableIndex
- CONSENSUS
- UNANIMOUS
- AFFIRMATIVE
type: string
logic:
enum:
- stableIndex
- POSITIVE
- NEGATIVE
type: string
Expand Down Expand Up @@ -2233,8 +2271,12 @@ spec:
conditions:
items:
properties:
lastTransitionTime:
type: string
status:
type: boolean
x-kubernetes-preserve-unknown-fields: true
observedGeneration:
type: integer
type:
type: string
message:
Expand Down
Loading

0 comments on commit 6dc3b4a

Please sign in to comment.