Page MenuHomePhorge
Files F2534217

No OneTemporary
Actions

Size
7 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/kustomize/Makefile b/kustomize/Makefile
index d3f31292..e807f268 100644
--- a/kustomize/Makefile
+++ b/kustomize/Makefile
@@ -1,7 +1,9 @@
-apply-dev:
+project:
+ oc project kolab-dev
+apply-dev: project
oc apply -k overlays/dev/
build:
oc start-build kolab --follow
binary-build-overlay:
oc start-build overlay --from-dir=/path/to/overlay-directory --follow
diff --git a/kustomize/overlays/dev/imap-buildconfig.yaml b/kustomize/overlays/dev/imap-buildconfig.yaml
new file mode 100644
index 00000000..9a41afa8
--- /dev/null
+++ b/kustomize/overlays/dev/imap-buildconfig.yaml
@@ -0,0 +1,33 @@
+apiVersion: build.openshift.io/v1
+kind: BuildConfig
+metadata:
+ labels:
+ name: docker-build
+ name: imap
+spec:
+ failedBuildsHistoryLimit: 5
+ nodeSelector: null
+ output:
+ to:
+ kind: ImageStreamTag
+ name: imap:latest
+ runPolicy: Serial
+ source:
+ contextDir: docker/imap-backend
+ git:
+ ref: dev/mollekopf
+ uri: https://phorge.apps.ocp04.ait-msp-infra.net/source/kolab.git
+ type: Git
+ strategy:
+ type: Docker
+ successfulBuildsHistoryLimit: 5
+ triggers:
+ - type: ConfigChange
+---
+kind: ImageStream
+apiVersion: image.openshift.io/v1
+metadata:
+ name: imap
+spec:
+ lookupPolicy:
+ local: false
diff --git a/kustomize/overlays/dev/imap-deployment.yaml b/kustomize/overlays/dev/imap-deployment.yaml
new file mode 100644
index 00000000..98e3b3a6
--- /dev/null
+++ b/kustomize/overlays/dev/imap-deployment.yaml
@@ -0,0 +1,41 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ annotations:
+ alpha.image.policy.openshift.io/resolve-names: '*'
+ image.openshift.io/triggers: >-
+ [{"from":{"kind":"ImageStreamTag","name":"imap:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"imap\")].image"}]
+ labels:
+ app: imap
+ app.kubernetes.io/name: imap
+ app.kubernetes.io/part-of: kolab-app
+ name: imap
+spec:
+ replicas: 1
+ revisionHistoryLimit: 10
+ selector:
+ matchLabels:
+ app: imap
+ strategy:
+ resources: {}
+ type: Recreate
+ template:
+ metadata:
+ labels:
+ app: imap
+ spec:
+ containers:
+ - image: imap:latest
+ imagePullPolicy: Always
+ name: imap
+ ports:
+ - containerPort: 993
+ protocol: TCP
+ - containerPort: 143
+ protocol: TCP
+ terminationMessagePath: /dev/termination-log
+ terminationMessagePolicy: File
+ dnsPolicy: ClusterFirst
+ restartPolicy: Always
+ schedulerName: default-scheduler
+ terminationGracePeriodSeconds: 30
diff --git a/kustomize/overlays/dev/imap-svc.yaml b/kustomize/overlays/dev/imap-svc.yaml
new file mode 100644
index 00000000..e3290b32
--- /dev/null
+++ b/kustomize/overlays/dev/imap-svc.yaml
@@ -0,0 +1,17 @@
+kind: Service
+apiVersion: v1
+metadata:
+ name: imap
+ namespace: kolab-dev
+spec:
+ ipFamilies:
+ - IPv4
+ ports:
+ - name: imap-ssl
+ protocol: TCP
+ port: 993
+ targetPort: 993
+ internalTrafficPolicy: Cluster
+ ipFamilyPolicy: SingleStack
+ selector:
+ name: imap
diff --git a/kustomize/overlays/dev/kolab-configmap.yaml b/kustomize/overlays/dev/kolab-configmap.yaml
index 9b22cc9f..2665d6a3 100644
--- a/kustomize/overlays/dev/kolab-configmap.yaml
+++ b/kustomize/overlays/dev/kolab-configmap.yaml
@@ -1,26 +1,33 @@
kind: ConfigMap
apiVersion: v1
metadata:
name: kolab
namespace: kolab-dev
immutable: false
data:
APP_DOMAIN: 'kolab-kolab-dev.apps.ocp04.ait-msp-infra.net'
ASSET_URL: 'https://kolab-kolab-dev.apps.ocp04.ait-msp-infra.net'
APP_NAME: 'Kolab'
APP_URL: 'https://kolab-kolab-dev.apps.ocp04.ait-msp-infra.net'
APP_PUBLIC_URL: 'https://kolab-kolab-dev.apps.ocp04.ait-msp-infra.net'
APP_WITH_SERVICES: 'true'
APP_WITH_WALLET: 'false'
APP_WITH_SIGNUP: 'true'
+ APP_WITH_FILES: 'false'
APP_LDAP: 'false'
- APP_IMAP: 'false'
+ APP_IMAP: 'true'
APP_DEBUG: 'true'
APP_ENV: 'local'
LOG_CHANNEL: 'stdout'
LOG_SLOW_REQUESTS: '5'
LOG_LEVEL: 'debug'
QUEUE_CONNECTION: 'redis'
PASSPORT_PROXY_OAUTH_CLIENT_ID: '942edef5-3dbd-4a14-8e3e-d5d59b727bee'
PASSPORT_PROXY_OAUTH_CLIENT_SECRET: 'L6L0n56ecvjjK0cJMjeeV1pPAeffUBO0YSSH63wf'
+ IMAP_URI: 'ssl://imap:993'
+ IMAP_HOST: 'imap'
+ IMAP_ADMIN_LOGIN: 'cyrus-admin'
+ IMAP_ADMIN_PASSWORD: 'Welcome2KolabSystems'
+ IMAP_VERIFY_HOST: 'false'
+ IMAP_VERIFY_PEER: 'false'
diff --git a/kustomize/overlays/dev/kustomization.yaml b/kustomize/overlays/dev/kustomization.yaml
index 2b4db0e0..37407dac 100644
--- a/kustomize/overlays/dev/kustomization.yaml
+++ b/kustomize/overlays/dev/kustomization.yaml
@@ -1,13 +1,19 @@
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
diff --git a/kustomize/overlays/dev/roundcube-buildconfig.yaml b/kustomize/overlays/dev/roundcube-buildconfig.yaml
new file mode 100644
index 00000000..cae8d866
--- /dev/null
+++ b/kustomize/overlays/dev/roundcube-buildconfig.yaml
@@ -0,0 +1,33 @@
+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
+ git:
+ ref: dev/mollekopf
+ uri: https://phorge.apps.ocp04.ait-msp-infra.net/source/kolab.git
+ type: Git
+ 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
new file mode 100644
index 00000000..f5551ca6
--- /dev/null
+++ b/kustomize/overlays/dev/roundcube-deployment.yaml
@@ -0,0 +1,39 @@
+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
+ protocol: TCP
+ terminationMessagePath: /dev/termination-log
+ terminationMessagePolicy: File
+ dnsPolicy: ClusterFirst
+ restartPolicy: Always
+ schedulerName: default-scheduler
+ terminationGracePeriodSeconds: 30
diff --git a/kustomize/overlays/dev/roundcube-svc.yaml b/kustomize/overlays/dev/roundcube-svc.yaml
new file mode 100644
index 00000000..e6b49b01
--- /dev/null
+++ b/kustomize/overlays/dev/roundcube-svc.yaml
@@ -0,0 +1,17 @@
+kind: Service
+apiVersion: v1
+metadata:
+ name: roundcube
+ namespace: kolab-dev
+spec:
+ ipFamilies:
+ - IPv4
+ ports:
+ - name: webserver
+ protocol: TCP
+ port: 80
+ targetPort: 80
+ internalTrafficPolicy: Cluster
+ ipFamilyPolicy: SingleStack
+ selector:
+ name: roundcube

File Metadata

Mime Type
text/x-diff
Expires
Fri, Feb 6, 9:01 AM (2 h, 46 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
428190
Default Alt Text
(7 KB)

Event Timeline