Compare commits

..

No commits in common. "6ba509dbe18c97c75cdecef64969d8153c0fd8a5" and "89f4b0dbdfa1b40f0a0fc04da4b67fa09835574c" have entirely different histories.

17 changed files with 26 additions and 30 deletions

View File

@ -2,7 +2,7 @@
apiVersion: batch/v1 apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: portal-onboarding-e2e-test-14 name: portal-onboarding-e2e-test-13
namespace: bstein-dev-home namespace: bstein-dev-home
spec: spec:
backoffLimit: 0 backoffLimit: 0

View File

@ -67,9 +67,9 @@ spec:
- -c - -c
- | - |
set -euo pipefail set -euo pipefail
CLIENT_ID="$(tr -d '\r\n' </vault/secrets/gitea-oidc__client_id)" CLIENT_ID="$(cat /vault/secrets/gitea-oidc__client_id)"
CLIENT_SECRET="$(tr -d '\r\n' </vault/secrets/gitea-oidc__client_secret)" CLIENT_SECRET="$(cat /vault/secrets/gitea-oidc__client_secret)"
DISCOVERY_URL="$(tr -d '\r\n' </vault/secrets/gitea-oidc__openid_auto_discovery_url)" DISCOVERY_URL="$(cat /vault/secrets/gitea-oidc__openid_auto_discovery_url)"
APPINI=/data/gitea/conf/app.ini APPINI=/data/gitea/conf/app.ini
BIN=/usr/local/bin/gitea BIN=/usr/local/bin/gitea
@ -78,7 +78,7 @@ spec:
if [ -n "$id" ]; then if [ -n "$id" ]; then
echo "Updating existing auth source id=$id" echo "Updating existing auth source id=$id"
if ! $BIN -c "$APPINI" admin auth update-oauth \ $BIN -c "$APPINI" admin auth update-oauth \
--id "$id" \ --id "$id" \
--name keycloak \ --name keycloak \
--provider openidConnect \ --provider openidConnect \
@ -90,12 +90,10 @@ spec:
--required-claim-value "" \ --required-claim-value "" \
--group-claim-name groups \ --group-claim-name groups \
--admin-group admin \ --admin-group admin \
--skip-local-2fa; then --skip-local-2fa
echo "OIDC update failed; continuing without blocking startup" >&2
fi
else else
echo "Creating keycloak auth source" echo "Creating keycloak auth source"
if ! $BIN -c "$APPINI" admin auth add-oauth \ $BIN -c "$APPINI" admin auth add-oauth \
--name keycloak \ --name keycloak \
--provider openidConnect \ --provider openidConnect \
--key "$CLIENT_ID" \ --key "$CLIENT_ID" \
@ -106,9 +104,7 @@ spec:
--required-claim-value "" \ --required-claim-value "" \
--group-claim-name groups \ --group-claim-name groups \
--admin-group admin \ --admin-group admin \
--skip-local-2fa; then --skip-local-2fa
echo "OIDC create failed; continuing without blocking startup" >&2
fi
fi fi
volumeMounts: volumeMounts:
- name: gitea-data - name: gitea-data
@ -137,9 +133,9 @@ spec:
args: args:
- | - |
set -euo pipefail set -euo pipefail
export GITEA__security__SECRET_KEY="$(tr -d '\r\n' </vault/secrets/gitea-secret__SECRET_KEY)" export GITEA__security__SECRET_KEY="$(cat /vault/secrets/gitea-secret__SECRET_KEY)"
export GITEA__security__INTERNAL_TOKEN="$(tr -d '\r\n' </vault/secrets/gitea-secret__INTERNAL_TOKEN)" export GITEA__security__INTERNAL_TOKEN="$(cat /vault/secrets/gitea-secret__INTERNAL_TOKEN)"
export DB_PASS="$(tr -d '\r\n' </vault/secrets/gitea-db-secret__password)" export DB_PASS="$(cat /vault/secrets/gitea-db-secret__password)"
exec /usr/bin/entrypoint /usr/bin/s6-svscan /etc/s6 exec /usr/bin/entrypoint /usr/bin/s6-svscan /etc/s6
ports: ports:
- containerPort: 3000 - containerPort: 3000

View File

@ -2,7 +2,7 @@
apiVersion: batch/v1 apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: endurain-oidc-secret-ensure-2 name: endurain-oidc-secret-ensure-1
namespace: sso namespace: sso
spec: spec:
backoffLimit: 0 backoffLimit: 0

View File

@ -2,7 +2,7 @@
apiVersion: batch/v1 apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: harbor-oidc-secret-ensure-6 name: harbor-oidc-secret-ensure-5
namespace: sso namespace: sso
spec: spec:
backoffLimit: 0 backoffLimit: 0

View File

@ -2,7 +2,7 @@
apiVersion: batch/v1 apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: keycloak-ldap-federation-8 name: keycloak-ldap-federation-7
namespace: sso namespace: sso
spec: spec:
backoffLimit: 2 backoffLimit: 2

View File

@ -2,7 +2,7 @@
apiVersion: batch/v1 apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: logs-oidc-secret-ensure-5 name: logs-oidc-secret-ensure-4
namespace: sso namespace: sso
spec: spec:
backoffLimit: 0 backoffLimit: 0

View File

@ -10,7 +10,7 @@ imagePullSecrets:
apiVersion: batch/v1 apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: mas-secrets-ensure-17 name: mas-secrets-ensure-16
namespace: sso namespace: sso
spec: spec:
backoffLimit: 0 backoffLimit: 0

View File

@ -2,7 +2,7 @@
apiVersion: batch/v1 apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: keycloak-portal-e2e-client-5 name: keycloak-portal-e2e-client-4
namespace: sso namespace: sso
spec: spec:
backoffLimit: 0 backoffLimit: 0

View File

@ -2,7 +2,7 @@
apiVersion: batch/v1 apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: keycloak-portal-e2e-execute-actions-email-8 name: keycloak-portal-e2e-execute-actions-email-7
namespace: sso namespace: sso
spec: spec:
backoffLimit: 3 backoffLimit: 3

View File

@ -2,7 +2,7 @@
apiVersion: batch/v1 apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: keycloak-portal-e2e-target-4 name: keycloak-portal-e2e-target-3
namespace: sso namespace: sso
spec: spec:
backoffLimit: 0 backoffLimit: 0

View File

@ -2,7 +2,7 @@
apiVersion: batch/v1 apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: keycloak-portal-e2e-token-exchange-permissions-8 name: keycloak-portal-e2e-token-exchange-permissions-7
namespace: sso namespace: sso
spec: spec:
backoffLimit: 6 backoffLimit: 6

View File

@ -2,7 +2,7 @@
apiVersion: batch/v1 apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: keycloak-portal-e2e-token-exchange-test-4 name: keycloak-portal-e2e-token-exchange-test-3
namespace: sso namespace: sso
spec: spec:
backoffLimit: 6 backoffLimit: 6

View File

@ -2,7 +2,7 @@
apiVersion: batch/v1 apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: keycloak-realm-settings-20 name: keycloak-realm-settings-19
namespace: sso namespace: sso
spec: spec:
backoffLimit: 0 backoffLimit: 0

View File

@ -2,7 +2,7 @@
apiVersion: batch/v1 apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: sparkyfitness-oidc-secret-ensure-2 name: sparkyfitness-oidc-secret-ensure-1
namespace: sso namespace: sso
spec: spec:
backoffLimit: 0 backoffLimit: 0

View File

@ -2,7 +2,7 @@
apiVersion: batch/v1 apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: synapse-oidc-secret-ensure-7 name: synapse-oidc-secret-ensure-6
namespace: sso namespace: sso
spec: spec:
backoffLimit: 0 backoffLimit: 0

View File

@ -2,7 +2,7 @@
apiVersion: batch/v1 apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: keycloak-user-overrides-4 name: keycloak-user-overrides-3
namespace: sso namespace: sso
spec: spec:
backoffLimit: 0 backoffLimit: 0

View File

@ -2,7 +2,7 @@
apiVersion: batch/v1 apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: vault-oidc-secret-ensure-4 name: vault-oidc-secret-ensure-3
namespace: sso namespace: sso
spec: spec:
backoffLimit: 0 backoffLimit: 0