diff --git a/incubator/meshcentral/5.0.15/CHANGELOG.md b/incubator/meshcentral/5.0.16/CHANGELOG.md similarity index 89% rename from incubator/meshcentral/5.0.15/CHANGELOG.md rename to incubator/meshcentral/5.0.16/CHANGELOG.md index 2a17188e7e..30c2bb234a 100644 --- a/incubator/meshcentral/5.0.15/CHANGELOG.md +++ b/incubator/meshcentral/5.0.16/CHANGELOG.md @@ -2,6 +2,19 @@ +## [meshcentral-5.0.16](https://github.com/truecharts/charts/compare/meshcentral-5.0.15...meshcentral-5.0.16) (2022-10-29) + +### Chore + +- Auto-update chart README [skip ci] + + ### Feat + +- allow additiional custom config on UI ([#4228](https://github.com/truecharts/charts/issues/4228)) + + + + ## [meshcentral-5.0.15](https://github.com/truecharts/charts/compare/meshcentral-5.0.14...meshcentral-5.0.15) (2022-10-29) ### Chore @@ -84,16 +97,3 @@ - whops ([#4207](https://github.com/truecharts/charts/issues/4207)) - - - -## [meshcentral-5.0.8](https://github.com/truecharts/charts/compare/meshcentral-5.0.7...meshcentral-5.0.8) (2022-10-27) - -### Chore - -- Auto-update chart README [skip ci] - - ### Fix - -- remove --cert from run command ([#4205](https://github.com/truecharts/charts/issues/4205)) - diff --git a/incubator/meshcentral/5.0.15/Chart.lock b/incubator/meshcentral/5.0.16/Chart.lock similarity index 85% rename from incubator/meshcentral/5.0.15/Chart.lock rename to incubator/meshcentral/5.0.16/Chart.lock index a6e1807061..581c9ed438 100644 --- a/incubator/meshcentral/5.0.15/Chart.lock +++ b/incubator/meshcentral/5.0.16/Chart.lock @@ -6,4 +6,4 @@ dependencies: repository: https://charts.truecharts.org/ version: 2.0.42 digest: sha256:368ab09d96987d02826b4821e7040b6230712e811bfec896c486195289b5f81d -generated: "2022-10-29T10:45:10.872476556Z" +generated: "2022-10-29T11:27:00.836393209Z" diff --git a/incubator/meshcentral/5.0.15/Chart.yaml b/incubator/meshcentral/5.0.16/Chart.yaml similarity index 98% rename from incubator/meshcentral/5.0.15/Chart.yaml rename to incubator/meshcentral/5.0.16/Chart.yaml index a6afecd352..94ad90bdf7 100644 --- a/incubator/meshcentral/5.0.15/Chart.yaml +++ b/incubator/meshcentral/5.0.16/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: meshcentral +version: 5.0.16 appVersion: "1.0.92" -version: 5.0.15 description: MeshCentral is a full computer management web site type: application deprecated: false diff --git a/incubator/meshcentral/5.0.15/README.md b/incubator/meshcentral/5.0.16/README.md similarity index 100% rename from incubator/meshcentral/5.0.15/README.md rename to incubator/meshcentral/5.0.16/README.md diff --git a/incubator/meshcentral/5.0.15/app-readme.md b/incubator/meshcentral/5.0.16/app-readme.md similarity index 100% rename from incubator/meshcentral/5.0.15/app-readme.md rename to incubator/meshcentral/5.0.16/app-readme.md diff --git a/incubator/meshcentral/5.0.15/charts/common-10.7.8.tgz b/incubator/meshcentral/5.0.16/charts/common-10.7.8.tgz similarity index 100% rename from incubator/meshcentral/5.0.15/charts/common-10.7.8.tgz rename to incubator/meshcentral/5.0.16/charts/common-10.7.8.tgz diff --git a/incubator/meshcentral/5.0.15/charts/mongodb-2.0.42.tgz b/incubator/meshcentral/5.0.16/charts/mongodb-2.0.42.tgz similarity index 100% rename from incubator/meshcentral/5.0.15/charts/mongodb-2.0.42.tgz rename to incubator/meshcentral/5.0.16/charts/mongodb-2.0.42.tgz diff --git a/incubator/meshcentral/5.0.15/ci/ci-values.yaml b/incubator/meshcentral/5.0.16/ci/ci-values.yaml similarity index 100% rename from incubator/meshcentral/5.0.15/ci/ci-values.yaml rename to incubator/meshcentral/5.0.16/ci/ci-values.yaml diff --git a/incubator/meshcentral/5.0.15/ix_values.yaml b/incubator/meshcentral/5.0.16/ix_values.yaml similarity index 99% rename from incubator/meshcentral/5.0.15/ix_values.yaml rename to incubator/meshcentral/5.0.16/ix_values.yaml index 01da788cea..b6704c1357 100644 --- a/incubator/meshcentral/5.0.15/ix_values.yaml +++ b/incubator/meshcentral/5.0.16/ix_values.yaml @@ -18,7 +18,7 @@ podSecurityContext: # - Values with the character _ in-front of them are pruned. Add or remove _ to disable or enable options # - More in-depth info for each options can be found here: https://github.com/Ylianst/MeshCentral/blob/master/meshcentral-config-schema.json # - Check for this chart's specific info in our webpage https://truecharts.org -# - Last sync with upstream config schema: Oct 22, 2022 +# - Last sync with upstream config schema: Oct 29, 2022 # - Any service that uses port other than 443, need to be manually configured. meshcentral: settings: @@ -290,6 +290,12 @@ meshcentral: serverurl: "" # - A Discord bot token that MeshCentral will use to login to Discord. token: "" + # - Configure XMPP messaging system + _xmpp: + service: "" + credentials: + username: "" + password: "" # - Any settings in this section is used as default setting for all domains _domaindefaults: diff --git a/incubator/meshcentral/5.0.15/questions.yaml b/incubator/meshcentral/5.0.16/questions.yaml similarity index 98% rename from incubator/meshcentral/5.0.15/questions.yaml rename to incubator/meshcentral/5.0.16/questions.yaml index b71e05adfe..4e7887b42d 100644 --- a/incubator/meshcentral/5.0.15/questions.yaml +++ b/incubator/meshcentral/5.0.16/questions.yaml @@ -533,6 +533,42 @@ questions: schema: type: string default: "" + - variable: _setupXMPP + label: Setup XMPP + schema: + type: boolean + default: false + show_subquestions_if: true + subquestions: + - variable: xmpp + label: xmpp + description: Configure XMPP messaging system + schema: + additional_attrs: true + type: dict + attrs: + - variable: service + label: service + schema: + type: string + default: "" + - variable: credentials + label: credentials + schema: + additional_attrs: true + type: dict + attrs: + - variable: username + label: username + schema: + type: string + default: "" + - variable: password + label: password + schema: + type: string + private: true + default: "" - variable: domains label: Section schema: @@ -719,6 +755,31 @@ questions: schema: type: string default: "" + - variable: additional_meshcentral + group: Container Configuration + label: Additional MeshCentral Configuration + schema: + type: list + default: [] + items: + - variable: entry + label: Key - Value Pair + schema: + additional_attrs: true + type: dict + attrs: + - variable: key + label: Key + schema: + type: string + required: true + default: "" + - variable: value + label: Value + schema: + type: string + required: true + default: "" - variable: TZ label: Timezone group: Container Configuration diff --git a/incubator/meshcentral/5.0.15/templates/_secret.tpl b/incubator/meshcentral/5.0.16/templates/_secret.tpl similarity index 78% rename from incubator/meshcentral/5.0.15/templates/_secret.tpl rename to incubator/meshcentral/5.0.16/templates/_secret.tpl index 17b21de5e6..0659d06988 100644 --- a/incubator/meshcentral/5.0.15/templates/_secret.tpl +++ b/incubator/meshcentral/5.0.16/templates/_secret.tpl @@ -5,6 +5,7 @@ {{- $secretStorageName := printf "%s-storage-secret" (include "tc.common.names.fullname" .) }} {{- $config := .Values.meshcentral }} +{{- $mc_custom := .Values.additional_meshcentral }} {{- $isScale := false }} {{- if hasKey .Values.global "isSCALE" }} @@ -13,6 +14,20 @@ {{- $isScale = false }} {{- end }} +{{- if $isScale }} + {{- if .Values.additional_meshcentral }} + {{- $mc_custom = (include "render.custom.scale.values" $mc_custom) }} + {{- $mc_custom_merged := dict }} + {{/* We created a new unique section# for each key we parsed */}} + {{/* And we merge them here, as without it we would have multiple */}} + {{/* same top level keys */}} + {{- range $section := (fromYaml $mc_custom) }} + {{- $mc_custom_merged = mergeOverwrite $mc_custom_merged $section }} + {{- end }} + {{- $config = mergeOverwrite $config $mc_custom_merged }} + {{- end }} +{{- end }} + {{- $sessionKey := "" }} {{- with (lookup "v1" "Secret" .Release.Namespace $secretStorageName) }} {{- $sessionKey = (index .data "session_key") }} @@ -40,7 +55,7 @@ {{- range $domain := $config.domains }} {{- if not (hasKey $domain "myServer") }} {{- $_ := set $domain "myServer" dict }} - {{- end -}} + {{- end }} {{- $_ := set $domain.myServer "Upgrade" false }} {{- end }} @@ -138,3 +153,20 @@ data: {{- $_ := unset $values.domains "tcdefaultdomain" }} {{- toYaml $values }} {{- end }} + +{{/* Takes a list of dicts with a value and a */}} +{{/* key formatted in dot notaion and converts it to yaml */}} +{{- define "render.custom.scale.values" }} + {{- $values := . }} + {{- $section := 1 }} + {{- range $item := $values }} + {{- $indent := 2 }} + {{- printf "section%v" $section | nindent 0 }}: + {{- $section = (add 1 (int $section)) }} + {{- range (split "." $item.key) }} + {{- . | nindent (int $indent) }}: + {{- $indent = (add 2 (int $indent)) }} + {{- end -}} + {{- printf " %v" $item.value }} + {{- end }} +{{- end }} diff --git a/incubator/meshcentral/5.0.15/templates/common.yaml b/incubator/meshcentral/5.0.16/templates/common.yaml similarity index 100% rename from incubator/meshcentral/5.0.15/templates/common.yaml rename to incubator/meshcentral/5.0.16/templates/common.yaml diff --git a/incubator/meshcentral/5.0.15/values.yaml b/incubator/meshcentral/5.0.16/values.yaml similarity index 100% rename from incubator/meshcentral/5.0.15/values.yaml rename to incubator/meshcentral/5.0.16/values.yaml