Commit 2415e7ed authored by Dominik Hebeler's avatar Dominik Hebeler

fixed deployment

parent 948f164c
...@@ -45,7 +45,6 @@ spec: ...@@ -45,7 +45,6 @@ spec:
imagePullSecrets: imagePullSecrets:
{{ toYaml .Values.image.secrets | indent 10 }} {{ toYaml .Values.image.secrets | indent 10 }}
containers: containers:
# PHP FPM
- name: {{ .Chart.Name }}-phpfpm - name: {{ .Chart.Name }}-phpfpm
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }} imagePullPolicy: {{ .Values.image.pullPolicy }}
...@@ -56,69 +55,69 @@ spec: ...@@ -56,69 +55,69 @@ spec:
{{- end }} {{- end }}
env: env:
- name: DATABASE_URL - name: DATABASE_URL
value: {{ .Values.application.database_url | quote }} value: {{ .Values.application.database_url | quote }}
- name: GITLAB_ENVIRONMENT_NAME - name: GITLAB_ENVIRONMENT_NAME
value: {{ .Values.gitlab.envName }} value: {{ .Values.gitlab.envName }}
- name: GITLAB_ENVIRONMENT_URL - name: GITLAB_ENVIRONMENT_URL
value: {{ .Values.gitlab.envURL }} value: {{ .Values.gitlab.envURL }}
ports: ports:
- name: "{{ .Values.service.name }}-phpfpm" - name: "{{ .Values.service.name }}-phpfpm"
containerPort: 9000 containerPort: 9000
livenessProbe: livenessProbe:
tcpSocket: tcpSocket:
port: "{{ .Values.service.name }}-phpfpm" port: "{{ .Values.service.name }}-phpfpm"
initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }} initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }} timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
readinessProbe: readinessProbe:
tcpSocket: tcpSocket:
port: "{{ .Values.service.name }}-phpfpm" port: "{{ .Values.service.name }}-phpfpm"
initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }} initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }} timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
volumeMounts: volumeMounts:
- name: mglogs-persistent-storage - name: mglogs-persistent-storage
mountPath: /html/storage/logs/metager mountPath: /html/storage/logs/metager
readOnly: false readOnly: false
- name: env-files - name: env-files
mountPath: /root/.env mountPath: /root/.env
subPath: .env subPath: .env
readOnly: true readOnly: true
- name: env-files - name: env-files
mountPath: /html/database/seeds/UsersSeeder.php mountPath: /html/database/seeds/UsersSeeder.php
subPath: UsersSeeder.php subPath: UsersSeeder.php
readOnly: true readOnly: true
- name: env-files - name: env-files
mountPath: /html/config/spam.txt mountPath: /html/config/spam.txt
subPath: spam.txt subPath: spam.txt
readOnly: true readOnly: true
- name: sumas - name: sumas
mountPath: /html/config/sumas.json mountPath: /html/config/sumas.json
subPath: sumas.json subPath: sumas.json
readOnly: true readOnly: true
- name: sumas-en - name: sumas-en
mountPath: /html/config/sumasEn.json mountPath: /html/config/sumasEn.json
subPath: sumasEn.json subPath: sumasEn.json
readOnly: true readOnly: true
- name: blacklist - name: blacklist
mountPath: /html/config/blacklistUrl.txt mountPath: /html/config/blacklistUrl.txt
subPath: blacklistUrl.txt subPath: blacklistUrl.txt
readOnly: true readOnly: true
- name: blacklist - name: blacklist
mountPath: /html/config/blacklistDomains.txt mountPath: /html/config/blacklistDomains.txt
subPath: blacklistDomains.txt subPath: blacklistDomains.txt
readOnly: true readOnly: true
- name: blacklist-ad - name: blacklist-ad
mountPath: /html/config/adBlacklistUrl.txt mountPath: /html/config/adBlacklistUrl.txt
subPath: adBlacklistUrl.txt subPath: adBlacklistUrl.txt
readOnly: true readOnly: true
- name: blacklist-ad - name: blacklist-ad
mountPath: /html/config/adBlacklistDomains.txt mountPath: /html/config/adBlacklistDomains.txt
subPath: adBlacklistDomains.txt subPath: adBlacklistDomains.txt
readOnly: true readOnly: true
resources: resources:
requests: requests:
cpu: 500m cpu: 500m
memory: 500m memory: 500m
# Nginx Container # Nginx Container
- name: {{ .Chart.Name }}-nginx - name: {{ .Chart.Name }}-nginx
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
command: ["nginx"] command: ["nginx"]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment