From a739341e0398456310bd76c5f807d18988a5fa5d Mon Sep 17 00:00:00 2001 From: Xstar97TheNoob <9399967+xstar97@users.noreply.github.com> Date: Tue, 19 Dec 2023 07:28:30 -0500 Subject: [PATCH] feat(humhub) change image and set semver to 1.13.2 (#16315) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Description** migrate to new image and set a static semver. ⚒️ Fixes # **⚙️ Type of change** - [ ] ⚙️ Feature/App addition - [ ] 🪛 Bugfix - [ ] ⚠️ Breaking change (fix or feature that would cause existing functionality to not work as expected) - [X] 🔃 Refactor of current code **🧪 How Has This Been Tested?** **📃 Notes:** **✔️ Checklist:** - [X] ⚖️ My code follows the style guidelines of this project - [X] 👀 I have performed a self-review of my own code - [ ] #️⃣ I have commented my code, particularly in hard-to-understand areas - [ ] 📄 I have made corresponding changes to the documentation - [ ] ⚠️ My changes generate no new warnings - [ ] 🧪 I have added tests to this description that prove my fix is effective or that my feature works - [X] ⬆️ I increased versions for any altered app according to semantic versioning **➕ App addition** If this PR is an app addition please make sure you have done the following. - [ ] 🪞 I have opened a PR on [truecharts/containers](https://github.com/truecharts/containers) adding the container to TrueCharts mirror repo. - [ ] 🖼️ I have added an icon in the Chart's root directory called `icon.png` --- _Please don't blindly check all the boxes. Read them and only check those that apply. Those checkboxes are there for the reviewer to see what is this all about and the status of this PR with a quick glance._ --- charts/stable/humhub/Chart.yaml | 30 ++-- charts/stable/humhub/questions.yaml | 153 +++++++++++++++++++-- charts/stable/humhub/templates/NOTES.txt | 1 + charts/stable/humhub/templates/common.yaml | 1 - charts/stable/humhub/values.yaml | 124 +++++++++++++++-- 5 files changed, 276 insertions(+), 33 deletions(-) create mode 100644 charts/stable/humhub/templates/NOTES.txt diff --git a/charts/stable/humhub/Chart.yaml b/charts/stable/humhub/Chart.yaml index 9dc5c70a56a..9438eff83f5 100644 --- a/charts/stable/humhub/Chart.yaml +++ b/charts/stable/humhub/Chart.yaml @@ -1,18 +1,14 @@ kubeVersion: ">=1.24.0-0" apiVersion: v2 name: humhub -version: 3.0.5 -appVersion: latest -description: - HumHub is a free social network software and framework built to give - you the tools to make communication and collaboration easy and successful. The Database - is at 'localhost', username is 'humhub', the database name is 'humhub', there are - no password (local user) -home: https://truecharts.org/charts/incubator/humhub +version: 3.0.6 +appVersion: 1.13.2 +description: A feature rich and highly flexible OpenSource Social Network Kit written in PHP. +home: https://truecharts.org/charts/stable/humhub icon: https://truecharts.org/img/hotlink-ok/chart-icons/humhub.png deprecated: false sources: - - https://github.com/truecharts/charts/tree/master/charts/incubator/humhub + - https://github.com/truecharts/charts/tree/master/charts/stable/humhub - https://ghcr.io/siwatinc/humhub maintainers: - name: TrueCharts @@ -29,6 +25,20 @@ dependencies: alias: "" tags: [] import-values: [] + - name: mariadb + version: 7.0.70 + repository: https://deps.truecharts.org/ + condition: mariadb.enabled + alias: "" + tags: [] + import-values: [] + - name: redis + version: 6.0.66 + repository: https://deps.truecharts.org + condition: redis.enabled + alias: "" + tags: [] + import-values: [] annotations: max_scale_version: 23.10.1 min_scale_version: 22.12.4 @@ -36,5 +46,5 @@ annotations: truecharts.org/category: Network-Web truecharts.org/max_helm_version: "3.13" truecharts.org/min_helm_version: "3.12" - truecharts.org/train: incubator + truecharts.org/train: stable type: application diff --git a/charts/stable/humhub/questions.yaml b/charts/stable/humhub/questions.yaml index c80e9c71e69..22001fdbceb 100644 --- a/charts/stable/humhub/questions.yaml +++ b/charts/stable/humhub/questions.yaml @@ -10,19 +10,120 @@ questions: # Include{replicas1} # Include{podSpec} # Include{containerMain} + # Include{containerBasic} # Include{containerAdvanced} -# Include{containerConfig} -# Include{podOptions} -# Include{serviceRoot} - - variable: main - label: "Main Service" - description: "The Primary service on which the healthcheck runs, often the webUI" + - variable: humhub + group: App Configuration + label: HumHub + schema: + additional_attrs: true + type: dict + attrs: + - variable: debug + label: Debug + description: Enable/Disable Debug + schema: + type: boolean + default: true + - variable: proto + label: Protocol + schema: + type: string + required: true + default: http + enum: + - value: http + description: HTTP + - value: https + description: HTTPS + - variable: host + label: Host + description: Enable/Disable Debug + schema: + type: string + default: "localhost:8080" + - variable: admin + label: Admin Credentials schema: additional_attrs: true type: dict attrs: + - variable: login + label: Login UserName + schema: + type: string + default: "" + - variable: password + label: Login Password + schema: + type: string + private: true + default: "" + - variable: email + label: Login Email + schema: + type: string + default: "" + - variable: mailer + label: Mailer Credentials + schema: + additional_attrs: true + type: dict + attrs: + - variable: sys_address + label: System Address + schema: + type: string + default: "" + - variable: sys_name + label: System Name + schema: + type: string + default: "" + - variable: type + label: Type + schema: + type: string + default: "smtp" + enum: + - value: smtp + description: SMTP + - value: php + description: PHP + - variable: hostname + label: Hostname + schema: + type: string + default: "" + - variable: port + label: Port + schema: + type: int + default: 1025 + - variable: user + label: User + schema: + type: string + default: "" + - variable: password + label: Password + schema: + type: string + private: true + default: "" + - variable: allow_self_sign_certs + label: Allow Self Sign Certs + description: Enable/Disable self sign certs + schema: + type: boolean + default: false + +# Include{containerConfig} +# Include{podOptions} +# Include{serviceRoot} +# Include{serviceMain} # Include{serviceSelectorLoadBalancer} # Include{serviceSelectorExtras} - variable: main @@ -36,15 +137,47 @@ questions: description: "This port exposes the container port on the service" schema: type: int - default: 85 + default: 8080 required: true # Include{serviceExpertRoot} # Include{serviceExpert} # Include{serviceList} # Include{persistenceRoot} - variable: config - label: "config Storage" - description: "Container Path config" + label: "App Config Storage" + description: "Stores the Application Configuration." + schema: + additional_attrs: true + type: dict + attrs: +# Include{persistenceBasic} + - variable: assets + label: "App Assets Storage" + description: "Stores the Application Assets." + schema: + additional_attrs: true + type: dict + attrs: +# Include{persistenceBasic} + - variable: themes + label: "App Themes Storage" + description: "Stores the Application Themes." + schema: + additional_attrs: true + type: dict + attrs: +# Include{persistenceBasic} + - variable: modules + label: "App Modules Storage" + description: "Stores the Application Modules." + schema: + additional_attrs: true + type: dict + attrs: +# Include{persistenceBasic} + - variable: uploads + label: "App Uploads Storage" + description: "Stores the Application Uploads." schema: additional_attrs: true type: dict @@ -73,7 +206,7 @@ questions: default: 0 - variable: runAsGroup label: "runAsGroup" - description: "The groupID of the user running the application" + description: "The groupID this App of the user running the application" schema: type: int default: 0 diff --git a/charts/stable/humhub/templates/NOTES.txt b/charts/stable/humhub/templates/NOTES.txt new file mode 100644 index 00000000000..efcb74cb772 --- /dev/null +++ b/charts/stable/humhub/templates/NOTES.txt @@ -0,0 +1 @@ +{{- include "tc.v1.common.lib.chart.notes" $ -}} diff --git a/charts/stable/humhub/templates/common.yaml b/charts/stable/humhub/templates/common.yaml index 78d963fb168..b51394e00a4 100644 --- a/charts/stable/humhub/templates/common.yaml +++ b/charts/stable/humhub/templates/common.yaml @@ -1,2 +1 @@ -{{/* Render the templates */}} {{ include "tc.v1.common.loader.all" . }} diff --git a/charts/stable/humhub/values.yaml b/charts/stable/humhub/values.yaml index a8c416d694d..c7c2c39c142 100644 --- a/charts/stable/humhub/values.yaml +++ b/charts/stable/humhub/values.yaml @@ -1,23 +1,123 @@ image: pullPolicy: IfNotPresent - repository: ghcr.io/siwatinc/humhub - tag: latest@sha256:5350a151dfc8e1ca9b5fb75b81455baad85b668fdbe9c707c126a4ad3f64caf9 -persistence: - config: - enabled: true - mountPath: /config -portal: - open: - enabled: true + repository: ghcr.io/mriedmann/humhub-allinone + tag: 1.13.2@sha256:8f6af145327e5abd0d4855680146f564ad0c425819a7c2e60c26cbbc1c39ae44 + securityContext: container: + runAsNonRoot: false readOnlyRootFilesystem: false - runAsGroup: 0 runAsUser: 0 + runAsGroup: 0 + service: main: ports: main: - port: 85 - protocol: tcp + protocol: http targetPort: 80 + port: 8080 + +humhub: + debug: true + proto: http + host: localhost:8080 + admin: + login: admin + password: test + email: humhub@example.com + + mailer: + sys_address: noreply@example.com + sys_name: HumHub + type: smtp + hostname: mailer + port: 1025 + user: "" + password: "" + encrypt: "" + allow_self_sign_certs: false + +workload: + main: + podSpec: + containers: + main: + env: + HUMHUB_DB_USER: "{{ .Values.mariadb.mariadbUsername }}" + HUMHUB_DB_PASSWORD: + secretKeyRef: + expandObjectName: false + name: '{{ printf "%s-%s" .Release.Name "mariadbcreds" }}' + key: mariadb-password + HUMHUB_DB_HOST: + secretKeyRef: + expandObjectName: false + name: '{{ printf "%s-%s" .Release.Name "mariadbcreds" }}' + key: plainhost + HUMHUB_DB_NAME: "{{ .Values.mariadb.mariadbDatabase }}" + # Cache Config + HUMHUB_CACHE_EXPIRE_TIME: 3600 + # do not expose + HUMHUB_CACHE_CLASS: yii\redis\Cache + HUMHUB_QUEUE_CLASS: humhub\modules\queue\driver\Redis + HUMHUB_REDIS_HOSTNAME: + secretKeyRef: + expandObjectName: false + name: '{{ printf "%s-%s" .Release.Name "rediscreds" }}' + key: plainhost + HUMHUB_REDIS_PORT: 6379 + HUMHUB_REDIS_PASSWORD: + secretKeyRef: + expandObjectName: false + name: '{{ printf "%s-%s" .Release.Name "rediscreds" }}' + key: redis-password + HUMHUB_AUTO_INSTALL: 1 + # 0 | 1 + HUMHUB_DEBUG: "{{ .Values.humhub.debug }}" + # http | https + HUMHUB_PROTO: "{{ .Values.humhub.proto }}" + HUMHUB_HOST: "{{ .Values.humhub.host }}" + HUMHUB_ADMIN_LOGIN: "{{ .Values.humhub.admin.login }}" + HUMHUB_ADMIN_EMAIL: "{{ .Values.humhub.admin.email }}" + HUMHUB_ADMIN_PASSWORD: "{{ .Values.humhub.admin.password }}" + # Mailer install setup + HUMHUB_MAILER_SYSTEM_EMAIL_ADDRESS: "{{ .Values.humhub.mailer.sys_address }}" + HUMHUB_MAILER_SYSTEM_EMAIL_NAME: "{{ .Values.humhub.mailer.sys_name }}" + # php | smtp + HUMHUB_MAILER_TRANSPORT_TYPE: "{{ .Values.humhub.mailer.type }}" + HUMHUB_MAILER_HOSTNAME: "{{ .Values.humhub.mailer.hostname }}" + HUMHUB_MAILER_PORT: "{{ .Values.humhub.mailer.port }}" + HUMHUB_MAILER_USERNAME: "{{ .Values.humhub.mailer.user }}" + HUMHUB_MAILER_PASSWORD: "{{ .Values.humhub.mailer.password }}" + HUMHUB_MAILER_ENCRYPTION: "{{ .Values.humhub.mailer.encrypt }}" + HUMHUB_MAILER_ALLOW_SELF_SIGNED_CERTS: "{{ .Values.humhub.mailer.allow_self_sign_certs }}" + +persistence: + config: + enabled: true + mountPath: /var/www/localhost/htdocs/protected/config + assets: + enabled: true + mountPath: /var/www/localhost/htdocs/assets + themes: + enabled: true + mountPath: /var/www/localhost/htdocs/themes + modules: + enabled: true + mountPath: /var/www/localhost/htdocs/protected/modules + uploads: + enabled: true + mountPath: /var/www/localhost/htdocs/uploads + +mariadb: + enabled: true + mariadbUsername: humhub + mariadbDatabase: humhub + +redis: + enabled: true + +portal: + open: + enabled: true