Skip to content
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

Jump to bottom

fix: harbor user auto-onboard #99

Merged
merged 2 commits into from
Feb 9, 2024
Merged

fix: harbor user auto-onboard #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15b0a75
feat: harbor auto onboard configurable via env
Feb 9, 2024
37464ff
fix: harbor user autoonboard
Feb 9, 2024
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
6 changes: 3 additions & 3 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@
},
"[typescript]": {
"editor.codeActionsOnSave": {
"source.fixAll": true,
"source.organizeImports": true
"source.fixAll": "explicit",
"source.organizeImports": "explicit"
},
"editor.defaultFormatter": "dbaeumer.vscode-eslint"
},
"[yaml]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"editor.codeActionsOnSave": {
"source.fixAll": true
"source.fixAll": "explicit"
},
"editor.defaultFormatter": "dbaeumer.vscode-eslint",
"editor.formatOnSave": true,
Expand Down
8 changes: 6 additions & 2 deletions src/tasks/harbor/harbor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,10 @@ import {
HARBOR_BASE_URL,
HARBOR_PASSWORD,
HARBOR_USER,
OIDC_AUTO_ONBOARD,
OIDC_CLIENT_SECRET,
OIDC_ENDPOINT,
OIDC_USER_CLAIM,
OIDC_VERIFY_CERT,
TEAM_IDS,
cleanEnv,
Expand All @@ -36,6 +38,8 @@ const env = cleanEnv({
HARBOR_BASE_REPO_URL,
HARBOR_PASSWORD,
HARBOR_USER,
OIDC_USER_CLAIM,
OIDC_AUTO_ONBOARD,
OIDC_CLIENT_SECRET,
OIDC_ENDPOINT,
OIDC_VERIFY_CERT,
Expand Down Expand Up @@ -93,8 +97,8 @@ const config: any = {
oidc_name: 'otomi',
oidc_scope: 'openid',
oidc_verify_cert: env.OIDC_VERIFY_CERT,
oidc_user_claim: 'otomi',
oidc_auto_onboard: true,
oidc_user_claim: env.OIDC_USER_CLAIM,
oidc_auto_onboard: env.OIDC_AUTO_ONBOARD,
project_creation_restriction: 'adminonly',
robot_name_prefix: robotPrefix,
self_registration: false,
Expand Down
2 changes: 2 additions & 0 deletions src/validators.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ export const NODE_TLS_REJECT_UNAUTHORIZED = bool({ default: true })
export const OIDC_CLIENT_SECRET = str({ desc: 'The OIDC client secret used by keycloak to access the IDP' })
export const OIDC_ENDPOINT = str({ desc: 'The OIDC endpoint used by keycloak to access the IDP' })
export const OIDC_VERIFY_CERT = bool({ desc: 'Wether to validate the OIDC endpoint cert', default: true })
export const OIDC_USER_CLAIM = str({ desc: 'Claim name containing username values', default: 'email' })
export const OIDC_AUTO_ONBOARD = bool({ desc: 'Wether users should be automatically onboarded', default: true })
export const OTOMI_VALUES = json({ desc: 'The main values such as cluster.* otomi.* teamConfig.*', default: {} })
export const OTOMI_SCHEMA_PATH = str({ desc: 'The path to the values-schema.yaml schema file' })
export const OTOMI_ENV_DIR = str({ desc: 'The path to the otomi-values folder' })
Expand Down
Loading