Page MenuHomePhorge
Files F120834936

No OneTemporary
Actions

Authored By
Unknown
Size
4 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/kolab/templates/collabora-deployment.yaml b/kolab/templates/collabora-deployment.yaml
index ff1bf68..989a60d 100644
--- a/kolab/templates/collabora-deployment.yaml
+++ b/kolab/templates/collabora-deployment.yaml
@@ -1,53 +1,53 @@
apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
alpha.image.policy.openshift.io/resolve-names: '*'
image.openshift.io/triggers: >-
[{"from":{"kind":"ImageStreamTag","name":"collabora:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"collabora\")].image"}]
labels:
app: collabora
app.kubernetes.io/name: collabora
app.kubernetes.io/part-of: kolab-app
name: collabora
spec:
replicas: 1
revisionHistoryLimit: 2
selector:
matchLabels:
app: collabora
strategy:
type: Recreate
template:
metadata:
labels:
app: collabora
spec:
containers:
- name: collabora
- image: {{ .Values.image.kolabImage }}
+ image: {{ .Values.image.collaboraImage }}
imagePullPolicy: {{ .Values.image.pullPolicy }}
resources:
# 1Gb + 100 MB / user
limits:
memory: 10Gi
requests:
memory: 1Gi
ports:
- containerPort: 9980
protocol: TCP
securityContext:
allowPrivilegeEscalation: true
capabilities:
add:
# For coolforkit
- "CHOWN"
- "FOWNER"
- "SYS_CHROOT"
- "MKNOD"
# For coolmount
- "SYS_ADMIN"
dnsPolicy: ClusterFirst
restartPolicy: Always
schedulerName: default-scheduler
terminationGracePeriodSeconds: 30
diff --git a/kolab/values.yaml b/kolab/values.yaml
index 7ac965a..8560a1b 100644
--- a/kolab/values.yaml
+++ b/kolab/values.yaml
@@ -1,121 +1,122 @@
# Default values for kolab.
# This is a YAML-formatted file.
# Declare variables to be passed into your templates.
# replicaCount: 1
domainName: "kolab.local"
# The admin user is always admin@domainName
adminPassword: "simple123"
# migrate:status is required to make sure we don't try to run commands before the db is ready
# TODO integrate this into the seeder I guess?
initCommands: [
"./artisan migrate:status",
"./artisan user:password admin@kolab.local simple123",
"./artisan user:create test1@kolab.local --password=simple123 || :",
"./artisan user:create test2@kolab.local --password=simple123 || :",
]
# Created above
testUser: "test1@kolab.local"
testPassword: "simple123"
image:
#FIXME instead of :latest use the chart appVersion
imapImage: "localhost:5000/imap:latest"
kolabImage: "localhost:5000/webapp:latest"
+ collaboraImage: "localhost:5000/collabora:latest"
redisImage: "localhost:5000/redis:latest"
roundcubeImage: "localhost:5000/roundcube:latest"
mariadbImage: "localhost:5000/mariadb:latest"
meetImage: "localhost:5000/meet:latest"
coturnImage: "localhost:5000/coturn:latest"
postfixImage: "localhost:5000/postfix:latest"
utilsImage: "localhost:5000/utils:latest"
minioImage: "localhost:5000/minio:latest"
pullPolicy: IfNotPresent
# imagePullSecrets: []
# nameOverride: ""
# fullnameOverride: ""
# serviceAccount:
# # Specifies whether a service account should be created
# create: true
# # Annotations to add to the service account
# annotations: {}
# # The name of the service account to use.
# # If not set and create is true, a name is generated using the fullname template
# name: ""
# podAnnotations: {}
# podSecurityContext: {}
# fsGroup: 2000
# securityContext: {}
# capabilities:
# drop:
# - ALL
# readOnlyRootFilesystem: true
# runAsNonRoot: true
# runAsUser: 1000
ingress:
tlsSecretName: kolab-cert
imap:
tlsSecretName: kolab-cert
volumes:
spool:
storageClassName: local-path
capacity: 100Mi
lib:
storageClassName: local-path
capacity: 100Mi
mariadb:
volumes:
data:
storageClassName: local-path
capacity: 100Mi
postfix:
volumes:
spool:
storageClassName: local-path
capacity: 100Mi
lib:
storageClassName: local-path
capacity: 100Mi
minio:
rootUser: "admin"
rootPassword: "simple123"
bucketName: data
volumes:
data:
storageClassName: local-path
capacity: 100Mi
# resources: {}
# We usually recommend not to specify default resources and to leave this as a conscious
# choice for the user. This also increases chances charts run on environments with little
# resources, such as Minikube. If you do want to specify resources, uncomment the following
# lines, adjust them as necessary, and remove the curly braces after 'resources:'.
# limits:
# cpu: 100m
# memory: 128Mi
# requests:
# cpu: 100m
# memory: 128Mi
# nodeSelector: {}
# tolerations: []
# affinity: {}
openshift: false

File Metadata

Mime Type
text/x-diff
Expires
Fri, Apr 24, 1:11 PM (6 d, 1 h ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
18896695
Default Alt Text
(4 KB)

Event Timeline