diff --git a/k8s/templates/backend.yaml b/k8s/templates/backend.yaml index bd5da3fc962d3cd0ab349fa05cf5851d161acd2b..10b01781278e25215f55c4844ef02046fba948da 100644 --- a/k8s/templates/backend.yaml +++ b/k8s/templates/backend.yaml @@ -15,29 +15,10 @@ spec: app: {{ .Release.Name }}-backend spec: initContainers: - - name: volume-permission-fix - image: busybox - command: - - "sh" - - "-c" - - | - chown -R 1000:1000 /mediafiles - chown -R 1000:1000 /staticfiles - volumeMounts: - - name: kszkepzes-media-volume - mountPath: /mediafiles - - name: kszkepzes-static-volume - mountPath: /staticfiles - resources: - limits: - memory: 30Mi - name: kszkepzes-backend-collectstatic image: {{ .Values.backend.image }}:{{ .Values.backend.tag }} imagePullPolicy: "Always" command: ["python", "manage.py", "collectstatic", "--noinput"] - volumeMounts: - - mountPath: /home/app/kszkepzes-backend/staticfiles - name: kszkepzes-static-volume envFrom: - configMapRef: name: {{ .Release.Name }}-config @@ -62,11 +43,6 @@ spec: - name: kszkepzes-backend image: {{ .Values.backend.image }}:{{ .Values.backend.tag }} imagePullPolicy: "Always" - volumeMounts: - - mountPath: /home/app/kszkepzes-backend/mediafiles - name: kszkepzes-media-volume - - mountPath: /home/app/kszkepzes-backend/staticfiles - name: kszkepzes-static-volume ports: - containerPort: 8000 envFrom: @@ -101,11 +77,6 @@ spec: runAsGroup: 1000 image: halverneus/static-file-server:latest imagePullPolicy: "Always" - volumeMounts: - - mountPath: /var/www/html/mediafiles - name: kszkepzes-media-volume - - mountPath: /var/www/html/staticfiles - name: kszkepzes-static-volume ports: - containerPort: 8080 env: @@ -121,13 +92,6 @@ spec: limits: memory: 200Mi cpu: "2" - volumes: - - name: kszkepzes-media-volume - persistentVolumeClaim: - claimName: {{ .Release.Name }}-media-pv-claim - - name: kszkepzes-static-volume - persistentVolumeClaim: - claimName: {{ .Release.Name }}-static-pv-claim imagePullSecrets: - name: {{ .Values.backend.imagePullSecretName }} --- @@ -188,35 +152,6 @@ spec: --- apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - labels: - app: {{ .Release.Name }} - name: {{ .Release.Name }}-media-pv-claim -spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 10Gi - storageClassName: {{ .Values.backend.storageClassName }} - ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - labels: - app: {{ .Release.Name }} - name: {{ .Release.Name }}-static-pv-claim -spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 1Gi - storageClassName: {{ .Values.backend.storageClassName }} ---- -apiVersion: v1 kind: ConfigMap metadata: name: {{ .Release.Name }}-config diff --git a/k8s/templates/minio.yaml b/k8s/templates/minio.yaml index 79cd6172fbe0c7d76418b43f4aed4542ecf7ef8c..8e5d9dc10e2b53c796abf2fb154831db136375fe 100644 --- a/k8s/templates/minio.yaml +++ b/k8s/templates/minio.yaml @@ -38,7 +38,7 @@ spec: name: {{ .Release.Name }}-minio-credentials key: MINIO_ROOT_PASSWORD volumeMounts: - - mountPath: /var/lib/minioql/data + - mountPath: /data name: kszkepzes-minio-volume resources: requests: