Skip to content
Snippets Groups Projects
Commit 08f6c840 authored by Pomucz Tamás András's avatar Pomucz Tamás András
Browse files

k8s fixes

parent 1f17d0c5
Branches
Tags v1.8.0
1 merge request!15Many stuff
Pipeline #50423 passed with warnings
...@@ -15,29 +15,10 @@ spec: ...@@ -15,29 +15,10 @@ spec:
app: {{ .Release.Name }}-backend app: {{ .Release.Name }}-backend
spec: spec:
initContainers: 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 - name: kszkepzes-backend-collectstatic
image: {{ .Values.backend.image }}:{{ .Values.backend.tag }} image: {{ .Values.backend.image }}:{{ .Values.backend.tag }}
imagePullPolicy: "Always" imagePullPolicy: "Always"
command: ["python", "manage.py", "collectstatic", "--noinput"] command: ["python", "manage.py", "collectstatic", "--noinput"]
volumeMounts:
- mountPath: /home/app/kszkepzes-backend/staticfiles
name: kszkepzes-static-volume
envFrom: envFrom:
- configMapRef: - configMapRef:
name: {{ .Release.Name }}-config name: {{ .Release.Name }}-config
...@@ -62,11 +43,6 @@ spec: ...@@ -62,11 +43,6 @@ spec:
- name: kszkepzes-backend - name: kszkepzes-backend
image: {{ .Values.backend.image }}:{{ .Values.backend.tag }} image: {{ .Values.backend.image }}:{{ .Values.backend.tag }}
imagePullPolicy: "Always" imagePullPolicy: "Always"
volumeMounts:
- mountPath: /home/app/kszkepzes-backend/mediafiles
name: kszkepzes-media-volume
- mountPath: /home/app/kszkepzes-backend/staticfiles
name: kszkepzes-static-volume
ports: ports:
- containerPort: 8000 - containerPort: 8000
envFrom: envFrom:
...@@ -101,11 +77,6 @@ spec: ...@@ -101,11 +77,6 @@ spec:
runAsGroup: 1000 runAsGroup: 1000
image: halverneus/static-file-server:latest image: halverneus/static-file-server:latest
imagePullPolicy: "Always" imagePullPolicy: "Always"
volumeMounts:
- mountPath: /var/www/html/mediafiles
name: kszkepzes-media-volume
- mountPath: /var/www/html/staticfiles
name: kszkepzes-static-volume
ports: ports:
- containerPort: 8080 - containerPort: 8080
env: env:
...@@ -121,13 +92,6 @@ spec: ...@@ -121,13 +92,6 @@ spec:
limits: limits:
memory: 200Mi memory: 200Mi
cpu: "2" 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: imagePullSecrets:
- name: {{ .Values.backend.imagePullSecretName }} - name: {{ .Values.backend.imagePullSecretName }}
--- ---
...@@ -188,35 +152,6 @@ spec: ...@@ -188,35 +152,6 @@ spec:
--- ---
apiVersion: v1 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 kind: ConfigMap
metadata: metadata:
name: {{ .Release.Name }}-config name: {{ .Release.Name }}-config
......
...@@ -38,7 +38,7 @@ spec: ...@@ -38,7 +38,7 @@ spec:
name: {{ .Release.Name }}-minio-credentials name: {{ .Release.Name }}-minio-credentials
key: MINIO_ROOT_PASSWORD key: MINIO_ROOT_PASSWORD
volumeMounts: volumeMounts:
- mountPath: /var/lib/minioql/data - mountPath: /data
name: kszkepzes-minio-volume name: kszkepzes-minio-volume
resources: resources:
requests: requests:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment