Page MenuHomePhorge
Files F117749861

No OneTemporary
Actions

Authored By
Unknown
Size
4 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/kolab/templates/proxy-deployment.yaml b/kolab/templates/proxy-deployment.yaml
index b37e949..f5da9bb 100644
--- a/kolab/templates/proxy-deployment.yaml
+++ b/kolab/templates/proxy-deployment.yaml
@@ -1,122 +1,93 @@
{{- if .Values.proxy.enabled -}}
apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
alpha.image.policy.openshift.io/resolve-names: '*'
labels:
app: proxy
app.kubernetes.io/name: proxy
app.kubernetes.io/part-of: kolab-app
name: proxy
spec:
replicas: 1
revisionHistoryLimit: 10
selector:
matchLabels:
app: proxy
strategy:
type: Recreate
template:
metadata:
annotations:
checksum/config: {{ include (print $.Template.BasePath "/kolab-configmap.yaml") . | sha256sum }}
checksum/secret: {{ include (print $.Template.BasePath "/kolab-secret.yaml") . | sha256sum }}
checksum/proxyconfig: {{ include (print $.Template.BasePath "/proxy-configmap.yaml") . | sha256sum }}
labels:
app: proxy
spec:
volumes:
- name: proxy-config-volume
configMap:
defaultMode: 0644
name: proxy-config
items:
- key: nginx.conf
path: nginx.conf
- name: kolab-cert
secret:
{{- $secretName := include "kolab.tlsSecretName" . }}
secretName: {{ default .Values.proxy.tlsSecretName $secretName }}
{{- if .Values.image.pullSecret }}
imagePullSecrets:
- name: registry-pull-secret
{{- end }}
containers:
- name: proxy
image: {{ .Values.image.proxyImage }}
imagePullPolicy: {{ .Values.image.pullPolicy }}
resources:
{{- toYaml .Values.proxy.resources | nindent 10 }}
readinessProbe:
httpGet:
path: /health
port: 6443
scheme: HTTPS
initialDelaySeconds: 5
periodSeconds: 10
livenessProbe:
httpGet:
path: /health
port: 6443
scheme: HTTPS
initialDelaySeconds: 15
periodSeconds: 10
envFrom:
- configMapRef:
name: kolab-config
- secretRef:
name: kolab-config-secret
command: ["nginx"]
args: ["-c", "/nginx/nginx.conf", "-g", "daemon off;"]
-# env:
-# - name: APP_WEBSITE_DOMAIN
-# value: {{ template "kolab.websiteDomain" . }}
-# - name: SSL_CERTIFICATE
-# value: /etc/certs/tls.crt
-# - name: SSL_CERTIFICATE_KEY
-# value: /etc/certs/tls.key
-# - name: WEBAPP_BACKEND
-# value: {{ .Values.proxy.webappBackend }}
-# - name: MEET_BACKEND
-# value: {{ .Values.proxy.meetBackend }}
-# - name: ROUNDCUBE_BACKEND
-# value: {{ .Values.proxy.roundcubeBackend }}
-# - name: DAV_BACKEND
-# value: {{ .Values.proxy.davBackend }}
-# - name: DAV_PATH
-# value: {{ .Values.proxy.davPath }}
-# - name: COLLABORA_BACKEND
-# value: {{ .Values.proxy.collaboraBackend }}
-# - name: WEBMAIL_PATH
-# value: {{ .Values.proxy.webmailPath }}
-# - name: SIEVE_BACKEND
-# value: {{ .Values.proxy.sieveBackend }}
-# {{- if .Values.matrix.enabled }}
-# - name: MATRIX_BACKEND
-# value: {{ .Values.proxy.matrixBackend }}
-# - name: ELEMENT_BACKEND
-# value: {{ .Values.proxy.elementBackend }}
-# {{- end }}
ports:
- containerPort: 6993
protocol: TCP
- containerPort: 6143
protocol: TCP
- containerPort: 6190
protocol: TCP
- containerPort: 6443
protocol: TCP
terminationMessagePath: /dev/termination-log
terminationMessagePolicy: File
volumeMounts:
- name: kolab-cert
readOnly: true
mountPath: /etc/certs
- name: proxy-config-volume
mountPath: /nginx
dnsPolicy: ClusterFirst
restartPolicy: Always
schedulerName: default-scheduler
terminationGracePeriodSeconds: 30
{{- end }}

File Metadata

Mime Type
text/x-diff
Expires
Sat, Apr 4, 1:50 AM (1 w, 5 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
18822032
Default Alt Text
(4 KB)

Event Timeline