mirror of
https://github.com/kerberos-io/helm-charts.git
synced 2026-11-22 23:10:23 +00:00
Compare commits
4
Commits
hub-0.202.1
..
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ca70077b59 | ||
|
|
999c7e8288 | ||
|
|
fe1c4abdc5 | ||
|
|
25af112d26 |
@@ -16,7 +16,7 @@ type: application
|
||||
# This is the chart version. This version number should be incremented each time you make changes
|
||||
# to the chart and its templates, including the app version.
|
||||
# Versions are expected to follow Semantic Versioning (https://semver.org/)
|
||||
version: 0.202.1
|
||||
version: 0.203.0
|
||||
|
||||
# This is the version number of the application being deployed. This version number should be
|
||||
# incremented each time you make changes to the application. Versions are not expected to
|
||||
|
||||
@@ -811,6 +811,9 @@ kerberospipeline:
|
||||
| `mode` | Deployment mode: `all`, `pipeline`, or `ui`. `all` renders everything, `pipeline` only pipeline services, `ui` only hub services. | `"all"` |
|
||||
| `subscriptions.plans.enabled` | Creates the `hub-plans` ConfigMap from `files/plans.yaml` (the `trial`, `community` and `enterprise` plans: gated permissions, limits and Stripe price lookup keys) and mounts it read-only at `/etc/kerberos/plans/plans.yaml` in hub-api, pipe-monitor, pipe-analysis and hub-cleanup, with `PLANS_FILE` set to that path. Plans are changed in the chart, not in values: a change adds a new version of a plan. | `false` |
|
||||
| `subscriptions.plans.newOrganisations` | With `subscriptions.plans.enabled`, new organisations start in plans mode (`PLANS_NEW_ORGANISATIONS=true` on hub-api). When off, new organisations start in legacy mode and an owner or application admin switches an organisation to plans mode. | `false` |
|
||||
| `organisations.mode` | `legacy` (default) keeps the deployment on owner account > sub accounts > roles, with the subscription and agent keys on the owner: the chart refuses to render while any organisation feature is on (`subscriptions.plans.*`, `organisations.onboarding.enabled`, `kerberoshub.api.rbacOrganisations.enabled`, `kerberoshub.api.organisationDeletion.enabled`, the `kerberoshub.frontend.features.organisations.*` / `projects.*` flags, and the same features set directly in `kerberoshub.extraEnv`: `PLANS_FILE`, `PLANS_NEW_ORGANISATIONS`, `ONBOARDING_ENABLED`, `RBAC_ORGANISATIONS_ENABLED`, `FEATURE_ORGANISATION_DELETION_ENABLED` and the frontend's `FEATURE_ORGANISATION*`, `FEATURE_PROJECT*` and `FEATURE_MEMBERS_ACCESS_PREVIEW_ENABLED`; a `valueFrom` for one of them counts as on) and names them. `custom` lets every organisation feature follow its own setting. Keep `custom` once an organisation has been switched to plans or rbac mode. | `legacy` |
|
||||
| `organisations.onboarding.enabled` | Accounts are created without an organisation (sets `ONBOARDING_ENABLED` on hub-api): `/register` stores only the account, an invitation link can create the account it invites, and at first sign-in the account accepts an invitation, selects an organisation it belongs to or creates its own, which starts in rbac mode. Requires a hub-frontend with the onboarding page; without it, new accounts have no organisation to work in and hub-api answers `409 organisation_required`. Off keeps the legacy sign-up: `/register` creates the account with its own organisation, subscription and keys on the owner. Needs `organisations.mode: custom`. An `ONBOARDING_ENABLED` or `ONBOARDING_ORGANISATION_CREATE` already in `kerberoshub.extraEnv` takes precedence and is not set twice. | `false` |
|
||||
| `organisations.onboarding.organisationCreation` | With onboarding on, an account without an organisation may create one in the onboarding step (sets `ONBOARDING_ORGANISATION_CREATE` on hub-api). `false` for invite-only deployments: such accounts can only join through an invitation. | `true` |
|
||||
| `global.imageRegistry` | Global container registry override used for all images. | `""` |
|
||||
| `ingress` | The ingress being used for `kerberoshub.api.url` and `kerberoshub.frontend.url`. | `"nginx"` |
|
||||
| `mongodb.host` | MongoDB hostname (`'mongodb:27017'`) or mongodb replicas (`'mongodb-0:27017,mongodb-1:27017'`). | `"mongodb.mongodb"` |
|
||||
|
||||
@@ -0,0 +1,81 @@
|
||||
{{/*
|
||||
organisations.mode: legacy keeps the deployment on owner account > sub
|
||||
accounts > roles. Fail when an organisation feature is switched on, so a
|
||||
values file never half-enables organisations; custom lets every flag apply.
|
||||
*/}}
|
||||
{{- define "hub.organisations.validate" -}}
|
||||
{{- $organisations := .Values.organisations | default dict -}}
|
||||
{{- $mode := $organisations.mode | default "legacy" -}}
|
||||
{{- if not (has $mode (list "legacy" "custom")) -}}
|
||||
{{- fail (printf "organisations.mode must be legacy or custom, got %q" $mode) -}}
|
||||
{{- end -}}
|
||||
{{- if eq $mode "legacy" -}}
|
||||
{{- $plans := (.Values.subscriptions | default dict).plans | default dict -}}
|
||||
{{- $api := (.Values.kerberoshub | default dict).api | default dict -}}
|
||||
{{- $features := ((.Values.kerberoshub | default dict).frontend | default dict).features | default dict -}}
|
||||
{{- $orgUI := $features.organisations | default dict -}}
|
||||
{{- $projectUI := $features.projects | default dict -}}
|
||||
{{- $flags := list
|
||||
(list "subscriptions.plans.enabled" $plans.enabled)
|
||||
(list "subscriptions.plans.newOrganisations" $plans.newOrganisations)
|
||||
(list "organisations.onboarding.enabled" ($organisations.onboarding | default dict).enabled)
|
||||
(list "kerberoshub.api.rbacOrganisations.enabled" ($api.rbacOrganisations | default dict).enabled)
|
||||
(list "kerberoshub.api.organisationDeletion.enabled" ($api.organisationDeletion | default dict).enabled)
|
||||
(list "kerberoshub.frontend.features.organisations.enabled" $orgUI.enabled)
|
||||
(list "kerberoshub.frontend.features.organisations.switcherEnabled" $orgUI.switcherEnabled)
|
||||
(list "kerberoshub.frontend.features.organisations.creationEnabled" $orgUI.creationEnabled)
|
||||
(list "kerberoshub.frontend.features.organisations.settingsEnabled" $orgUI.settingsEnabled)
|
||||
(list "kerberoshub.frontend.features.organisations.membersAccessPreviewEnabled" $orgUI.membersAccessPreviewEnabled)
|
||||
(list "kerberoshub.frontend.features.projects.enabled" $projectUI.enabled)
|
||||
(list "kerberoshub.frontend.features.projects.switcherEnabled" $projectUI.switcherEnabled)
|
||||
(list "kerberoshub.frontend.features.projects.creationEnabled" $projectUI.creationEnabled)
|
||||
(list "kerberoshub.frontend.features.projects.settingsEnabled" $projectUI.settingsEnabled)
|
||||
-}}
|
||||
{{- $on := list -}}
|
||||
{{- range $flags -}}
|
||||
{{- if eq (index . 1 | toString | lower) "true" -}}
|
||||
{{- $on = append $on (index . 0) -}}
|
||||
{{- end -}}
|
||||
{{- end -}}
|
||||
{{- /*
|
||||
The same features set directly in kerberoshub.extraEnv (hub-api and the
|
||||
frontend). Booleans count when true as hub-api parses them; PLANS_FILE
|
||||
counts when set. A valueFrom cannot be read here, so it counts as on.
|
||||
*/ -}}
|
||||
{{- $booleanEnv := list
|
||||
"PLANS_NEW_ORGANISATIONS" "ONBOARDING_ENABLED" "RBAC_ORGANISATIONS_ENABLED"
|
||||
"FEATURE_ORGANISATION_DELETION_ENABLED"
|
||||
"FEATURE_ORGANISATIONS_ENABLED" "FEATURE_ORGANISATION_SWITCHER_ENABLED"
|
||||
"FEATURE_ORGANISATION_CREATION_ENABLED" "FEATURE_ORGANISATION_SETTINGS_ENABLED"
|
||||
"FEATURE_MEMBERS_ACCESS_PREVIEW_ENABLED"
|
||||
"FEATURE_PROJECTS_ENABLED" "FEATURE_PROJECT_SWITCHER_ENABLED"
|
||||
"FEATURE_PROJECT_CREATION_ENABLED" "FEATURE_PROJECT_SETTINGS_ENABLED"
|
||||
-}}
|
||||
{{- range ((.Values.kerberoshub | default dict).extraEnv | default list) -}}
|
||||
{{- $name := .name | default "" | toString -}}
|
||||
{{- $value := .value | default "" | toString | trim | lower -}}
|
||||
{{- $label := printf "kerberoshub.extraEnv %s" $name -}}
|
||||
{{- if or (eq $name "PLANS_FILE") (has $name $booleanEnv) -}}
|
||||
{{- if .valueFrom -}}
|
||||
{{- $on = append $on (printf "%s (valueFrom)" $label) -}}
|
||||
{{- else if and (eq $name "PLANS_FILE") $value -}}
|
||||
{{- $on = append $on $label -}}
|
||||
{{- else if and (has $name $booleanEnv) (has $value (list "true" "1" "t")) -}}
|
||||
{{- $on = append $on $label -}}
|
||||
{{- end -}}
|
||||
{{- end -}}
|
||||
{{- end -}}
|
||||
{{- if $on -}}
|
||||
{{- fail (printf "organisations.mode is legacy, but these organisation features are on: %s. Switch them off, or set organisations.mode: custom." (join ", " $on)) -}}
|
||||
{{- end -}}
|
||||
{{- end -}}
|
||||
{{- end -}}
|
||||
|
||||
{{/* Comma-separated names in kerberoshub.extraEnv: chart-set variables they name are left out, so extraEnv keeps winning without duplicates. */}}
|
||||
{{- define "hub.extraEnv.names" -}}
|
||||
{{- $names := list -}}
|
||||
{{- range ((.Values.kerberoshub | default dict).extraEnv | default list) -}}
|
||||
{{- $names = append $names (.name | toString) -}}
|
||||
{{- end -}}
|
||||
{{- join "," $names -}}
|
||||
{{- end -}}
|
||||
@@ -442,6 +442,19 @@ spec:
|
||||
- name: FEATURE_ORGANISATION_DELETION_ENABLED
|
||||
value: {{ (.Values.kerberoshub.api.organisationDeletion | default dict).enabled | default false | quote }}
|
||||
|
||||
# Onboarding: /register creates only the account; the organisation comes at first sign-in.
|
||||
# A variable already set in kerberoshub.extraEnv is left to it.
|
||||
{{- $onboarding := (.Values.organisations | default dict).onboarding | default dict }}
|
||||
{{- $extraEnvNames := splitList "," (include "hub.extraEnv.names" .) }}
|
||||
{{- if not (has "ONBOARDING_ENABLED" $extraEnvNames) }}
|
||||
- name: ONBOARDING_ENABLED
|
||||
value: {{ $onboarding.enabled | default false | quote }}
|
||||
{{- end }}
|
||||
{{- if not (has "ONBOARDING_ORGANISATION_CREATE" $extraEnvNames) }}
|
||||
- name: ONBOARDING_ORGANISATION_CREATE
|
||||
value: {{ if hasKey $onboarding "organisationCreation" }}{{ $onboarding.organisationCreation | quote }}{{ else }}"true"{{ end }}
|
||||
{{- end }}
|
||||
|
||||
# Media proxy: hide Vault/storage endpoints behind hub-api URLs.
|
||||
{{- $mediaProxy := .Values.kerberoshub.api.mediaProxy | default dict }}
|
||||
- name: MEDIA_PROXY_ENABLED
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
{{- /* Renders nothing; fails the release on an inconsistent organisations.mode. */ -}}
|
||||
{{- include "hub.organisations.validate" . -}}
|
||||
@@ -114,6 +114,31 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
"organisations": {
|
||||
"type": "object",
|
||||
"additionalProperties": false,
|
||||
"properties": {
|
||||
"mode": {
|
||||
"type": "string",
|
||||
"enum": ["legacy", "custom"],
|
||||
"description": "legacy (default): owner account > sub accounts > roles; the chart fails while any organisation feature is on. custom: every organisation feature follows its own setting."
|
||||
},
|
||||
"onboarding": {
|
||||
"type": "object",
|
||||
"additionalProperties": false,
|
||||
"properties": {
|
||||
"enabled": {
|
||||
"type": "boolean",
|
||||
"description": "ONBOARDING_ENABLED on hub-api: /register creates only the account; its organisation comes at first sign-in. Requires a hub-frontend with the onboarding page."
|
||||
},
|
||||
"organisationCreation": {
|
||||
"type": "boolean",
|
||||
"description": "ONBOARDING_ORGANISATION_CREATE on hub-api; false makes onboarding invite-only."
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"kerberoshub": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
|
||||
@@ -31,6 +31,33 @@ subscriptions:
|
||||
plans:
|
||||
enabled: false
|
||||
newOrganisations: false
|
||||
###################################################################
|
||||
# Organisations
|
||||
###################################################################
|
||||
# mode: legacy | custom
|
||||
# - legacy (default): owner account > sub accounts > roles, with the
|
||||
# subscription and agent keys on the owner. The chart refuses to render
|
||||
# while any organisation feature is switched on: subscriptions.plans,
|
||||
# organisations.onboarding, kerberoshub.api.rbacOrganisations and
|
||||
# organisationDeletion, and the switcher/creation/settings flags of
|
||||
# kerberoshub.frontend.features.organisations and .projects, and the
|
||||
# same features set directly in kerberoshub.extraEnv (PLANS_FILE,
|
||||
# PLANS_NEW_ORGANISATIONS, ONBOARDING_ENABLED, RBAC_ORGANISATIONS_ENABLED,
|
||||
# FEATURE_ORGANISATION*/FEATURE_PROJECT*/FEATURE_MEMBERS_ACCESS_PREVIEW_ENABLED).
|
||||
# - custom: every organisation feature follows its own setting.
|
||||
# Keep custom once an organisation has been switched to plans or rbac mode:
|
||||
# those organisations need the plan file and their features to keep working.
|
||||
organisations:
|
||||
mode: legacy
|
||||
# Onboarding: /register creates only the account; its organisation comes at
|
||||
# first sign-in (accept an invitation, pick an organisation it belongs to, or
|
||||
# create one, which starts in rbac mode). Requires a hub-frontend with the
|
||||
# onboarding page. Off keeps the legacy sign-up: /register creates the
|
||||
# account with its own organisation at once. A variable already set in
|
||||
# kerberoshub.extraEnv takes precedence and is not set twice.
|
||||
onboarding:
|
||||
enabled: false # Sets ONBOARDING_ENABLED on hub-api.
|
||||
organisationCreation: true # false: accounts without an organisation can only join through an invitation (ONBOARDING_ORGANISATION_CREATE).
|
||||
###########################################################################
|
||||
# Image signature verification (Kyverno)
|
||||
###########################################################################
|
||||
|
||||
Reference in New Issue
Block a user