Page Menu
Home
Phorge
Search
Configure Global Search
Log In
Files
F58272
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
5 KB
Referenced Files
None
Subscribers
None
View Options
diff --git a/kustomize/overlays/dev/kustomization.yaml b/kustomize/overlays/dev/kustomization.yaml
index 37407dac..244f7ab7 100644
--- a/kustomize/overlays/dev/kustomization.yaml
+++ b/kustomize/overlays/dev/kustomization.yaml
@@ -1,19 +1,21 @@
namespace: kolab-dev
bases:
- ../../base
resources:
- namespace.yaml
- kolab-secret.yaml
- kolab-configmap.yaml
- mariadb-deploymentconfig.yaml
- mariadb-secret.yaml
- mariadb-svc.yaml
- redis-deploymentconfig.yaml
- redis-secret.yaml
- redis-svc.yaml
- imap-deployment.yaml
- imap-buildconfig.yaml
- imap-svc.yaml
- roundcube-deployment.yaml
- roundcube-buildconfig.yaml
- roundcube-svc.yaml
+ - roundcube-route.yaml
+
diff --git a/kustomize/overlays/dev/roundcube-buildconfig.yaml b/kustomize/overlays/dev/roundcube-buildconfig.yaml
index cae8d866..06d9cd2d 100644
--- a/kustomize/overlays/dev/roundcube-buildconfig.yaml
+++ b/kustomize/overlays/dev/roundcube-buildconfig.yaml
@@ -1,33 +1,35 @@
apiVersion: build.openshift.io/v1
kind: BuildConfig
metadata:
labels:
name: docker-build
name: roundcube
spec:
failedBuildsHistoryLimit: 5
nodeSelector: null
output:
to:
kind: ImageStreamTag
name: roundcube:latest
runPolicy: Serial
source:
- contextDir: docker/roundcube
+ type: Git
git:
ref: dev/mollekopf
uri: https://phorge.apps.ocp04.ait-msp-infra.net/source/kolab.git
- type: Git
+ contextDir: docker/roundcube
+ sourceSecret:
+ name: phorge-secret
strategy:
type: Docker
successfulBuildsHistoryLimit: 5
triggers:
- type: ConfigChange
---
kind: ImageStream
apiVersion: image.openshift.io/v1
metadata:
name: roundcube
spec:
lookupPolicy:
local: false
diff --git a/kustomize/overlays/dev/roundcube-deployment.yaml b/kustomize/overlays/dev/roundcube-deployment.yaml
index f5551ca6..016ec9fd 100644
--- a/kustomize/overlays/dev/roundcube-deployment.yaml
+++ b/kustomize/overlays/dev/roundcube-deployment.yaml
@@ -1,39 +1,65 @@
apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
alpha.image.policy.openshift.io/resolve-names: '*'
image.openshift.io/triggers: >-
[{"from":{"kind":"ImageStreamTag","name":"roundcube:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"roundcube\")].image"}]
labels:
app: roundcube
app.kubernetes.io/name: roundcube
app.kubernetes.io/part-of: kolab-app
name: roundcube
spec:
replicas: 1
revisionHistoryLimit: 10
selector:
matchLabels:
app: roundcube
strategy:
resources: {}
type: Recreate
template:
metadata:
labels:
app: roundcube
spec:
containers:
- image: roundcube:latest
imagePullPolicy: Always
name: roundcube
ports:
- - containerPort: 80
+ - containerPort: 8080
protocol: TCP
terminationMessagePath: /dev/termination-log
terminationMessagePolicy: File
+ envFrom:
+ - secretRef:
+ name: kolab
+ - configMapRef:
+ name: kolab
+ env:
+ - name: DB_RC_DATABASE
+ value: "roundcube"
+ - name: DB_RC_USERNAME
+ value: "roundcube"
+ - name: DB_RC_PASSWORD
+ value: "roundcube"
+ - name: MAIL_HOST
+ value: "tls://kolab"
+ - name: MAIL_PORT
+ value: "10587"
+ - name: DB_HOST
+ valueFrom:
+ secretKeyRef:
+ key: database-host
+ name: mariadb
+ - name: DB_ROOT_PASSWORD
+ valueFrom:
+ secretKeyRef:
+ key: database-root-password
+ name: mariadb
dnsPolicy: ClusterFirst
restartPolicy: Always
schedulerName: default-scheduler
terminationGracePeriodSeconds: 30
diff --git a/kustomize/overlays/dev/roundcube-route.yaml b/kustomize/overlays/dev/roundcube-route.yaml
new file mode 100644
index 00000000..4d27a516
--- /dev/null
+++ b/kustomize/overlays/dev/roundcube-route.yaml
@@ -0,0 +1,31 @@
+apiVersion: route.openshift.io/v1
+kind: Route
+metadata:
+ name: webmail
+spec:
+ port:
+ targetPort: webserver
+ tls:
+ insecureEdgeTerminationPolicy: Redirect
+ termination: edge
+ to:
+ kind: Service
+ name: roundcube
+ weight: 100
+ wildcardPolicy: None
+---
+apiVersion: route.openshift.io/v1
+kind: Route
+metadata:
+ name: irony
+spec:
+ port:
+ targetPort: webserver
+ tls:
+ insecureEdgeTerminationPolicy: Redirect
+ termination: edge
+ to:
+ kind: Service
+ name: roundcube
+ weight: 100
+ wildcardPolicy: None
diff --git a/kustomize/overlays/dev/roundcube-svc.yaml b/kustomize/overlays/dev/roundcube-svc.yaml
index e6b49b01..7d25b0db 100644
--- a/kustomize/overlays/dev/roundcube-svc.yaml
+++ b/kustomize/overlays/dev/roundcube-svc.yaml
@@ -1,17 +1,18 @@
kind: Service
apiVersion: v1
metadata:
name: roundcube
namespace: kolab-dev
spec:
ipFamilies:
- IPv4
ports:
- name: webserver
protocol: TCP
port: 80
- targetPort: 80
+ targetPort: 8080
internalTrafficPolicy: Cluster
ipFamilyPolicy: SingleStack
selector:
- name: roundcube
+ app: roundcube
+
File Metadata
Details
Attached
Mime Type
text/x-diff
Expires
Mon, Sep 30, 9:00 PM (1 d, 15 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
54518
Default Alt Text
(5 KB)
Attached To
Mode
R2 kolab
Attached
Detach File
Event Timeline
Log In to Comment