Skip to content

Commit 6e66627

Browse files
committed
remove oidc test and fix oidc-opa test with tls disabled
1 parent ca61f92 commit 6e66627

21 files changed

Lines changed: 59 additions & 550 deletions

tests/templates/kuttl/oidc-opa/19_keycloak.yaml.j2

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,11 @@ spec:
6363
- name: keycloak
6464
image: quay.io/keycloak/keycloak:25.0.0
6565
args:
66-
- start
67-
- --hostname-strict=false
66+
- start-dev
6867
- --import-realm
6968
{% if test_scenario['values']['oidc-use-tls'] == 'true' %}
70-
- --https-key-store-file=/tls/keystore.p12
71-
- --https-key-store-password=changeit
69+
- --https-certificate-file=/tls/tls.crt
70+
- --https-certificate-key-file=/tls/tls.key
7271
{% endif %}
7372
env:
7473
- name: KEYCLOAK_ADMIN
@@ -81,15 +80,21 @@ spec:
8180
ports:
8281
- name: https
8382
containerPort: 8443
83+
readinessProbe:
84+
httpGet:
85+
scheme: HTTPS
86+
path: /realms/master
87+
port: https
8488
{% else %}
89+
ports:
8590
- name: http
8691
containerPort: 8080
87-
{% endif %}
8892
readinessProbe:
8993
httpGet:
90-
scheme: HTTPS
94+
scheme: HTTP
9195
path: /realms/master
92-
port: https
96+
port: http
97+
{% endif %}
9398
resources:
9499
limits:
95100
cpu: 1
@@ -117,9 +122,7 @@ spec:
117122
metadata:
118123
annotations:
119124
secrets.stackable.tech/class: keycloak-tls-$NAMESPACE
120-
secrets.stackable.tech/format: tls-pkcs12
121-
secrets.stackable.tech/format.compatibility.tls-pkcs12.password: changeit
122-
secrets.stackable.tech/scope: service=keycloak,node
125+
secrets.stackable.tech/scope: service=keycloak
123126
spec:
124127
storageClassName: secrets.stackable.tech
125128
accessModes:
@@ -139,8 +142,14 @@ metadata:
139142
app: keycloak
140143
spec:
141144
ports:
145+
{% if test_scenario['values']['oidc-use-tls'] == 'true' %}
142146
- name: https
143147
port: 8443
144148
targetPort: 8443
149+
{% else %}
150+
- name: http
151+
port: 8080
152+
targetPort: 8080
153+
{% endif %}
145154
selector:
146155
app: keycloak

tests/templates/kuttl/oidc-opa/41-install-test-container.yaml.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ spec:
7373
- name: NIFI_VERSION
7474
value: "{{ test_scenario['values']['nifi'] }}"
7575
- name: OIDC_USE_TLS
76-
value: "true"
76+
value: "{{ test_scenario['values']['oidc-use-tls'] }}"
7777
volumeMounts:
7878
- name: test-script
7979
mountPath: /tmp/test-script

tests/templates/kuttl/oidc/00-assert.yaml.j2

Lines changed: 0 additions & 10 deletions
This file was deleted.

tests/templates/kuttl/oidc/00-install-vector-aggregator-discovery-configmap.yaml.j2

Lines changed: 0 additions & 9 deletions
This file was deleted.

tests/templates/kuttl/oidc/00-patch-ns.yaml.j2

Lines changed: 0 additions & 9 deletions
This file was deleted.

tests/templates/kuttl/oidc/01-assert.yaml

Lines changed: 0 additions & 14 deletions
This file was deleted.

tests/templates/kuttl/oidc/01-install-keycloak.yaml

Lines changed: 0 additions & 15 deletions
This file was deleted.

tests/templates/kuttl/oidc/01_keycloak.yaml.j2

Lines changed: 0 additions & 159 deletions
This file was deleted.

tests/templates/kuttl/oidc/10-assert.yaml

Lines changed: 0 additions & 12 deletions
This file was deleted.

tests/templates/kuttl/oidc/10-install-zk.yaml.j2

Lines changed: 0 additions & 29 deletions
This file was deleted.

0 commit comments

Comments
 (0)