diff --git a/charts/stable/inventree/Chart.yaml b/charts/stable/inventree/Chart.yaml index 44ec9b9033b..b124b0d2b51 100644 --- a/charts/stable/inventree/Chart.yaml +++ b/charts/stable/inventree/Chart.yaml @@ -28,7 +28,7 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/stable/inventree - https://inventree.readthedocs.io - https://github.com/inventree/InvenTree -version: 4.0.6 +version: 4.0.7 annotations: truecharts.org/catagories: | - utilities diff --git a/charts/stable/inventree/templates/_configmap.tpl b/charts/stable/inventree/templates/_configmap.tpl index 26973f6c1dc..5e44974aec8 100644 --- a/charts/stable/inventree/templates/_configmap.tpl +++ b/charts/stable/inventree/templates/_configmap.tpl @@ -2,6 +2,8 @@ {{- define "inventree.config" -}} {{- $configName := printf "%s-inventree-config" (include "tc.common.names.fullname" .) }} +{{- $nginxConfigName := printf "%s-inventree-config-nginx" (include "tc.common.names.fullname" .) }} + --- apiVersion: v1 @@ -51,6 +53,14 @@ data: {{- with .Values.inventree.general.login_attempts }} INVENTREE_LOGIN_ATTEMPTS: {{ . | quote }} {{- end }} +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ $nginxConfigName }} + labels: + {{- include "tc.common.labels" . | nindent 4 }} +data: nginx.conf: |- server { listen {{ .Values.service.main.ports.main.port }}; diff --git a/charts/stable/inventree/templates/_nginx.tpl b/charts/stable/inventree/templates/_nginx.tpl index 118866c6129..3fe31fc2977 100644 --- a/charts/stable/inventree/templates/_nginx.tpl +++ b/charts/stable/inventree/templates/_nginx.tpl @@ -1,19 +1,19 @@ {{/* Define the nginx container */}} {{- define "inventree.nginx" -}} image: {{ .Values.nginxImage.repository }}:{{ .Values.nginxImage.tag }} -imagePullPolicy: '{{ .Values.nginxImage.pullPolicy }}' -securityContext: - runAsUser: {{ .Values.podSecurityContext.runAsUser }} - runAsGroup: {{ .Values.podSecurityContext.runAsGroup }} - readOnlyRootFilesystem: {{ .Values.securityContext.readOnlyRootFilesystem }} - runAsNonRoot: {{ .Values.securityContext.runAsNonRoot }} +imagePullPolicy: {{ .Values.nginxImage.pullPolicy }} ports: - containerPort: {{ .Values.service.main.ports.main.port }} name: main +securityContext: + runAsUser: 0 + runAsGroup: {{ .Values.podSecurityContext.runAsGroup }} + readOnlyRootFilesystem: false + runAsNonRoot: false volumeMounts: - name: inventree-nginx mountPath: "/etc/nginx/conf.d/default.conf" - subPath: nginx.conf + subPath: default.conf readOnly: true - name: data mountPath: "/var/www" diff --git a/charts/stable/inventree/values.yaml b/charts/stable/inventree/values.yaml index a3423fb3599..20b04bd6e84 100644 --- a/charts/stable/inventree/values.yaml +++ b/charts/stable/inventree/values.yaml @@ -6,6 +6,7 @@ image: nginxImage: repository: tccr.io/truecharts/nginx tag: v1.23.1@sha256:1620254cd011e2b81361f1f4682fd6cceadf13b07f8e37f322b60407d6d5a766 + pullPolicy: IfNotPresent securityContext: readOnlyRootFilesystem: false @@ -53,13 +54,10 @@ persistence: enabled: true mountPath: "/home/inventree/data" inventree-nginx: - enabled: "true" + enabled: true noMount: true - subPath: "nginx.conf" - type: "custom" - volumeSpec: - configMap: - name: '{{ include "tc.common.names.fullname" . }}-inventree-config' + type: configMap + objectName: '{{ include "tc.common.names.fullname" . }}-inventree-config-nginx' postgresql: enabled: true diff --git a/charts/stable/wger/Chart.yaml b/charts/stable/wger/Chart.yaml index d84080135de..fb528759a69 100644 --- a/charts/stable/wger/Chart.yaml +++ b/charts/stable/wger/Chart.yaml @@ -27,7 +27,7 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/stable/wger - https://github.com/wger-project/wger - https://github.com/wger-project/docker -version: 1.1.0 +version: 1.1.1 annotations: truecharts.org/catagories: | - life diff --git a/charts/stable/wger/values.yaml b/charts/stable/wger/values.yaml index fa5cd2184d5..882f866e1a0 100644 --- a/charts/stable/wger/values.yaml +++ b/charts/stable/wger/values.yaml @@ -64,17 +64,10 @@ persistence: type: emptyDir mountPath: "/home/wger/static" wger-config: - enabled: "true" + enabled: true noMount: true - readOnly: true - type: "custom" - mountPath: "/etc/nginx/conf.d" - volumeSpec: - configMap: - name: '{{ include "tc.common.names.fullname" . }}-wger-nginx-config' - items: - - key: nginx.conf - path: default.conf + type: configMap + objectName: '{{ include "tc.common.names.fullname" . }}-wger-nginx-config' postgresql: enabled: true