diff --git a/src/main/cljc/dda/c4k_jitsi/jitsi.cljc b/src/main/cljc/dda/c4k_jitsi/jitsi.cljc index 728a9f8..b5d805c 100644 --- a/src/main/cljc/dda/c4k_jitsi/jitsi.cljc +++ b/src/main/cljc/dda/c4k_jitsi/jitsi.cljc @@ -12,18 +12,21 @@ #?(:cljs (defmethod yaml/load-resource :jitsi [resource-name] (case resource-name - "jitsi/jicofo-deployment.yaml" (rc/inline "jitsi/jicofo-deployment.yaml") - "jitsi/jicofo-pvc.yaml" (rc/inline "jitsi/jicofo-pvc.yaml") - "jitsi/jvb-deployment.yaml" (rc/inline "jitsi/jvb-deployment.yaml") - "jitsi/jvb-pvc.yaml" (rc/inline "jitsi/jvb-pvc.yaml") - "jitsi/jvb-service.yaml" (rc/inline "jitsi/jvb-service.yaml") - "jitsi/networkpolicy.yaml" (rc/inline "jitsi/networkpolicy.yaml") - "jitsi/prosody-deployment.yaml" (rc/inline "jitsi/prosody-deployment.yaml") - "jitsi/prosody-pvc.yaml" (rc/inline "jitsi/prosody-pvc.yaml") - "jitsi/prosody-service.yaml" (rc/inline "jitsi/prosody-service.yaml") - "jitsi/web-deployment.yaml" (rc/inline "jitsi/web-deployment.yaml") - "jitsi/web-pvc.yaml" (rc/inline "jitsi/web-pvc.yaml") - "jitsi/web-service.yaml" (rc/inline "jitsi/web-service.yaml") + "jitsi/jicofo-deployment.yaml" (rc/inline "jitsi/jicofo-deployment.yaml") + "jitsi/jicofo-pvc.yaml" (rc/inline "jitsi/jicofo-pvc.yaml") + "jitsi/jvb-deployment.yaml" (rc/inline "jitsi/jvb-deployment.yaml") + "jitsi/jvb-pvc.yaml" (rc/inline "jitsi/jvb-pvc.yaml") + "jitsi/jvb-service.yaml" (rc/inline "jitsi/jvb-service.yaml") + "jitsi/networkpolicy.yaml" (rc/inline "jitsi/networkpolicy.yaml") + "jitsi/prosody-deployment.yaml" (rc/inline "jitsi/prosody-deployment.yaml") + "jitsi/prosody-pvc-config.yaml" (rc/inline "jitsi/prosody-pvc-config.yaml") + "jitsi/prosody-pvc-plugins.yaml" (rc/inline "jitsi/prosody-pvc-plugins.yaml") + "jitsi/prosody-service.yaml" (rc/inline "jitsi/prosody-service.yaml") + "jitsi/web-deployment.yaml" (rc/inline "jitsi/web-deployment.yaml") + "jitsi/web-pvc-config.yaml" (rc/inline "jitsi/web-pvc-config.yaml") + "jitsi/web-pvc-crontabs.yaml" (rc/inline "jitsi/web-pvc-crontabs.yaml") + "jitsi/web-pvc-transcripts.yaml" (rc/inline "jitsi/web-pvc-transcripts.yaml") + "jitsi/web-service.yaml" (rc/inline "jitsi/web-service.yaml") (throw (js/Error. "Undefined Resource!"))))) (defn generate-jicofo-deployment [config] @@ -50,8 +53,11 @@ (-> (yaml/from-string (yaml/load-resource "jitsi/prosody-deployment.yaml")))) -(defn generate-prosody-pvc [] - (yaml/from-string (yaml/load-resource "jitsi/prosody-pvc.yaml"))) +(defn generate-prosody-pvc-config [] + (yaml/from-string (yaml/load-resource "jitsi/prosody-pvc-config.yaml"))) + +(defn generate-prosody-pvc-plugins [] + (yaml/from-string (yaml/load-resource "jitsi/prosody-pvc-plugins.yaml"))) (defn generate-prosody-service [] (yaml/from-string (yaml/load-resource "jitsi/prosody-service.yaml"))) @@ -61,7 +67,13 @@ (yaml/from-string (yaml/load-resource "jitsi/web-deployment.yaml")))) (defn generate-web-pvc [] - (yaml/from-string (yaml/load-resource "jitsi/web-pvc.yaml"))) + (yaml/from-string (yaml/load-resource "jitsi/web-pvc-config.yaml"))) + +(defn generate-web-pvc [] + (yaml/from-string (yaml/load-resource "jitsi/web-pvc-crontabs.yaml"))) + +(defn generate-web-pvc [] + (yaml/from-string (yaml/load-resource "jitsi/web-pvc-transcripts.yaml"))) (defn generate-web-service [] (yaml/from-string (yaml/load-resource "jitsi/web-service.yaml"))) diff --git a/src/main/resources/jitsi/prosody-deployment.yaml b/src/main/resources/jitsi/prosody-deployment.yaml index 8807774..8df458d 100644 --- a/src/main/resources/jitsi/prosody-deployment.yaml +++ b/src/main/resources/jitsi/prosody-deployment.yaml @@ -11,13 +11,13 @@ spec: template: metadata: labels: - app: prosody + app: prosody jitsi-network/meet.jitsi: "true" service: prosody-service spec: containers: - image: jitsi/prosody:stable-6865 - imagePullPolicy: IfNotPresend + imagePullPolicy: IfNotPresent name: prosody ports: - containerPort: 5222 diff --git a/src/main/resources/jitsi/prosody-pvc-config.yaml b/src/main/resources/jitsi/prosody-pvc-config.yaml new file mode 100644 index 0000000..eb9b67c --- /dev/null +++ b/src/main/resources/jitsi/prosody-pvc-config.yaml @@ -0,0 +1,12 @@ +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: prosody-claim-config + labels: + app: prosody +spec: + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 100Mi diff --git a/src/main/resources/jitsi/prosody-pvc-plugins.yaml b/src/main/resources/jitsi/prosody-pvc-plugins.yaml new file mode 100644 index 0000000..348dace --- /dev/null +++ b/src/main/resources/jitsi/prosody-pvc-plugins.yaml @@ -0,0 +1,12 @@ +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: prosody-claim-plugins + labels: + app: prosody +spec: + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 100Mi diff --git a/src/main/resources/jitsi/prosody-pvc.yaml b/src/main/resources/jitsi/prosody-pvc.yaml deleted file mode 100644 index 58abeb3..0000000 --- a/src/main/resources/jitsi/prosody-pvc.yaml +++ /dev/null @@ -1,25 +0,0 @@ -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: prosody-claim-config - labels: - app: prosody -spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 100Mi ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: prosody-claim-plugins - labels: - app: prosody -spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 100Mi diff --git a/src/main/resources/jitsi/web-pvc-config.yaml b/src/main/resources/jitsi/web-pvc-config.yaml new file mode 100644 index 0000000..ebd12da --- /dev/null +++ b/src/main/resources/jitsi/web-pvc-config.yaml @@ -0,0 +1,12 @@ +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: web-claim-config + labels: + app: jitsi +spec: + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 100Mi \ No newline at end of file diff --git a/src/main/resources/jitsi/web-pvc-crontabs.yaml b/src/main/resources/jitsi/web-pvc-crontabs.yaml new file mode 100644 index 0000000..82614d1 --- /dev/null +++ b/src/main/resources/jitsi/web-pvc-crontabs.yaml @@ -0,0 +1,12 @@ +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: web-claim-crontabs + labels: + app: jitsi +spec: + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 100Mi diff --git a/src/main/resources/jitsi/web-pvc-transcripts.yaml b/src/main/resources/jitsi/web-pvc-transcripts.yaml new file mode 100644 index 0000000..ec6a268 --- /dev/null +++ b/src/main/resources/jitsi/web-pvc-transcripts.yaml @@ -0,0 +1,12 @@ +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: web-claim-transcripts + labels: + app: jitsi +spec: + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 100Mi diff --git a/src/main/resources/jitsi/web-pvc.yaml b/src/main/resources/jitsi/web-pvc.yaml deleted file mode 100644 index 88cfda3..0000000 --- a/src/main/resources/jitsi/web-pvc.yaml +++ /dev/null @@ -1,38 +0,0 @@ -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: web-claim-config - labels: - app: jitsi -spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 100Mi ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: web-claim-crontabs - labels: - app: jitsi -spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 100Mi ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: web-claim-transcripts - labels: - app: jitsi -spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 100Mi