diff --git a/charts/incubator/plausible/questions.yaml b/charts/incubator/plausible/questions.yaml deleted file mode 100644 index 45026cb380f..00000000000 --- a/charts/incubator/plausible/questions.yaml +++ /dev/null @@ -1,296 +0,0 @@ -# Include{groups} -portals: - open: -# Include{portalLink} -questions: -# Include{global} -# Include{workload} -# Include{workloadDeployment} - -# Include{replicas1} -# Include{podSpec} -# Include{containerMain} -# Include{containerBasic} -# Include{containerAdvanced} - - - variable: plausible - group: "App Configuration" - label: "Plausible Configuration" - schema: - additional_attrs: true - type: dict - attrs: - - variable: BASE_URL - label: BASE_URL - description: The hosting URL of the server, used for URL generation. In production systems, this should be your ingress host. - schema: - type: string - default: http://localhost - required: true - - variable: DISABLE_REGISTRATION - label: DISABLE_REGISTRATION - description: Restricts registration of new users. - schema: - type: string - required: true - default: "true" - enum: - - value: "true" - description: Full restriction - - value: "false" - description: No restriction - - value: invite_only - description: Only invited users can register - - variable: LOG_FAILED_LOGIN_ATTEMPTS - label: LOG_FAILED_LOGIN_ATTEMPTS - description: Controls whether to log warnings about failed login attempts. - schema: - type: boolean - default: false - - variable: CLICKHOUSE_FLUSH_INTERVAL_MS - label: CLICKHOUSE_FLUSH_INTERVAL_MS - description: Interval (in milliseconds) between flushing events and sessions data to Clickhouse. Consult Clickhouse docs before changing it. - schema: - type: int - default: 5000 - required: true - - variable: CLICKHOUSE_MAX_BUFFER_SIZE - label: CLICKHOUSE_MAX_BUFFER_SIZE - description: Maximum size of the buffer of events or sessions. Consult Clickhouse docs before changing it. - schema: - type: int - default: 10000 - required: true - - variable: MAILER_EMAIL - label: MAILER_EMAIL - description: The email id to use for as from address of all communications from Plausible. - schema: - type: string - default: hello@plausible.local - required: true - - variable: MAILER_NAME - label: MAILER_NAME - description: The display name for the sender (from). - schema: - type: string - default: "" - - variable: SMTP_HOST_ADDR - label: SMTP_HOST_ADDR - description: The host address of your smtp server. - schema: - type: string - default: localhost - required: true - - variable: SMTP_HOST_PORT - label: SMTP_HOST_PORT - description: The port of your smtp server. - schema: - type: int - default: 25 - required: true - - variable: SMTP_USER_NAME - label: SMTP_USER_NAME - description: The username/email in case SMTP auth is enabled. - schema: - type: string - default: "" - - variable: SMTP_USER_PWD - label: SMTP_USER_PWD - description: The password in case SMTP auth is enabled. - schema: - type: string - default: "" - private: true - - variable: SMTP_HOST_SSL_ENABLED - label: SMTP_HOST_SSL_ENABLED - description: If SSL is enabled for SMTP connection - schema: - type: boolean - default: false - - variable: SMTP_RETRIES - label: SMTP_RETRIES - description: Number of retries to make until mailer gives up. - schema: - type: int - default: 2 - required: true - - variable: MAILER_ADAPTER - label: MAILER_ADAPTER - description: Mailer Adapter - schema: - type: string - required: true - default: Bamboo.SMTPAdapter - enum: - - value: Bamboo.SMTPAdapter - description: Bamboo.SMTPAdapter - - value: Bamboo.PostmarkAdapter - description: Bamboo.PostmarkAdapter - - value: Bamboo.MailgunAdapter - description: Bamboo.MailgunAdapter - - value: Bamboo.MandrillAdapter - description: Bamboo.MandrillAdapter - - value: Bamboo.SendGridAdapter - description: Bamboo.SendGridAdapter - - variable: POSTMARK_API_KEY - label: POSTMARK_API_KEY - description: Required. Enter your API key. - schema: - show_if: [["MAILER_ADAPTER", "=", "Bamboo.PostmarkAdapter"]] - type: string - default: "" - private: true - - variable: MAILGUN_API_KEY - label: MAILGUN_API_KEY - description: Required. Enter your API key. - schema: - show_if: [["MAILER_ADAPTER", "=", "Bamboo.MailgunAdapter"]] - type: string - default: "" - private: true - - variable: MAILGUN_DOMAIN - label: MAILGUN_DOMAIN - description: Required. Enter your Mailgun domain. - schema: - show_if: [["MAILER_ADAPTER", "=", "Bamboo.MailgunAdapter"]] - type: string - default: "" - - variable: MAILGUN_BASE_URI - label: MAILGUN_BASE_URI - description: This is optional. Mailgun makes a difference in the API base URL between sender domains from within the EU and outside. By default, the base URL is set to https://api.mailgun.net/v3. To override this you can pass https://api.eu.mailgun.net/v3 if you are using an EU domain. - schema: - show_if: [["MAILER_ADAPTER", "=", "Bamboo.MailgunAdapter"]] - type: string - default: "" - - variable: MANDRILL_API_KEY - label: MANDRILL_API_KEY - description: Required. Enter your API key. - schema: - show_if: [["MAILER_ADAPTER", "=", "Bamboo.MandrillAdapter"]] - type: string - default: "" - private: true - - variable: SENDGRID_API_KEY - label: SENDGRID_API_KEY - description: Required. Enter your API key. - schema: - show_if: [["MAILER_ADAPTER", "=", "Bamboo.SendGridAdapter"]] - type: string - default: "" - private: true - - variable: MAXMIND_LICENSE_KEY - label: MAXMIND_LICENSE_KEY - description: MaxMind license key to automatically download and update the database - schema: - type: string - default: "" - private: true - - variable: MAXMIND_EDITION - label: MAXMIND_EDITION - description: MaxMind database edition to use (only if MAXMIND_LICENSE_KEY is set) - schema: - show_if: [["MAXMIND_LICENSE_KEY", "!=", ""]] - type: string - required: true - default: GeoLite2-City - enum: - - value: GeoLite2-City - description: GeoLite2-City - - value: GeoLite2-Country - description: GeoLite2-Country - - variable: GOOGLE_CLIENT_ID - label: GOOGLE_CLIENT_ID - description: The Client ID from the Google API Console for your Plausible Analytics project - schema: - type: string - default: "" - - variable: GOOGLE_CLIENT_SECRET - label: GOOGLE_CLIENT_SECRET - description: The Client Secret from the Google API Console for your Plausible Analytics project - schema: - type: string - default: "" - private: true - - variable: LOG_LEVEL - label: LOG_LEVEL - description: Logging Level - schema: - type: string - required: true - default: warn - enum: - - value: debug - description: debug - - value: info - description: info - - value: warn - description: warn - - value: error - description: error - -# Include{containerConfig} -# Include{podOptions} -# Include{serviceRoot} -# Include{serviceMain} -# Include{serviceSelectorLoadBalancer} -# Include{serviceSelectorExtras} - - variable: main - label: "Main Service Port Configuration" - schema: - additional_attrs: true - type: dict - attrs: - - variable: port - label: "Port" - description: "This port exposes the container port on the service" - schema: - type: int - default: 10277 - required: true -# Include{serviceExpertRoot} -# Include{serviceExpert} -# Include{serviceList} -# Include{persistenceList} -# Include{ingressRoot} - - variable: main - label: "Main Ingress" - schema: - additional_attrs: true - type: dict - attrs: -# Include{ingressDefault} -# Include{ingressTLS} -# Include{ingressTraefik} -# Include{ingressAdvanced} -# Include{ingressList} -# Include{securityContextRoot} - - - variable: runAsUser - label: "runAsUser" - description: "The UserID of the user running the application" - schema: - type: int - default: 1000 - - variable: runAsGroup - label: "runAsGroup" - description: "The groupID this App of the user running the application" - schema: - type: int - default: 1000 -# Include{securityContextContainer} -# Include{securityContextAdvanced} -# Include{securityContextPod} - - variable: fsGroup - label: "fsGroup" - description: "The group that should own ALL storage." - schema: - type: int - default: 568 - -# Include{resources} -# Include{advanced} -# Include{addons} -# Include{codeserver} -# Include{netshoot} -# Include{vpn} -# Include{documentation} diff --git a/charts/incubator/plausible/templates/_configmap.tpl b/charts/incubator/plausible/templates/_configmap.tpl deleted file mode 100644 index 743160042fb..00000000000 --- a/charts/incubator/plausible/templates/_configmap.tpl +++ /dev/null @@ -1,21 +0,0 @@ -{{- define "plausible.configmap" -}} -enabled: true -data: - BASE_URL: {{ .Values.plausible.BASE_URL | quote }} - DISABLE_REGISTRATION: {{ .Values.plausible.DISABLE_REGISTRATION | quote }} - LOG_FAILED_LOGIN_ATTEMPTS: {{ .Values.plausible.LOG_FAILED_LOGIN_ATTEMPTS | quote }} - - CLICKHOUSE_FLUSH_INTERVAL_MS: {{ .Values.plausible.CLICKHOUSE_FLUSH_INTERVAL_MS | quote }} - CLICKHOUSE_MAX_BUFFER_SIZE: {{ .Values.plausible.CLICKHOUSE_MAX_BUFFER_SIZE | quote }} - - SMTP_HOST_ADDR: {{ .Values.plausible.SMTP_HOST_ADDR | quote }} - SMTP_HOST_PORT: {{ .Values.plausible.SMTP_HOST_PORT | quote }} - SMTP_HOST_SSL_ENABLED: {{ .Values.plausible.SMTP_HOST_SSL_ENABLED | quote }} - SMTP_RETRIES: {{ .Values.plausible.SMTP_RETRIES | quote }} - MAILER_ADAPTER: {{ .Values.plausible.MAILER_ADAPTER | quote }} - MAILGUN_BASE_URI: {{ .Values.plausible.MAILGUN_BASE_URI | quote }} - - MAXMIND_EDITION: {{ .Values.plausible.MAXMIND_EDITION | quote }} - - LOG_LEVEL: {{ .Values.plausible.LOG_LEVEL | quote }} -{{- end }} diff --git a/charts/incubator/plausible/templates/_secret.tpl b/charts/incubator/plausible/templates/_secret.tpl deleted file mode 100644 index 89fb003e094..00000000000 --- a/charts/incubator/plausible/templates/_secret.tpl +++ /dev/null @@ -1,28 +0,0 @@ -{{- define "plausible.secret" -}} -enabled: true -data: - {{- with (lookup "v1" "Secret" .Release.Namespace "plausible-secret") }} - SECRET_KEY_BASE: {{ index .data "SECRET_KEY_BASE" | b64dec }} - {{- else }} - {{- /* The plain value of SECRET_KEY_BASE is also base64 encoded */}} - SECRET_KEY_BASE: {{ randAlphaNum 86 | b64enc }} - {{- end }} - - DATABASE_URL: {{ .Values.cnpg.main.creds.std }} - CLICKHOUSE_DATABASE_URL: {{ .Values.clickhouse.creds.complete }} - - MAILER_EMAIL: {{ .Values.plausible.MAILER_EMAIL | quote }} - MAILER_NAME: {{ .Values.plausible.MAILER_NAME | quote }} - SMTP_USER_NAME: {{ .Values.plausible.SMTP_USER_NAME | quote }} - SMTP_USER_PWD: {{ .Values.plausible.SMTP_USER_PWD | quote }} - POSTMARK_API_KEY: {{ .Values.plausible.POSTMARK_API_KEY | quote }} - MAILGUN_API_KEY: {{ .Values.plausible.MAILGUN_API_KEY | quote }} - MAILGUN_DOMAIN: {{ .Values.plausible.MAILGUN_DOMAIN | quote }} - MANDRILL_API_KEY: {{ .Values.plausible.MANDRILL_API_KEY | quote }} - SENDGRID_API_KEY: {{ .Values.plausible.SENDGRID_API_KEY | quote }} - - MAXMIND_LICENSE_KEY: {{ .Values.plausible.MAXMIND_LICENSE_KEY | quote }} - - GOOGLE_CLIENT_ID: {{ .Values.plausible.GOOGLE_CLIENT_ID | quote }} - GOOGLE_CLIENT_SECRET: {{ .Values.plausible.GOOGLE_CLIENT_SECRET | quote }} -{{- end }} diff --git a/charts/incubator/plausible/.helmignore b/charts/stable/plausible/.helmignore similarity index 100% rename from charts/incubator/plausible/.helmignore rename to charts/stable/plausible/.helmignore diff --git a/charts/incubator/plausible/CHANGELOG.md b/charts/stable/plausible/CHANGELOG.md similarity index 100% rename from charts/incubator/plausible/CHANGELOG.md rename to charts/stable/plausible/CHANGELOG.md diff --git a/charts/incubator/plausible/Chart.yaml b/charts/stable/plausible/Chart.yaml similarity index 84% rename from charts/incubator/plausible/Chart.yaml rename to charts/stable/plausible/Chart.yaml index a6e954f8373..1b7b0102a57 100644 --- a/charts/incubator/plausible/Chart.yaml +++ b/charts/stable/plausible/Chart.yaml @@ -3,18 +3,18 @@ appVersion: "2.0.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 14.0.2 + version: 14.0.3 - condition: clickhouse.enabled name: clickhouse repository: https://deps.truecharts.org/ version: 7.0.1 deprecated: false description: Plausible is lightweight and open source web analytics. No cookies and fully compliant with GDPR, CCPA and PECR. -home: https://truecharts.org/charts/incubator/plausible +home: https://truecharts.org/charts/stable/plausible icon: https://truecharts.org/img/hotlink-ok/chart-icons/plausible.png keywords: - - analytics - plausible + - analytics kubeVersion: ">=1.16.0-0" maintainers: - email: info@truecharts.org @@ -22,13 +22,13 @@ maintainers: url: https://truecharts.org name: plausible sources: - - https://github.com/truecharts/charts/tree/master/charts/incubator/plausible + - https://github.com/truecharts/charts/tree/master/charts/stable/plausible - https://plausible.io/ - https://plausible.io/docs/self-hosting - https://github.com/plausible/analytics - https://github.com/plausible/hosting type: application -version: 5.0.0 +version: 5.0.1 annotations: truecharts.org/catagories: | - analytics diff --git a/charts/incubator/plausible/README.md b/charts/stable/plausible/README.md similarity index 100% rename from charts/incubator/plausible/README.md rename to charts/stable/plausible/README.md diff --git a/charts/incubator/plausible/icon.png b/charts/stable/plausible/icon.png similarity index 100% rename from charts/incubator/plausible/icon.png rename to charts/stable/plausible/icon.png diff --git a/charts/stable/plausible/questions.yaml b/charts/stable/plausible/questions.yaml new file mode 100644 index 00000000000..6bf5059e742 --- /dev/null +++ b/charts/stable/plausible/questions.yaml @@ -0,0 +1,326 @@ +# Include{groups} +portals: + open: +# Include{portalLink} +questions: +# Include{global} +# Include{workload} +# Include{workloadDeployment} + +# Include{replicas1} +# Include{podSpec} +# Include{containerMain} +# Include{containerBasic} +# Include{containerAdvanced} + + - variable: plausible + group: "App Configuration" + label: "Plausible Configuration" + schema: + additional_attrs: true + type: dict + attrs: + - variable: server + label: Server Configuration + schema: + additional_attrs: true + type: dict + attrs: + - variable: base_url + label: Base Url + description: The hosting URL of the server, used for URL generation. In production systems, this should be your ingress host. + schema: + type: string + default: http://localhost:10277 + required: true + - variable: disable_registration + label: Disable Registration + description: Restricts registration of new users. + schema: + type: string + required: true + default: "true" + enum: + - value: "true" + description: Full restriction + - value: "false" + description: No restriction + - value: invite_only + description: Only invited users can register + - variable: log_failed_login_attempts + label: Log Failed Login Attempts + description: Controls whether to log warnings about failed login attempts. + schema: + type: boolean + default: false + - variable: log_level + label: Log Level + description: Logging Level + schema: + type: string + required: true + default: warn + enum: + - value: debug + description: debug + - value: info + description: info + - value: warn + description: warn + - value: error + description: error + - variable: db + label: DB Configuration + schema: + additional_attrs: true + type: dict + attrs: + - variable: clickhouse_flush_interval_ms + label: Clickhouse Flush Interval MS + description: Interval (in milliseconds) between flushing events and sessions data to Clickhouse. Consult Clickhouse docs before changing it. + schema: + type: int + default: 5000 + required: true + - variable: clickhouse_max_buffer_size + label: Clickhouse Max Buffer Size + description: Maximum size of the buffer of events or sessions. Consult Clickhouse docs before changing it. + schema: + type: int + default: 10000 + required: true + - variable: email + label: Email Configuration + schema: + additional_attrs: true + type: dict + attrs: + - variable: mailer_email + label: Mailer Email + description: The email id to use for as from address of all communications from Plausible. + schema: + type: string + default: hello@plausible.local + required: true + - variable: mailer_name + label: Mailer Name + description: The display name for the sender (from). + schema: + type: string + default: "" + - variable: smtp_host_address + label: SMTP Host Address + description: The host address of your smtp server. + schema: + type: string + default: localhost + required: true + - variable: smtp_host_port + label: SMTP Host Port + description: The port of your smtp server. + schema: + type: int + default: 25 + required: true + - variable: smtp_user_name + label: SMTP User Name + description: The username/email in case SMTP auth is enabled. + schema: + type: string + default: "" + - variable: smtp_user_password + label: SMTP User Password + description: The password in case SMTP auth is enabled. + schema: + type: string + default: "" + private: true + - variable: smtp_host_ssl_enabled + label: SMTP Host SSL Enabled + description: If SSL is enabled for SMTP connection + schema: + type: boolean + default: false + - variable: smtp_retries + label: SMTP Retries + description: Number of retries to make until mailer gives up. + schema: + type: int + default: 2 + required: true + - variable: mailer_adapter + label: Mailer Adapter + description: Mailer Adapter + schema: + type: string + required: true + default: Bamboo.SMTPAdapter + enum: + - value: Bamboo.SMTPAdapter + description: Bamboo.SMTPAdapter + - value: Bamboo.PostmarkAdapter + description: Bamboo.PostmarkAdapter + - value: Bamboo.MailgunAdapter + description: Bamboo.MailgunAdapter + - value: Bamboo.MandrillAdapter + description: Bamboo.MandrillAdapter + - value: Bamboo.SendGridAdapter + description: Bamboo.SendGridAdapter + - variable: postmark_api_key + label: Postmark API Key + description: Required. Enter your API key. + schema: + type: string + private: true + default: "" + show_if: [["mailer_adapter", "=", "Bamboo.PostmarkAdapter"]] + - variable: mailgun_api_key + label: Mailgun API Key + description: Required. Enter your API key. + schema: + type: string + default: "" + private: true + show_if: [["mailer_adapter", "=", "Bamboo.MailgunAdapter"]] + - variable: mailgun_domain + label: Mailgun Domain + description: Required. Enter your Mailgun domain. + schema: + type: string + default: "" + show_if: [["mailer_adapter", "=", "Bamboo.MailgunAdapter"]] + - variable: mailgun_base_uri + label: Mailgun Base URI + description: This is optional. Mailgun makes a difference in the API base URL between sender domains from within the EU and outside. By default, the base URL is set to https://api.mailgun.net/v3. To override this you can pass https://api.eu.mailgun.net/v3 if you are using an EU domain. + schema: + type: string + default: "" + show_if: [["mailer_adapter", "=", "Bamboo.MailgunAdapter"]] + - variable: mandrill_api_key + label: Mandrill API Key + description: Required. Enter your API key. + schema: + type: string + default: "" + private: true + show_if: [["mailer_adapter", "=", "Bamboo.MandrillAdapter"]] + - variable: sendgrid_api_key + label: Sendgrid API Key + description: Required. Enter your API key. + schema: + type: string + default: "" + private: true + show_if: [["mailer_adapter", "=", "Bamboo.SendGridAdapter"]] + - variable: maxmind + label: Maxmind Configuration + schema: + additional_attrs: true + type: dict + attrs: + - variable: license_key + label: Maxmind License Key + description: MaxMind license key to automatically download and update the database + schema: + type: string + default: "" + private: true + - variable: edition + label: Maxmind Edition + description: MaxMind database edition to use (only if Maxmind License Key is set) + schema: + show_if: [["license_key", "!=", ""]] + type: string + required: true + default: GeoLite2-City + enum: + - value: GeoLite2-City + description: GeoLite2-City + - value: GeoLite2-Country + description: GeoLite2-Country + - variable: google + label: Google Configuration + schema: + additional_attrs: true + type: dict + attrs: + - variable: client_id + label: Google CLient ID + description: The Client ID from the Google API Console for your Plausible Analytics project + schema: + type: string + default: "" + - variable: client_secret + label: Google CLient Secret + description: The Client Secret from the Google API Console for your Plausible Analytics project + schema: + type: string + default: "" + private: true + +# Include{containerConfig} +# Include{podOptions} +# Include{serviceRoot} +# Include{serviceMain} +# Include{serviceSelectorLoadBalancer} +# Include{serviceSelectorExtras} + - variable: main + label: "Main Service Port Configuration" + schema: + additional_attrs: true + type: dict + attrs: + - variable: port + label: "Port" + description: "This port exposes the container port on the service" + schema: + type: int + default: 10277 + required: true +# Include{serviceExpertRoot} +# Include{serviceExpert} +# Include{serviceList} +# Include{persistenceList} +# Include{ingressRoot} + - variable: main + label: "Main Ingress" + schema: + additional_attrs: true + type: dict + attrs: +# Include{ingressDefault} +# Include{ingressTLS} +# Include{ingressTraefik} +# Include{ingressAdvanced} +# Include{ingressList} +# Include{securityContextRoot} + + - variable: runAsUser + label: "runAsUser" + description: "The UserID of the user running the application" + schema: + type: int + default: 1000 + - variable: runAsGroup + label: "runAsGroup" + description: "The groupID this App of the user running the application" + schema: + type: int + default: 1000 +# Include{securityContextContainer} +# Include{securityContextAdvanced} +# Include{securityContextPod} + - variable: fsGroup + label: "fsGroup" + description: "The group that should own ALL storage." + schema: + type: int + default: 568 + +# Include{resources} +# Include{advanced} +# Include{addons} +# Include{codeserver} +# Include{netshoot} +# Include{vpn} +# Include{documentation} diff --git a/charts/stable/plausible/templates/_configmap.tpl b/charts/stable/plausible/templates/_configmap.tpl new file mode 100644 index 00000000000..69bb8b7385b --- /dev/null +++ b/charts/stable/plausible/templates/_configmap.tpl @@ -0,0 +1,26 @@ +{{- define "plausible.configmap" -}} +{{- $plausible := .Values.plausible -}} +{{- $server := $plausible.server -}} +{{- $db := $plausible.db -}} +{{- $email := $plausible.email -}} +{{- $maxmind := $plausible.maxmind -}} +enabled: true +data: + BASE_URL: {{ $server.base_url | quote }} + LOG_LEVEL: {{ $server.log_level | quote }} + DISABLE_REGISTRATION: {{ $server.disable_registration | quote }} + LOG_FAILED_LOGIN_ATTEMPTS: {{ $server.log_failed_login_attempts | quote }} + + CLICKHOUSE_FLUSH_INTERVAL_MS: {{ $db.clickhouse_flush_interval_ms | quote }} + CLICKHOUSE_MAX_BUFFER_SIZE: {{ $db.clickhouse_max_buffer_size | quote }} + + SMTP_HOST_ADDR: {{ $email.smtp_host_address | quote }} + SMTP_HOST_PORT: {{ $email.smtp_host_port | quote }} + SMTP_HOST_SSL_ENABLED: {{ $email.smtp_host_ssl_enabled | quote }} + SMTP_RETRIES: {{ $email.smtp_retries | quote }} + MAILER_ADAPTER: {{ $email.mailer_adapter | quote }} + MAILGUN_BASE_URI: {{ $email.mailgun_base_uri | quote }} + + MAXMIND_EDITION: {{ $maxmind.edition | quote }} + +{{- end }} diff --git a/charts/stable/plausible/templates/_secret.tpl b/charts/stable/plausible/templates/_secret.tpl new file mode 100644 index 00000000000..75ea665dd36 --- /dev/null +++ b/charts/stable/plausible/templates/_secret.tpl @@ -0,0 +1,36 @@ +{{- define "plausible.secret" -}} +{{- $fname := (include "tc.v1.common.lib.chart.names.fullname" .) -}} +{{- $secretName := printf "%s-secret" $fname -}} + +{{- $plausible := .Values.plausible -}} +{{- $email := $plausible.email -}} +{{- $maxmind := $plausible.maxmind -}} +{{- $google := $plausible.google -}} + +{{- $baseKey := randAlphaNum 32 -}} +{{- with (lookup "v1" "Secret" .Release.Namespace $secretName) -}} + {{- $baseKey = index .data "SECRET_KEY_BASE" | b64dec -}} +{{- end }} + +enabled: true +data: + SECRET_KEY_BASE: {{ $baseKey }} + + DATABASE_URL: {{ .Values.cnpg.main.creds.std }} + CLICKHOUSE_DATABASE_URL: {{ .Values.clickhouse.creds.complete }} + + MAILER_EMAIL: {{ $email.mailer_email | quote }} + MAILER_NAME: {{ $email.mailer_name | quote }} + SMTP_USER_NAME: {{ $email.smtp_user_name | quote }} + SMTP_USER_PWD: {{ $email.smtp_user_password | quote }} + POSTMARK_API_KEY: {{ $email.postmark_api_key | quote }} + MAILGUN_API_KEY: {{ $email.mailgun_api_key | quote }} + MAILGUN_DOMAIN: {{ $email.mailgun_domain | quote }} + MANDRILL_API_KEY: {{ $email.mandrill_api_key | quote }} + SENDGRID_API_KEY: {{ $email.sendgrid_api_key | quote }} + + MAXMIND_LICENSE_KEY: {{ $maxmind.license_key | quote }} + + GOOGLE_CLIENT_ID: {{ $google.client_id | quote }} + GOOGLE_CLIENT_SECRET: {{ $google.client_secret | quote }} +{{- end }} diff --git a/charts/incubator/plausible/templates/common.yaml b/charts/stable/plausible/templates/common.yaml similarity index 100% rename from charts/incubator/plausible/templates/common.yaml rename to charts/stable/plausible/templates/common.yaml diff --git a/charts/incubator/plausible/values.yaml b/charts/stable/plausible/values.yaml similarity index 72% rename from charts/incubator/plausible/values.yaml rename to charts/stable/plausible/values.yaml index 55806d280f3..7daa76c1311 100644 --- a/charts/incubator/plausible/values.yaml +++ b/charts/stable/plausible/values.yaml @@ -3,47 +3,56 @@ image: pullPolicy: IfNotPresent tag: v2.0.0@sha256:1ef59e863cfdcddc308d4ec743091bc8eda4f62e16b269cf4d778c89b8c02a68 +service: + main: + ports: + main: + port: 10277 + # Plausible self-hosting documentation # https://plausible.io/docs/self-hosting - plausible: # Server - BASE_URL: http://localhost - DISABLE_REGISTRATION: "true" - LOG_FAILED_LOGIN_ATTEMPTS: false + server: + base_url: http://localhost:10277 + disable_registration: "true" + log_failed_login_attempts: false + # Logging + log_level: warn # Database - CLICKHOUSE_FLUSH_INTERVAL_MS: 5000 - CLICKHOUSE_MAX_BUFFER_SIZE: 10000 + db: + clickhouse_flush_interval_ms: 5000 + clickhouse_max_buffer_size: 10000 # Mailer/SMTP Setup - MAILER_EMAIL: hello@plausible.local - MAILER_NAME: "" - SMTP_HOST_ADDR: localhost - SMTP_HOST_PORT: 25 - SMTP_USER_NAME: "" - SMTP_USER_PWD: "" - SMTP_HOST_SSL_ENABLED: false - SMTP_RETRIES: 2 - MAILER_ADAPTER: Bamboo.SMTPAdapter - POSTMARK_API_KEY: "" - MAILGUN_API_KEY: "" - MAILGUN_DOMAIN: "" - MAILGUN_BASE_URI: "" - MANDRILL_API_KEY: "" - SENDGRID_API_KEY: "" + email: + mailer_email: hello@plausible.local + mailer_name: "" + smtp_host_address: localhost + smtp_host_port: 25 + smtp_user_name: "" + smtp_user_password: "" + smtp_host_ssl_enabled: false + smtp_retries: 2 + mailer_adapter: Bamboo.SMTPAdapter + postmark_api_key: "" + mailgun_api_key: "" + mailgun_domain: "" + mailgun_base_uri: "" + mandrill_api_key: "" + sendgrid_api_key: "" # IP Geolocation # todo(investigate where automatic updates are stored and configure storage accordingly) - MAXMIND_LICENSE_KEY: "" - MAXMIND_EDITION: GeoLite2-City + maxmind: + license_key: "" + edition: GeoLite2-City # Google Search Integration - GOOGLE_CLIENT_ID: "" - GOOGLE_CLIENT_SECRET: "" - - # Logging - LOG_LEVEL: warn + google: + client_id: "" + client_secret: "" workload: main: @@ -89,6 +98,8 @@ workload: runAsUser: 1000 runAsGroup: 1000 readOnlyRootFilesystem: false + env: + PORT: "{{ .Values.service.main.ports.main.port }}" envFrom: - configMapRef: name: plausible-config @@ -102,15 +113,7 @@ workload: type: http path: /api/health startup: - type: http - path: /api/health - -service: - main: - ports: - main: - targetPort: 8000 - port: 10277 + type: tcp cnpg: main: