no message

charts/dev/penpot/templates/_backend.tpl

@@ -1,39 +0,0 @@
-{{/* Define the backend container */}}
-{{- define "penpot.backend" -}}
-image: {{ .Values.backendImage.repository }}:{{ .Values.backendImage.tag }}
-imagePullPolicy: '{{ .Values.backendImage.pullPolicy }}'
-securityContext:
-  runAsUser: {{ .Values.podSecurityContext.runAsUser }}
-  runAsGroup: {{ .Values.podSecurityContext.runAsGroup }}
-  readOnlyRootFilesystem: {{ .Values.securityContext.readOnlyRootFilesystem }}
-  runAsNonRoot: {{ .Values.securityContext.runAsNonRoot }}
-volumeMounts:
-  - name: data
-    mountPath: {{ .Values.persistence.data.mountPath }}
-envFrom:
-  - secretRef:
-      name: '{{ include "tc.v1.common.names.fullname" . }}-common-secret'
-  - secretRef:
-      name: '{{ include "tc.v1.common.names.fullname" . }}-backend-exporter-secret'
-readinessProbe:
-  tcpSocket:
-    port: 6060
-  initialDelaySeconds: {{ .Values.probes.readiness.spec.initialDelaySeconds }}
-  timeoutSeconds: {{ .Values.probes.readiness.spec.timeoutSeconds }}
-  periodSeconds: {{ .Values.probes.readiness.spec.periodSeconds }}
-  failureThreshold: {{ .Values.probes.readiness.spec.failureThreshold }}
-livenessProbe:
-  tcpSocket:
-    port: 6060
-  initialDelaySeconds: {{ .Values.probes.liveness.spec.initialDelaySeconds }}
-  timeoutSeconds: {{ .Values.probes.liveness.spec.timeoutSeconds }}
-  periodSeconds: {{ .Values.probes.liveness.spec.periodSeconds }}
-  failureThreshold: {{ .Values.probes.liveness.spec.failureThreshold }}
-startupProbe:
-  tcpSocket:
-    port: 6060
-  initialDelaySeconds: {{ .Values.probes.startup.spec.initialDelaySeconds }}
-  timeoutSeconds: {{ .Values.probes.startup.spec.timeoutSeconds }}
-  periodSeconds: {{ .Values.probes.startup.spec.periodSeconds }}
-  failureThreshold: {{ .Values.probes.startup.spec.failureThreshold }}
-{{- end }}

charts/dev/penpot/templates/_exporter.tpl

@@ -1,39 +0,0 @@
-{{/* Define the exporter container */}}
-{{- define "penpot.exporter" -}}
-image: {{ .Values.exporterImage.repository }}:{{ .Values.exporterImage.tag }}
-imagePullPolicy: '{{ .Values.exporterImage.pullPolicy }}'
-securityContext:
-  runAsUser: {{ .Values.podSecurityContext.runAsUser }}
-  runAsGroup: {{ .Values.podSecurityContext.runAsGroup }}
-  readOnlyRootFilesystem: {{ .Values.securityContext.readOnlyRootFilesystem }}
-  runAsNonRoot: {{ .Values.securityContext.runAsNonRoot }}
-envFrom:
-  - secretRef:
-      name: '{{ include "tc.v1.common.names.fullname" . }}-common-secret'
-  - secretRef:
-      name: '{{ include "tc.v1.common.names.fullname" . }}-exporter-secret'
-  - secretRef:
-      name: '{{ include "tc.v1.common.names.fullname" . }}-backend-exporter-secret'
-readinessProbe:
-  tcpSocket:
-    port: 6061
-  initialDelaySeconds: {{ .Values.probes.readiness.spec.initialDelaySeconds }}
-  timeoutSeconds: {{ .Values.probes.readiness.spec.timeoutSeconds }}
-  periodSeconds: {{ .Values.probes.readiness.spec.periodSeconds }}
-  failureThreshold: {{ .Values.probes.readiness.spec.failureThreshold }}
-livenessProbe:
-  httpGet:
-  tcpSocket:
-    port: 6061
-  initialDelaySeconds: {{ .Values.probes.liveness.spec.initialDelaySeconds }}
-  timeoutSeconds: {{ .Values.probes.liveness.spec.timeoutSeconds }}
-  periodSeconds: {{ .Values.probes.liveness.spec.periodSeconds }}
-  failureThreshold: {{ .Values.probes.liveness.spec.failureThreshold }}
-startupProbe:
-  tcpSocket:
-    port: 6061
-  initialDelaySeconds: {{ .Values.probes.startup.spec.initialDelaySeconds }}
-  timeoutSeconds: {{ .Values.probes.startup.spec.timeoutSeconds }}
-  periodSeconds: {{ .Values.probes.startup.spec.periodSeconds }}
-  failureThreshold: {{ .Values.probes.startup.spec.failureThreshold }}
-{{- end }}

charts/dev/penpot/templates/_secret.tpl

@@ -1,104 +0,0 @@
-{{/* Define the secret */}}
-{{- define "penpot.secret" -}}
-
-{{- $commonSecretName := printf "%s-common-secret" (include "tc.v1.common.names.fullname" .) }}
-{{- $exporterSecretName := printf "%s-exporter-secret" (include "tc.v1.common.names.fullname" .) }}
-{{- $frontendSecretName := printf "%s-frontend-secret" (include "tc.v1.common.names.fullname" .) }}
-{{- $backendAndExporterSecretName := printf "%s-backend-exporter-secret" (include "tc.v1.common.names.fullname" .) }}
-
-{{- $backendFlags := list }}
-{{- $backendFlags = mustAppend $backendFlags (printf "%s-smtp" (ternary "enable" "disable" .Values.penpot.smtp.enabled)) }}
-{{- $backendFlags = mustAppend $backendFlags (printf "%s-email-verification" (ternary "enable" "disable" .Values.penpot.flags.mail_verification)) }}
-{{- $backendFlags = mustAppend $backendFlags (printf "%s-log-invitation-tokens" (ternary "enable" "disable" .Values.penpot.flags.log_invitation_token)) }}
-{{- $backendFlags = mustAppend $backendFlags (printf "%s-log-emails" (ternary "enable" "disable" (and .Values.penpot.flags.log_emails (not .Values.penpot.smtp.enabled)))) }}
-{{- $backendFlags = mustAppend $backendFlags (printf "%s-secure-session-cookies" (ternary "enable" "disable" .Values.penpot.flags.secure_session_cookies)) }}
-{{- $backendFlags = mustAppend $backendFlags (printf "%s-insecure-register" (ternary "enable" "disable" .Values.penpot.flags.insecure_register)) }}
-{{- $backendFlags = mustAppend $backendFlags (printf "%s-cors" (ternary "enable" "disable" .Values.penpot.flags.backend_api_doc)) }}
-{{- $backendFlags = mustAppend $backendFlags (printf "%s-backend-api-doc" (ternary "enable" "disable" .Values.penpot.flags.backend_api_doc)) }}
-
-{{- $frontendFlags := list }}
-{{- $frontendFlags = mustAppend $frontendFlags (printf "%s-demo-warning" (ternary "enable" "disable" .Values.penpot.flags.demo_warning)) }}
-
-{{- $commonFlags := list }}
-{{- $commonFlags = mustAppend $commonFlags (printf "%s-login" (ternary "enable" "disable" .Values.penpot.flags.login)) }}
-{{- $commonFlags = mustAppend $commonFlags (printf "%s-registration" (ternary "enable" "disable" .Values.penpot.flags.registration)) }}
-{{- $commonFlags = mustAppend $commonFlags (printf "%s-demo-users" (ternary "enable" "disable" .Values.penpot.flags.demo_users)) }}
-{{- $commonFlags = mustAppend $commonFlags (printf "%s-user-feedback" (ternary "enable" "disable" .Values.penpot.flags.user_feedback)) }}
-{{- $commonFlags = mustAppend $commonFlags (printf "%s-login-with-google" (ternary "enable" "disable" .Values.penpot.identity_providers.google.enabled)) }}
-{{- $commonFlags = mustAppend $commonFlags (printf "%s-login-with-github" (ternary "enable" "disable" .Values.penpot.identity_providers.github.enabled)) }}
-{{- $commonFlags = mustAppend $commonFlags (printf "%s-login-with-gitlab" (ternary "enable" "disable" .Values.penpot.identity_providers.gitlab.enabled)) }}
-{{- $commonFlags = mustAppend $commonFlags (printf "%s-login-with-oidc" (ternary "enable" "disable" .Values.penpot.identity_providers.oidc.enabled)) }}
-{{- $commonFlags = mustAppend $commonFlags (printf "%s-login-with-ldap" (ternary "enable" "disable" .Values.penpot.identity_providers.ldap.enabled)) }}
-
-enabled: true
-data:
-  PENPOT_TELEMETRY_ENABLED: {{ .Values.penpot.telemetry_enabled | quote }}
-  {{- with .Values.penpot.registration_domain_whitelist }}
-  PENPOT_REGISTRATION_DOMAIN_WHITELIST: {{ join "," . }}
-  {{- end }}
-  {{- if .Values.penpot.identity_providers.google.enabled }}
-  PENPOT_GOOGLE_CLIENT_ID: {{ .Values.penpot.identity_providers.google.client_id | quote }}
-  PENPOT_GOOGLE_CLIENT_SECRET: {{ .Values.penpot.identity_providers.google.client_secret | quote }}
-  {{- end }}
-  {{- if .Values.penpot.identity_providers.github.enabled }}
-  PENPOT_GITHUB_CLIENT_ID: {{ .Values.penpot.identity_providers.github.client_id | quote }}
-  PENPOT_GITHUB_CLIENT_ID: {{ .Values.penpot.identity_providers.github.client_secret | quote }}
-  {{- end }}
-  {{- if .Values.penpot.identity_providers.gitlab.enabled }}
-  PENPOT_GITLAB_BASE_URI: {{ .Values.penpot.identity_providers.gitlab.base_uri | quote }}
-  PENPOT_GITLAB_CLIENT_ID: {{ .Values.penpot.identity_providers.gitlab.client_id | quote }}
-  PENPOT_GITLAB_CLIENT_SECRET: {{ .Values.penpot.identity_providers.gitlab.client_secret | quote }}
-  {{- end }}
-  {{- if .Values.penpot.identity_providers.oidc.enabled }}
-  PENPOT_OIDC_BASE_URI: {{ .Values.penpot.identity_providers.oidc.base_uri | quote }}
-  PENPOT_OIDC_CLIENT_ID: {{ .Values.penpot.identity_providers.oidc.client_id | quote }}
-  PENPOT_OIDC_CLIENT_SECRET: {{ .Values.penpot.identity_providers.oidc.client_secret | quote }}
-  {{- end }}
-  {{- if .Values.penpot.identity_providers.ldap.enabled }}
-  PENPOT_LDAP_HOST: {{ .Values.penpot.identity_providers.ldap.host | quote }}
-  PENPOT_LDAP_PORT: {{ .Values.penpot.identity_providers.ldap.port | quote }}
-  PENPOT_LDAP_SSL: {{ .Values.penpot.identity_providers.ldap.ssl | quote }}
-  PENPOT_LDAP_STARTTLS: {{ .Values.penpot.identity_providers.ldap.starttls | quote }}
-  PENPOT_LDAP_BASE_DN: {{ .Values.penpot.identity_providers.ldap.base_dn | quote }}
-  PENPOT_LDAP_BIND_DN: {{ .Values.penpot.identity_providers.ldap.bind_dn | quote }}
-  PENPOT_LDAP_BIND_PASSWORD: {{ .Values.penpot.identity_providers.ldap.bind_pass | quote }}
-  PENPOT_LDAP_ATTRS_USERNAME: {{ .Values.penpot.identity_providers.ldap.attrs_username | quote }}
-  PENPOT_LDAP_ATTRS_EMAIL: {{ .Values.penpot.identity_providers.ldap.attrs_email | quote }}
-  PENPOT_LDAP_ATTRS_FULLNAME: {{ .Values.penpot.identity_providers.ldap.attrs_fullname | quote }}
-  {{- end }}
-enabled: true
-data:
-  PENPOT_PUBLIC_URI: http://penpot-frontend:{{ .Values.service.main.ports.main.targetPort }}
-enabled: true
-data:
-  PENPOT_FLAGS: {{ join " " (concat $commonFlags $backendFlags) | quote }}
-  PENPOT_PUBLIC_URI: {{ .Values.penpot.public_uri | quote }}
-  {{- with (lookup "v1" "Secret" .Release.Namespace $backendAndExporterSecretName) }}
-  PENPOT_SECRET_KEY: {{ index .data "PENPOT_SECRET_KEY" }}
-  {{- else }}
-  PENPOT_SECRET_KEY: {{ randAlphaNum 32 }}
-  {{- end }}
-  {{/* Dependencies */}}
-  PENPOT_DATABASE_URI: {{ printf "postgresql://%v/%v" (.Values.cnpg.main.url.plainport | trimAll "\"") .Values.cnpg.main.database }}
-  PENPOT_DATABASE_USERNAME: {{ .Values.cnpg.main.user }}
-  PENPOT_DATABASE_PASSWORD: {{ .Values.cnpg.main.creds.password | trimAll "\"" }}
-  PENPOT_REDIS_URI: {{ printf "redis://%v:%v@%v/%v" "default" (.Values.redis.redisPassword | trimAll "\"") (.Values.redis.url.plainport | trimAll "\"") "0" }}
-  {{/* Penpot */}}
-  {{- if .Values.penpot.smtp.enabled }}
-  PENPOT_SMTP_DEFAULT_FROM: {{ .Values.penpot.smtp.default_from | quote }}
-  PENPOT_SMTP_DEFAULT_REPLY_TO: {{ .Values.penpot.smtp.default_reply_to | quote }}
-  PENPOT_SMTP_HOST: {{ .Values.penpot.smtp.host | quote }}
-  PENPOT_SMTP_PORT: {{ .Values.penpot.smtp.port | quote }}
-  PENPOT_SMTP_USERNAME: {{ .Values.penpot.smtp.user | quote }}
-  PENPOT_SMTP_PASSWORD: {{ .Values.penpot.smtp.pass | quote }}
-  PENPOT_SMTP_TLS: {{ .Values.penpot.smtp.tls | quote }}
-  PENPOT_SMTP_SSL: {{ .Values.penpot.smtp.ssl | quote }}
-  {{- end }}
-  PENPOT_STORAGE_ASSETS_FS_DIRECTORY: {{ .Values.persistence.assets.mountPath }}
-  PENPOT_ASSETS_STORAGE_BACKEND: assets-fs
-  PENPOT_HTTP_SERVER_HOST: "0.0.0.0"
-enabled: true
-data:
-  PENPOT_PUBLIC_URI: {{ .Values.penpot.public_uri | quote }}
-  PENPOT_FLAGS: {{ join " " (concat $commonFlags $frontendFlags) | quote }}
-{{- end }}

charts/dev/penpot/templates/common.yaml

@@ -1,10 +0,0 @@
-{{/* Make sure all variables are set properly */}}
-{{- include "tc.v1.common.loader.init" . }}
-
-{{- include "penpot.secret" . -}}
-
-{{- $_ := set .Values.additionalContainers "backend" (include "penpot.backend" . | fromYaml) -}}
-{{- $_ := set .Values.additionalContainers "exporter" (include "penpot.exporter" . | fromYaml) -}}
-
-{{/* Render the templates */}}
-{{ include "tc.v1.common.loader.apply" . }}

charts/incubator/penpot/Chart.yaml

@@ -1,7 +1,7 @@
 kubeVersion: ">=1.24.0-0"
 apiVersion: v2
 name: penpot
-version: 4.0.12
+version: 5.0.0
 appVersion: 1.19.3
 description: Open Source design and prototyping platform.
 home: https://truecharts.org/charts/incubator/penpot

charts/incubator/penpot/questions.yaml

@@ -400,9 +400,9 @@ questions:
 # Include{serviceExpert}
 # Include{serviceList}
 # Include{persistenceRoot}
-        - variable: data
-          label: App Data Storage
-          description: Stores the Application Data.
+        - variable: assets
+          label: App Assets Storage
+          description: Stores the Application Assets.
           schema:
             additional_attrs: true
             type: dict

charts/incubator/penpot/templates/_secret.tpl

@@ -0,0 +1,96 @@
+{{/* Define the secret */}}
+{{- define "penpot.secret" -}}
+
+{{- $backendAndExporterSecretName := printf "%s-backend" (include "tc.v1.common.lib.chart.names.fullname" .) }}
+
+{{- $backendFlags := list }}
+{{- $backendFlags = mustAppend $backendFlags (printf "%s-smtp" (ternary "enable" "disable" .Values.penpot.smtp.enabled)) }}
+{{- $backendFlags = mustAppend $backendFlags (printf "%s-email-verification" (ternary "enable" "disable" .Values.penpot.flags.mail_verification)) }}
+{{- $backendFlags = mustAppend $backendFlags (printf "%s-log-invitation-tokens" (ternary "enable" "disable" .Values.penpot.flags.log_invitation_token)) }}
+{{- $backendFlags = mustAppend $backendFlags (printf "%s-log-emails" (ternary "enable" "disable" (and .Values.penpot.flags.log_emails (not .Values.penpot.smtp.enabled)))) }}
+{{- $backendFlags = mustAppend $backendFlags (printf "%s-secure-session-cookies" (ternary "enable" "disable" .Values.penpot.flags.secure_session_cookies)) }}
+{{- $backendFlags = mustAppend $backendFlags (printf "%s-insecure-register" (ternary "enable" "disable" .Values.penpot.flags.insecure_register)) }}
+{{- $backendFlags = mustAppend $backendFlags (printf "%s-cors" (ternary "enable" "disable" .Values.penpot.flags.backend_api_doc)) }}
+{{- $backendFlags = mustAppend $backendFlags (printf "%s-backend-api-doc" (ternary "enable" "disable" .Values.penpot.flags.backend_api_doc)) }}
+
+
+
+{{- $commonFlags := list }}
+{{- $commonFlags = mustAppend $commonFlags (printf "%s-login" (ternary "enable" "disable" .Values.penpot.flags.login)) }}
+{{- $commonFlags = mustAppend $commonFlags (printf "%s-registration" (ternary "enable" "disable" .Values.penpot.flags.registration)) }}
+{{- $commonFlags = mustAppend $commonFlags (printf "%s-demo-users" (ternary "enable" "disable" .Values.penpot.flags.demo_users)) }}
+{{- $commonFlags = mustAppend $commonFlags (printf "%s-user-feedback" (ternary "enable" "disable" .Values.penpot.flags.user_feedback)) }}
+{{- $commonFlags = mustAppend $commonFlags (printf "%s-login-with-google" (ternary "enable" "disable" .Values.penpot.identity_providers.google.enabled)) }}
+{{- $commonFlags = mustAppend $commonFlags (printf "%s-login-with-github" (ternary "enable" "disable" .Values.penpot.identity_providers.github.enabled)) }}
+{{- $commonFlags = mustAppend $commonFlags (printf "%s-login-with-gitlab" (ternary "enable" "disable" .Values.penpot.identity_providers.gitlab.enabled)) }}
+{{- $commonFlags = mustAppend $commonFlags (printf "%s-login-with-oidc" (ternary "enable" "disable" .Values.penpot.identity_providers.oidc.enabled)) }}
+{{- $commonFlags = mustAppend $commonFlags (printf "%s-login-with-ldap" (ternary "enable" "disable" .Values.penpot.identity_providers.ldap.enabled)) }}
+
+shared:
+  enabled: true
+  data:
+    PENPOT_TELEMETRY_ENABLED: {{ .Values.penpot.telemetry_enabled | quote }}
+    {{- with .Values.penpot.registration_domain_whitelist }}
+    PENPOT_REGISTRATION_DOMAIN_WHITELIST: {{ join "," . }}
+    {{- end }}
+    {{- if .Values.penpot.identity_providers.google.enabled }}
+    PENPOT_GOOGLE_CLIENT_ID: {{ .Values.penpot.identity_providers.google.client_id | quote }}
+    PENPOT_GOOGLE_CLIENT_SECRET: {{ .Values.penpot.identity_providers.google.client_secret | quote }}
+    {{- end }}
+    {{- if .Values.penpot.identity_providers.github.enabled }}
+    PENPOT_GITHUB_CLIENT_ID: {{ .Values.penpot.identity_providers.github.client_id | quote }}
+    PENPOT_GITHUB_CLIENT_ID: {{ .Values.penpot.identity_providers.github.client_secret | quote }}
+    {{- end }}
+    {{- if .Values.penpot.identity_providers.gitlab.enabled }}
+    PENPOT_GITLAB_BASE_URI: {{ .Values.penpot.identity_providers.gitlab.base_uri | quote }}
+    PENPOT_GITLAB_CLIENT_ID: {{ .Values.penpot.identity_providers.gitlab.client_id | quote }}
+    PENPOT_GITLAB_CLIENT_SECRET: {{ .Values.penpot.identity_providers.gitlab.client_secret | quote }}
+    {{- end }}
+    {{- if .Values.penpot.identity_providers.oidc.enabled }}
+    PENPOT_OIDC_BASE_URI: {{ .Values.penpot.identity_providers.oidc.base_uri | quote }}
+    PENPOT_OIDC_CLIENT_ID: {{ .Values.penpot.identity_providers.oidc.client_id | quote }}
+    PENPOT_OIDC_CLIENT_SECRET: {{ .Values.penpot.identity_providers.oidc.client_secret | quote }}
+    {{- end }}
+    {{- if .Values.penpot.identity_providers.ldap.enabled }}
+    PENPOT_LDAP_HOST: {{ .Values.penpot.identity_providers.ldap.host | quote }}
+    PENPOT_LDAP_PORT: {{ .Values.penpot.identity_providers.ldap.port | quote }}
+    PENPOT_LDAP_SSL: {{ .Values.penpot.identity_providers.ldap.ssl | quote }}
+    PENPOT_LDAP_STARTTLS: {{ .Values.penpot.identity_providers.ldap.starttls | quote }}
+    PENPOT_LDAP_BASE_DN: {{ .Values.penpot.identity_providers.ldap.base_dn | quote }}
+    PENPOT_LDAP_BIND_DN: {{ .Values.penpot.identity_providers.ldap.bind_dn | quote }}
+    PENPOT_LDAP_BIND_PASSWORD: {{ .Values.penpot.identity_providers.ldap.bind_pass | quote }}
+    PENPOT_LDAP_ATTRS_USERNAME: {{ .Values.penpot.identity_providers.ldap.attrs_username | quote }}
+    PENPOT_LDAP_ATTRS_EMAIL: {{ .Values.penpot.identity_providers.ldap.attrs_email | quote }}
+    PENPOT_LDAP_ATTRS_FULLNAME: {{ .Values.penpot.identity_providers.ldap.attrs_fullname | quote }}
+    {{- end }}
+  
+backend:
+  enabled: true
+  data:
+    PENPOT_FLAGS: {{ join " " (concat $commonFlags $backendFlags) | quote }}
+    PENPOT_PUBLIC_URI: {{ .Values.penpot.public_uri | quote }}
+    {{- with (lookup "v1" "Secret" .Release.Namespace $backendAndExporterSecretName) }}
+    PENPOT_SECRET_KEY: {{ index .data "PENPOT_SECRET_KEY" | b64dec }}
+    {{- else }}
+    PENPOT_SECRET_KEY: {{ randAlphaNum 32 }}
+    {{- end }}
+    {{/* Dependencies */}}
+    PENPOT_DATABASE_USERNAME: {{ .Values.cnpg.main.user }}
+    PENPOT_DATABASE_PASSWORD: {{ .Values.cnpg.main.creds.password | trimAll "\"" }}
+    {{/* Penpot */}}
+    {{- if .Values.penpot.smtp.enabled }}
+    PENPOT_SMTP_DEFAULT_FROM: {{ .Values.penpot.smtp.default_from | quote }}
+    PENPOT_SMTP_DEFAULT_REPLY_TO: {{ .Values.penpot.smtp.default_reply_to | quote }}
+    PENPOT_SMTP_HOST: {{ .Values.penpot.smtp.host | quote }}
+    PENPOT_SMTP_PORT: {{ .Values.penpot.smtp.port | quote }}
+    PENPOT_SMTP_USERNAME: {{ .Values.penpot.smtp.user | quote }}
+    PENPOT_SMTP_PASSWORD: {{ .Values.penpot.smtp.pass | quote }}
+    PENPOT_SMTP_TLS: {{ .Values.penpot.smtp.tls | quote }}
+    PENPOT_SMTP_SSL: {{ .Values.penpot.smtp.ssl | quote }}
+    {{- end }}
+    PENPOT_STORAGE_ASSETS_FS_DIRECTORY: {{ .Values.persistence.assets.mountPath }}
+    PENPOT_ASSETS_STORAGE_BACKEND: assets-fs
+    PENPOT_HTTP_SERVER_HOST: "0.0.0.0"
+
+
+{{- end }}

charts/incubator/penpot/templates/common.yaml

@@ -0,0 +1,7 @@
+{{/* Make sure all variables are set properly */}}
+{{- include "tc.v1.common.loader.init" . }}
+
+{{- $_ := set .Values "secret" (include "penpot.secret" . | fromYaml) -}}
+
+{{/* Render the templates */}}
+{{ include "tc.v1.common.loader.apply" . }}

charts/incubator/penpot/values.yaml

@@ -1,3 +1,7 @@
+image:
+  pullPolicy: IfNotPresent
+  repository: penpotapp/frontend
+  tag: 1.19.3@sha256:cfc31dd9d63ec92759dc66b19da5401896748c6ec96ce1f3b06a21604eaa16e9
 backendImage:
   pullPolicy: IfNotPresent
   repository: penpotapp/backend
@@ -6,16 +10,14 @@ exporterImage:
   pullPolicy: IfNotPresent
   repository: penpotapp/exporter
   tag: 1.19.3@sha256:e113a685d07bff470a2e75acab61fd61c5b24185d8931fd19b65d1f622061823
+  
 hostAliases:
   - hostnames:
       - penpot-backend
       - penpot-exporter
       - penpot-frontend
     ip: 127.0.0.1
-image:
-  pullPolicy: IfNotPresent
-  repository: penpotapp/frontend
-  tag: 1.19.3@sha256:cfc31dd9d63ec92759dc66b19da5401896748c6ec96ce1f3b06a21604eaa16e9
+
 penpot:
   flags:
     backend_api_doc: false
@@ -74,14 +76,13 @@ penpot:
     tls: true
     user: ""
   telemetry_enabled: false
+  
 persistence:
   assets:
     enabled: true
     mountPath: /opt/data/assets
-  data:
-    enabled: true
-    mountPath: /opt/data
-    noMount: true
+    targetSelectAll: true
+
 portal:
   open:
     enabled: true
@@ -92,8 +93,7 @@ cnpg:
     user: penpot
 redis:
   enabled: true
-  existingSecret: rediscreds
-  redisUsername: penpot
+  
 securityContext:
   container:
     readOnlyRootFilesystem: false
@@ -111,11 +111,14 @@ workload:
     podSpec:
       containers:
         main:
+          env:
+            PENPOT_PUBLIC_URI: "{{ .Values.penpot.public_uri | quote }}"
+            PENPOT_FLAGS: '{{ $frontendFlags := list }}{{ $frontendFlags = mustAppend $frontendFlags (printf "%s-demo-warning" (ternary "enable" "disable" .Values.penpot.flags.demo_warning)) }}{{ join " " (concat $commonFlags $frontendFlags) | quote }}'
           envFrom:
             - secretRef:
-                name: "common-secret"
+                name: "shared"
             - secretRef:
-                name: "frontend-secret"
+                name: "frontend"
           probes:
             liveness:
               path: /
@@ -126,3 +129,53 @@ workload:
             startup:
               path: /
               type: http
+        exporter:
+          imageSelector: exporterImage
+          env:
+            PENPOT_PUBLIC_URI: "http://penpot-frontend:{{ .Values.service.main.ports.main.targetPort }}"
+            PENPOT_REDIS_URI:
+              secretKeyRef:
+                name: rediscreds
+                key: url
+          envFrom:
+            - secretRef:
+                name: 'shared'
+            - secretRef:
+                name: 'exporter'
+          probes:
+            liveness:
+              port: 6061
+              type: tcp
+            readiness:
+              port: 6061
+              type: tcp
+            startup:
+              port: 6061
+              type: tcp
+        backend:
+          imageSelector: backendImage
+          envFrom:
+            - secretRef:
+                name: 'shared'
+            - secretRef:
+                name: 'backend'
+          env:
+            PENPOT_DATABASE_URI:
+              secretKeyRef:
+                name: cnpg-main-urls
+                key: std
+            PENPOT_REDIS_URI:
+              secretKeyRef:
+                name: rediscreds
+                key: url
+          probes:
+            liveness:
+              port: 6060
+              type: tcp
+            readiness:
+              port: 6060
+              type: tcp
+            startup:
+              port: 6060
+              type: tcp
+