feat: add new image (based on bitnami/tomcat) with proper config

Author: pmoscode

templates/NOTES.txt

@@ -1,5 +1,6 @@
 1. Get the application URL by running these commands:
 {{- if .Values.ingress.enabled }}
+   Just point to this URL in your browser:
 {{- range $host := .Values.ingress.hosts }}
   {{- range .paths }}
   http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }}

templates/configmap.yaml

@@ -16,9 +16,9 @@ data:
   AXELOR_CONFIG_APPLICATION_HOME: "localhost"
   AXELOR_CONFIG_APPLICATION_BASE-URL: "localhost"
   {{- end }}
-  AXELOR_CONFIG_APPLICATION_MODE: "{{ .Values.config.applicationMode }}"
-  AXELOR_CONFIG_APPLICATION_LOCALE: "{{ .Values.config.applicationLocale }}"
-  AXELOR_CONFIG_DATA_UPLOAD_DIR: "/home/axelor/.axelor/attachments"
-  AXELOR_CONFIG_DATA_UPLOAD_MAX-SIZE: "{{ .Values.config.maxUploadSize }}"
-  AXELOR_CONFIG_DATA_EXPORT_DIR: "/home/axelor/.axelor/export"
-  AXELOR_CONFIG_DATA_IMPORT_DEMO-DATA: "{{ .Values.config.importDemoData}}"
+  AXELOR_CONFIG_APPLICATION_MODE: "{{ .Values.axelor.applicationMode }}"
+  AXELOR_CONFIG_APPLICATION_LOCALE: "{{ .Values.axelor.applicationLocale }}"
+  AXELOR_CONFIG_DATA_UPLOAD_DIR: "/opt/data/attachments"
+  AXELOR_CONFIG_DATA_UPLOAD_MAX-SIZE: "{{ .Values.axelor.maxUploadSize }}"
+  AXELOR_CONFIG_DATA_EXPORT_DIR: "/opt/data/export"
+  AXELOR_CONFIG_DATA_IMPORT_DEMO-DATA: "{{ .Values.axelor.importDemoData}}"

templates/deployment.yaml

@@ -9,6 +9,8 @@ spec:
   selector:
     matchLabels:
       {{- include "axelor-open-suite.selectorLabels" . | nindent 6 }}
+  strategy:
+    type: Recreate
   template:
     metadata:
       {{- with .Values.podAnnotations }}
@@ -31,21 +33,29 @@ spec:
             - configMapRef:
                 name: {{ include "axelor-open-suite.fullname" . }}
           env:
+            - name: BITNAMI_DEBUG
+              value: "false"
+            - name: TOMCAT_USERNAME
+              value: "user"
+            - name: TOMCAT_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ include "axelor-open-suite.fullname" . }}-tomcat
+                  key: tomcat-password
+            - name: TOMCAT_ALLOW_REMOTE_MANAGEMENT
+              value: "0"
             - name: AXELOR_CONFIG_DB_DEFAULT_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  key: password
                   name: {{ .Release.Name }}-postgresql
+                  key: password
           volumeMounts:
             - name: {{ include "axelor-open-suite.fullname" . }}-data
-              subPath: attachments
-              mountPath: /home/axelor/.axelor/attachments
+              subPath: tomcat
+              mountPath: /bitnami/tomcat
             - name: {{ include "axelor-open-suite.fullname" . }}-data
-              subPath: export
-              mountPath: /home/axelor/.axelor/export
-{{/*            - name: {{ include "axelor-open-suite.fullname" . }}-data*/}}
-{{/*              subPath: tomcat*/}}
-{{/*              mountPath: /usr/local/tomcat/webapps*/}}
+              subPath: axelor
+              mountPath: /opt/data/
           ports:
             - name: http
               containerPort: 8080

templates/pvc.yaml

@@ -1,8 +1,10 @@
-{{- if and .Values.persistence.enabled (not .Values.persistence.existingClaim) }}
+{{- if .Values.persistence.enabled }}
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   name: {{ include "axelor-open-suite.fullname" . }}-data
+  labels:
+      {{- include "axelor-open-suite.labels" . | nindent 4 }}
 spec:
   {{- if .Values.persistence.storageClass }}
   storageClassName: {{ .Values.persistence.storageClass | quote }}

templates/secret.yaml

@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "axelor-open-suite.fullname" . }}-tomcat
+  labels:
+    {{- include "axelor-open-suite.labels" . | nindent 4 }}
+type: Opaque
+data:
+  tomcat-password: {{ randAlphaNum 10 | b64enc | quote }}

values.yaml

@@ -1,12 +1,12 @@
 image:
   repository: pmoscode/axelor-open-suite
-  pullPolicy: IfNotPresent
+  pullPolicy: Always
   tag: ""
 
 nameOverride: ""
 fullnameOverride: ""
 
-config:
+axelor:
   applicationMode: dev # or prod
   applicationLocale: de_DE
   maxUploadSize: 100 # in MB
@@ -23,15 +23,14 @@ serviceAccount:
 
 podAnnotations: {}
 
-podSecurityContext: {}
-  # fsGroup: 2000
+podSecurityContext:
+  fsGroup: 1001
 
 securityContext:
   runAsNonRoot: true
   privileged: false
   allowPrivilegeEscalation: false
-  runAsUser: 10101
-  runAsGroup: 10101
+  runAsUser: 1001
 
 service:
   type: ClusterIP
@@ -41,8 +40,8 @@ ingress:
   enabled: false
   className: ""
   annotations:
-    nginx.org/proxy-read-timeout: "360s"
-    nginx.org/proxy-send-timeout: "360s"
+    nginx.ingress.kubernetes.io/proxy-send-timeout: "1800"
+    nginx.ingress.kubernetes.io/proxy-read-timeout: "1800"
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"
   hosts:
@@ -55,17 +54,13 @@ ingress:
   #    hosts:
   #      - chart-example.local
 
-resources: {}
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+resources:
+   requests:
+     cpu: 300m
+     memory: 512Mi
   # limits:
   #   cpu: 100m
   #   memory: 128Mi
-  # requests:
-  #   cpu: 100m
-  #   memory: 128Mi
 
 nodeSelector: {}
 
@@ -76,9 +71,9 @@ affinity: {}
 persistence:
   enabled: false
   existingClaim: ""
-  storageClass: "-"
+  storageClass: ""
   accessMode: ReadWriteOnce
-  size: 50G
+  size: 50Gi
 
 postgresql:
   enabled: true