From 7aa5cbb282d55e9533c9dcbd26c144a4a66d1e89 Mon Sep 17 00:00:00 2001 From: Xstar97 Date: Mon, 7 Nov 2022 04:53:28 -0500 Subject: [PATCH] feat(strapi) change version to v4 (#4330) * feat(strapi) change version to v4 * add secrets type correctly --- charts/stable/strapi/Chart.yaml | 13 +++--- charts/stable/strapi/questions.yaml | 64 +++++++++++++++++++++++++---- charts/stable/strapi/values.yaml | 18 +++++--- 3 files changed, 75 insertions(+), 20 deletions(-) diff --git a/charts/stable/strapi/Chart.yaml b/charts/stable/strapi/Chart.yaml index 5a9a7e11737..e16f925e7ff 100644 --- a/charts/stable/strapi/Chart.yaml +++ b/charts/stable/strapi/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: "3.6.8" +appVersion: "4.4.5" dependencies: - name: common repository: https://library-charts.truecharts.org @@ -8,7 +8,7 @@ dependencies: name: postgresql repository: https://charts.truecharts.org/ version: 8.0.119 -description: Strapi is the leading open-source headless CMS. JavaScript, fully customizable and developer-first. +description: Open-source headless CMS. JavaScript, fully customizable and developer-first. home: https://truecharts.org/docs/charts/stable/strapi icon: https://truecharts.org/img/hotlink-ok/chart-icons/strapi.png keywords: @@ -21,11 +21,10 @@ maintainers: url: https://truecharts.org name: strapi sources: - - https://github.com/truecharts/charts/tree/master/charts/stable/strapi - - https://hub.docker.com/r/strapi/strapi - - https://github.com/strapi/strapi - - https://docs.strapi.io/developer-docs/latest/setup-deployment-guides/installation/docker.html#creating-a-strapi-project -version: 4.0.50 + - https://truecharts.org/docs/charts/stable/strapi + - https://hub.docker.com/r/naskio/strapi + - https://github.com/naskio/docker-strapi +version: 5.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/strapi/questions.yaml b/charts/stable/strapi/questions.yaml index f183e3a1b6b..3bf562bb991 100644 --- a/charts/stable/strapi/questions.yaml +++ b/charts/stable/strapi/questions.yaml @@ -15,7 +15,37 @@ questions: # Include{recreate} # Include{controllerExpert} # Include{controllerExpertExtraArgs} - # Docker specific env + - variable: secretEnv + group: "Container Configuration" + label: "Image Secrets" + schema: + additional_attrs: true + type: dict + attrs: + - variable: JWT_SECRET + label: Jwt Secret + description: The secret used to sign the JWT for the Users-Permissions plugin. + schema: + type: string + private: true + required: true + default: "" + - variable: ADMIN_JWT_SECRET + label: Admin Jwt Secret + description: The secret used to sign the JWT for the Admin panel. + schema: + type: string + private: true + required: true + default: "" + - variable: APP_KEYS + label: App Keys + description: The secret keys used to sign the session cookies. + schema: + type: string + private: true + required: true + default: "" - variable: env group: "Container Configuration" label: "Image Environment" @@ -24,16 +54,34 @@ questions: type: dict attrs: - variable: NODE_ENV - label: "Node Environment" - description: "Sets Node's Environment" + label: Node Environment + description: Sets Node's Environment schema: type: string - default: "production" + default: production enum: - - value: "production" - description: "Production" - - value: "develop" - description: "Development" + - value: production + description: Production + - value: development + description: Development + - variable: STRAPI_LICENSE + label: Strapi License + description: The license key to activate the Enterprise Edition. + schema: + type: string + default: "" + - variable: STRAPI_DISABLE_UPDATE_NOTIFICATION + label: Strapi Disable Update Notifications + description: Don't show the notification message about updating Strapi. + schema: + type: boolean + default: true + - variable: FAST_REFRESH + label: Fast Refresh + description: enable "Fast Refresh" for near-instant feedback. + schema: + type: boolean + default: false - variable: EXTRA_ARGS label: "Extra Args (Leave empty for default)" description: "Pass extra args to the strapi new" diff --git a/charts/stable/strapi/values.yaml b/charts/stable/strapi/values.yaml index d0ff1ce4445..b22dc27841b 100644 --- a/charts/stable/strapi/values.yaml +++ b/charts/stable/strapi/values.yaml @@ -1,7 +1,7 @@ image: repository: tccr.io/truecharts/strapi - tag: v3.6.8@sha256:a36075a1a9cc9802e77772f765b189ff1f4216c11de80fb1c36b1a44551cdcc6 - pullPolicy: IfNotPresent + tag: v4.4.5@sha256:38f3377319ce26bf345fe4d1acf656f2a06a12d24e47f862080f83f08fb8b654 + pullPolicy: Always securityContext: readOnlyRootFilesystem: false @@ -11,21 +11,29 @@ podSecurityContext: runAsUser: 0 runAsGroup: 0 +secretEnv: + JWT_SECRET: "my_jwt_secret" + ADMIN_JWT_SECRET: "my_admin_jwt_secret" + APP_KEYS: "my_app_keys" + env: DATABASE_CLIENT: "postgres" DATABASE_PORT: 5432 DATABASE_NAME: "{{ .Values.postgresql.postgresqlDatabase }}" - DATABASE_USERNAME: "{{ .Values.postgresql.postgresqlUsername }}" - NODE_ENV: "production" - EXTRA_ARGS: "" DATABASE_HOST: secretKeyRef: name: dbcreds key: plainhost + DATABASE_USERNAME: "{{ .Values.postgresql.postgresqlUsername }}" DATABASE_PASSWORD: secretKeyRef: name: dbcreds key: postgresql-password + # STRAPI_LICENSE + NODE_ENV: "production" + STRAPI_DISABLE_UPDATE_NOTIFICATION: true + FAST_REFRESH: false + EXTRA_ARGS: "" service: main: