From cdaf4176f79ef9f5c33cf0fb99620fd5bd1b02e7 Mon Sep 17 00:00:00 2001
From: George Cordalis <8468312+gcordalis@users.noreply.github.com>
Date: Fri, 25 Oct 2024 13:54:22 +1300
Subject: [PATCH 01/10] Add Jitsi monitor Helm chart configuration

---
 charts/jitsi-monitor/Chart.yaml               | 14 +++++++
 charts/jitsi-monitor/templates/configmap.yaml | 10 +++++
 charts/jitsi-monitor/templates/cronjob.yaml   | 42 +++++++++++++++++++
 charts/jitsi-monitor/values.yaml              | 16 +++++++
 4 files changed, 82 insertions(+)
 create mode 100644 charts/jitsi-monitor/Chart.yaml
 create mode 100644 charts/jitsi-monitor/templates/configmap.yaml
 create mode 100644 charts/jitsi-monitor/templates/cronjob.yaml
 create mode 100644 charts/jitsi-monitor/values.yaml

diff --git a/charts/jitsi-monitor/Chart.yaml b/charts/jitsi-monitor/Chart.yaml
new file mode 100644
index 0000000..da03269
--- /dev/null
+++ b/charts/jitsi-monitor/Chart.yaml
@@ -0,0 +1,14 @@
+apiVersion: v2
+name: jitsi-monitor
+description: Monitors the health of Jitsi Meet instances and bridges
+type: application
+
+version: 0.1.0
+
+# App metadata
+appVersion: "v0.1.0"
+sources:
+  - https://github.com/EthDevOps/jitsi-monitor-docker
+maintainers:
+  - name: gcordalis
+    email: george.cordalis@ethereum.org
diff --git a/charts/jitsi-monitor/templates/configmap.yaml b/charts/jitsi-monitor/templates/configmap.yaml
new file mode 100644
index 0000000..222e83b
--- /dev/null
+++ b/charts/jitsi-monitor/templates/configmap.yaml
@@ -0,0 +1,10 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ .Release.Name }}-config
+data:
+  JITSI_URL: "{{ .Values.config.jitsiUrl }}"
+  BRIDGE_REGIONS: "{{ .Values.config.bridgeRegions }}"
+  RUNTIME: "{{ .Values.config.runtime }}"
+  MEDIA_OPTION: "{{ .Values.config.mediaOption }}"
+  TAKE_SCREENSHOTS: "{{ .Values.config.takeScreenshots }}"
diff --git a/charts/jitsi-monitor/templates/cronjob.yaml b/charts/jitsi-monitor/templates/cronjob.yaml
new file mode 100644
index 0000000..8e79888
--- /dev/null
+++ b/charts/jitsi-monitor/templates/cronjob.yaml
@@ -0,0 +1,42 @@
+apiVersion: batch/v1
+kind: CronJob
+metadata:
+  name: {{ .Release.Name }}-monitor
+  labels:
+    app: {{ .Release.Name }}-monitor
+spec:
+  schedule: "{{ .Values.cronJob.schedule }}"
+  timeZone: 'Etc/UTC'
+  concurrencyPolicy: Forbid
+  jobTemplate:
+    spec:
+      template:
+        metadata:
+          labels:
+            app: {{ .Release.Name }}-monitor
+        spec:
+          restartPolicy: OnFailure
+          containers:
+            - name: jitsi-monitor
+              image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+              imagePullPolicy: {{ .Values.image.pullPolicy }}
+              envFrom:
+                - configMapRef:
+                    name: {{ .Release.Name }}-config
+              volumeMounts:
+                - name: screenshots
+                  mountPath: /app/screenshots
+          volumes:
+            - name: screenshots
+              emptyDir: {}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Release.Name }}-monitor
+spec:
+  selector:
+    app: {{ .Release.Name }}-monitor
+  ports:
+    - name: http
+      port: 8000
diff --git a/charts/jitsi-monitor/values.yaml b/charts/jitsi-monitor/values.yaml
new file mode 100644
index 0000000..da7b437
--- /dev/null
+++ b/charts/jitsi-monitor/values.yaml
@@ -0,0 +1,16 @@
+image:
+  repository: docker.ethquokkaops.io/ethquokkaops/ethdevops/jitsi-monitor-docker
+  tag: v0.1.0
+config:
+  jitsiUrl: "https://jitsihost"
+  bridgeRegions: "au,eu,us"
+  runtime: "60"
+  mediaOption: "1"
+  takeScreenshots: "false"
+cronJob:
+  schedule: "15 * * * *"
+
+# Service configuration
+service:
+  type: ClusterIP
+  port: 8000

From 9952068e1966da9b1d04d67a7dffba9e911d0464 Mon Sep 17 00:00:00 2001
From: George Cordalis <8468312+gcordalis@users.noreply.github.com>
Date: Fri, 25 Oct 2024 14:29:13 +1300
Subject: [PATCH 02/10] Add service annotations and update chart version

---
 charts/jitsi-monitor/Chart.yaml             | 2 +-
 charts/jitsi-monitor/templates/cronjob.yaml | 5 +++++
 charts/jitsi-monitor/values.yaml            | 4 +++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/charts/jitsi-monitor/Chart.yaml b/charts/jitsi-monitor/Chart.yaml
index da03269..30422bc 100644
--- a/charts/jitsi-monitor/Chart.yaml
+++ b/charts/jitsi-monitor/Chart.yaml
@@ -3,7 +3,7 @@ name: jitsi-monitor
 description: Monitors the health of Jitsi Meet instances and bridges
 type: application
 
-version: 0.1.0
+version: 0.1.1
 
 # App metadata
 appVersion: "v0.1.0"
diff --git a/charts/jitsi-monitor/templates/cronjob.yaml b/charts/jitsi-monitor/templates/cronjob.yaml
index 8e79888..3526964 100644
--- a/charts/jitsi-monitor/templates/cronjob.yaml
+++ b/charts/jitsi-monitor/templates/cronjob.yaml
@@ -34,6 +34,11 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ .Release.Name }}-monitor
+  {{- if .Values.service.annotations }}
+  annotations: 
+    {{- .Values.service.annotations | toYaml | nindent 4 }}
+  {{- end }}
+
 spec:
   selector:
     app: {{ .Release.Name }}-monitor
diff --git a/charts/jitsi-monitor/values.yaml b/charts/jitsi-monitor/values.yaml
index da7b437..4971bcb 100644
--- a/charts/jitsi-monitor/values.yaml
+++ b/charts/jitsi-monitor/values.yaml
@@ -1,6 +1,7 @@
 image:
   repository: docker.ethquokkaops.io/ethquokkaops/ethdevops/jitsi-monitor-docker
-  tag: v0.1.0
+  tag: latest
+  pullPolicy: IfNotPresent
 config:
   jitsiUrl: "https://jitsihost"
   bridgeRegions: "au,eu,us"
@@ -14,3 +15,4 @@ cronJob:
 service:
   type: ClusterIP
   port: 8000
+  annotations: {}
\ No newline at end of file

From 0140ac4a016da77d64fe03b75e1ceda3c594b4ba Mon Sep 17 00:00:00 2001
From: George Cordalis <8468312+gcordalis@users.noreply.github.com>
Date: Fri, 25 Oct 2024 17:13:41 +1300
Subject: [PATCH 03/10] Bump jitsi-monitor version to 0.1.2

---
 charts/jitsi-monitor/Chart.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/jitsi-monitor/Chart.yaml b/charts/jitsi-monitor/Chart.yaml
index 30422bc..878884e 100644
--- a/charts/jitsi-monitor/Chart.yaml
+++ b/charts/jitsi-monitor/Chart.yaml
@@ -3,7 +3,7 @@ name: jitsi-monitor
 description: Monitors the health of Jitsi Meet instances and bridges
 type: application
 
-version: 0.1.1
+version: 0.1.2
 
 # App metadata
 appVersion: "v0.1.0"

From f2bdf329b706cbe0ccbdd0d13b963e3f7ded901a Mon Sep 17 00:00:00 2001
From: George Cordalis <8468312+gcordalis@users.noreply.github.com>
Date: Fri, 25 Oct 2024 17:32:47 +1300
Subject: [PATCH 04/10] Update appVersion to v0.1.1 in Chart.yaml

---
 charts/jitsi-monitor/Chart.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/jitsi-monitor/Chart.yaml b/charts/jitsi-monitor/Chart.yaml
index 878884e..b8ecd8e 100644
--- a/charts/jitsi-monitor/Chart.yaml
+++ b/charts/jitsi-monitor/Chart.yaml
@@ -6,7 +6,7 @@ type: application
 version: 0.1.2
 
 # App metadata
-appVersion: "v0.1.0"
+appVersion: "v0.1.1"
 sources:
   - https://github.com/EthDevOps/jitsi-monitor-docker
 maintainers:

From 72138270a7163ba1f14e940483c204672055db4b Mon Sep 17 00:00:00 2001
From: George Cordalis <8468312+gcordalis@users.noreply.github.com>
Date: Fri, 25 Oct 2024 17:36:04 +1300
Subject: [PATCH 05/10] Update jitsi-monitor chart and app versions to 0.1.3

---
 charts/jitsi-monitor/Chart.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/jitsi-monitor/Chart.yaml b/charts/jitsi-monitor/Chart.yaml
index b8ecd8e..0414cf8 100644
--- a/charts/jitsi-monitor/Chart.yaml
+++ b/charts/jitsi-monitor/Chart.yaml
@@ -3,10 +3,10 @@ name: jitsi-monitor
 description: Monitors the health of Jitsi Meet instances and bridges
 type: application
 
-version: 0.1.2
+version: 0.1.3
 
 # App metadata
-appVersion: "v0.1.1"
+appVersion: "v0.1.3"
 sources:
   - https://github.com/EthDevOps/jitsi-monitor-docker
 maintainers:

From ed68a60a4a2ad9b1a9885da88775a12acf0a1daa Mon Sep 17 00:00:00 2001
From: George Cordalis <8468312+gcordalis@users.noreply.github.com>
Date: Fri, 25 Oct 2024 18:02:02 +1300
Subject: [PATCH 06/10] moved jitsi-monitor annotations to the pod

---
 charts/jitsi-monitor/Chart.yaml             | 2 +-
 charts/jitsi-monitor/templates/cronjob.yaml | 8 ++++----
 charts/jitsi-monitor/values.yaml            | 3 ++-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/charts/jitsi-monitor/Chart.yaml b/charts/jitsi-monitor/Chart.yaml
index 0414cf8..5e6b564 100644
--- a/charts/jitsi-monitor/Chart.yaml
+++ b/charts/jitsi-monitor/Chart.yaml
@@ -3,7 +3,7 @@ name: jitsi-monitor
 description: Monitors the health of Jitsi Meet instances and bridges
 type: application
 
-version: 0.1.3
+version: 0.1.4
 
 # App metadata
 appVersion: "v0.1.3"
diff --git a/charts/jitsi-monitor/templates/cronjob.yaml b/charts/jitsi-monitor/templates/cronjob.yaml
index 3526964..3bcc01a 100644
--- a/charts/jitsi-monitor/templates/cronjob.yaml
+++ b/charts/jitsi-monitor/templates/cronjob.yaml
@@ -14,6 +14,10 @@ spec:
         metadata:
           labels:
             app: {{ .Release.Name }}-monitor
+          {{- if .Values.podAnnotations }}
+          annotations: 
+            {{- .Values.podAnnotations | toYaml | nindent 12 }}
+          {{- end }}
         spec:
           restartPolicy: OnFailure
           containers:
@@ -34,10 +38,6 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ .Release.Name }}-monitor
-  {{- if .Values.service.annotations }}
-  annotations: 
-    {{- .Values.service.annotations | toYaml | nindent 4 }}
-  {{- end }}
 
 spec:
   selector:
diff --git a/charts/jitsi-monitor/values.yaml b/charts/jitsi-monitor/values.yaml
index 4971bcb..3942cea 100644
--- a/charts/jitsi-monitor/values.yaml
+++ b/charts/jitsi-monitor/values.yaml
@@ -15,4 +15,5 @@ cronJob:
 service:
   type: ClusterIP
   port: 8000
-  annotations: {}
\ No newline at end of file
+
+podAnnotations: {}
\ No newline at end of file

From 158b22e40d490a987285094248edef033f8a7fe4 Mon Sep 17 00:00:00 2001
From: George Cordalis <8468312+gcordalis@users.noreply.github.com>
Date: Tue, 29 Oct 2024 15:17:17 +1300
Subject: [PATCH 07/10] [Jitsi-Monitor] Replace CronJob with Deployment, update
 version

---
 charts/jitsi-monitor/Chart.yaml               |  2 +-
 charts/jitsi-monitor/templates/configmap.yaml |  1 +
 charts/jitsi-monitor/templates/cronjob.yaml   | 47 -------------------
 .../jitsi-monitor/templates/deployment.yaml   | 33 +++++++++++++
 charts/jitsi-monitor/values.yaml              |  4 +-
 5 files changed, 36 insertions(+), 51 deletions(-)
 delete mode 100644 charts/jitsi-monitor/templates/cronjob.yaml
 create mode 100644 charts/jitsi-monitor/templates/deployment.yaml

diff --git a/charts/jitsi-monitor/Chart.yaml b/charts/jitsi-monitor/Chart.yaml
index 5e6b564..8276267 100644
--- a/charts/jitsi-monitor/Chart.yaml
+++ b/charts/jitsi-monitor/Chart.yaml
@@ -3,7 +3,7 @@ name: jitsi-monitor
 description: Monitors the health of Jitsi Meet instances and bridges
 type: application
 
-version: 0.1.4
+version: 0.1.5
 
 # App metadata
 appVersion: "v0.1.3"
diff --git a/charts/jitsi-monitor/templates/configmap.yaml b/charts/jitsi-monitor/templates/configmap.yaml
index 222e83b..1557c70 100644
--- a/charts/jitsi-monitor/templates/configmap.yaml
+++ b/charts/jitsi-monitor/templates/configmap.yaml
@@ -8,3 +8,4 @@ data:
   RUNTIME: "{{ .Values.config.runtime }}"
   MEDIA_OPTION: "{{ .Values.config.mediaOption }}"
   TAKE_SCREENSHOTS: "{{ .Values.config.takeScreenshots }}"
+  CONTINUOUS_MODE: "true"
diff --git a/charts/jitsi-monitor/templates/cronjob.yaml b/charts/jitsi-monitor/templates/cronjob.yaml
deleted file mode 100644
index 3bcc01a..0000000
--- a/charts/jitsi-monitor/templates/cronjob.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
-apiVersion: batch/v1
-kind: CronJob
-metadata:
-  name: {{ .Release.Name }}-monitor
-  labels:
-    app: {{ .Release.Name }}-monitor
-spec:
-  schedule: "{{ .Values.cronJob.schedule }}"
-  timeZone: 'Etc/UTC'
-  concurrencyPolicy: Forbid
-  jobTemplate:
-    spec:
-      template:
-        metadata:
-          labels:
-            app: {{ .Release.Name }}-monitor
-          {{- if .Values.podAnnotations }}
-          annotations: 
-            {{- .Values.podAnnotations | toYaml | nindent 12 }}
-          {{- end }}
-        spec:
-          restartPolicy: OnFailure
-          containers:
-            - name: jitsi-monitor
-              image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-              imagePullPolicy: {{ .Values.image.pullPolicy }}
-              envFrom:
-                - configMapRef:
-                    name: {{ .Release.Name }}-config
-              volumeMounts:
-                - name: screenshots
-                  mountPath: /app/screenshots
-          volumes:
-            - name: screenshots
-              emptyDir: {}
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ .Release.Name }}-monitor
-
-spec:
-  selector:
-    app: {{ .Release.Name }}-monitor
-  ports:
-    - name: http
-      port: 8000
diff --git a/charts/jitsi-monitor/templates/deployment.yaml b/charts/jitsi-monitor/templates/deployment.yaml
new file mode 100644
index 0000000..f47b12a
--- /dev/null
+++ b/charts/jitsi-monitor/templates/deployment.yaml
@@ -0,0 +1,33 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ .Release.Name }}-monitor
+  labels:
+    app: {{ .Release.Name }}-monitor
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: {{ .Release.Name }}-monitor
+  template:
+    metadata:
+      labels:
+        app: {{ .Release.Name }}-monitor
+      {{- if .Values.podAnnotations }}
+      annotations: 
+        {{- .Values.podAnnotations | toYaml | nindent 8 }}
+      {{- end }}
+    spec:
+      containers:
+        - name: jitsi-monitor
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          envFrom:
+            - configMapRef:
+                name: {{ .Release.Name }}-config
+          volumeMounts:
+            - name: screenshots
+              mountPath: /app/screenshots
+      volumes:
+        - name: screenshots
+          emptyDir: {}
\ No newline at end of file
diff --git a/charts/jitsi-monitor/values.yaml b/charts/jitsi-monitor/values.yaml
index 3942cea..bc10526 100644
--- a/charts/jitsi-monitor/values.yaml
+++ b/charts/jitsi-monitor/values.yaml
@@ -1,6 +1,6 @@
 image:
   repository: docker.ethquokkaops.io/ethquokkaops/ethdevops/jitsi-monitor-docker
-  tag: latest
+  tag: v0.1.4
   pullPolicy: IfNotPresent
 config:
   jitsiUrl: "https://jitsihost"
@@ -8,8 +8,6 @@ config:
   runtime: "60"
   mediaOption: "1"
   takeScreenshots: "false"
-cronJob:
-  schedule: "15 * * * *"
 
 # Service configuration
 service:

From a0b7e02c378c988a579c6b46ef7c45cf6adbb800 Mon Sep 17 00:00:00 2001
From: George Cordalis <8468312+gcordalis@users.noreply.github.com>
Date: Wed, 30 Oct 2024 14:45:25 +1300
Subject: [PATCH 08/10] Bump jitsi-monitor chart to version 0.1.6

---
 charts/jitsi-monitor/Chart.yaml  | 2 +-
 charts/jitsi-monitor/values.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/jitsi-monitor/Chart.yaml b/charts/jitsi-monitor/Chart.yaml
index 8276267..49b5f48 100644
--- a/charts/jitsi-monitor/Chart.yaml
+++ b/charts/jitsi-monitor/Chart.yaml
@@ -3,7 +3,7 @@ name: jitsi-monitor
 description: Monitors the health of Jitsi Meet instances and bridges
 type: application
 
-version: 0.1.5
+version: 0.1.6
 
 # App metadata
 appVersion: "v0.1.3"
diff --git a/charts/jitsi-monitor/values.yaml b/charts/jitsi-monitor/values.yaml
index bc10526..b90b9db 100644
--- a/charts/jitsi-monitor/values.yaml
+++ b/charts/jitsi-monitor/values.yaml
@@ -1,6 +1,6 @@
 image:
   repository: docker.ethquokkaops.io/ethquokkaops/ethdevops/jitsi-monitor-docker
-  tag: v0.1.4
+  tag: v0.1.5
   pullPolicy: IfNotPresent
 config:
   jitsiUrl: "https://jitsihost"

From 8ec962d19b121996e44faeae33d2ebe0053aa290 Mon Sep 17 00:00:00 2001
From: George Cordalis <8468312+gcordalis@users.noreply.github.com>
Date: Mon, 4 Nov 2024 13:06:58 +1300
Subject: [PATCH 09/10] Jitsi Monitor: Bump version and add container port to
 deployment

---
 charts/jitsi-monitor/Chart.yaml                | 2 +-
 charts/jitsi-monitor/templates/deployment.yaml | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/charts/jitsi-monitor/Chart.yaml b/charts/jitsi-monitor/Chart.yaml
index 49b5f48..36a0537 100644
--- a/charts/jitsi-monitor/Chart.yaml
+++ b/charts/jitsi-monitor/Chart.yaml
@@ -3,7 +3,7 @@ name: jitsi-monitor
 description: Monitors the health of Jitsi Meet instances and bridges
 type: application
 
-version: 0.1.6
+version: 0.1.7
 
 # App metadata
 appVersion: "v0.1.3"
diff --git a/charts/jitsi-monitor/templates/deployment.yaml b/charts/jitsi-monitor/templates/deployment.yaml
index f47b12a..0d34e4a 100644
--- a/charts/jitsi-monitor/templates/deployment.yaml
+++ b/charts/jitsi-monitor/templates/deployment.yaml
@@ -22,6 +22,9 @@ spec:
         - name: jitsi-monitor
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
+          ports:
+            - containerPort: {{ .Values.service.port }}
+              name: http
           envFrom:
             - configMapRef:
                 name: {{ .Release.Name }}-config

From f3ef07796356b9a9f2424471bcb369d250554eb4 Mon Sep 17 00:00:00 2001
From: George Cordalis <8468312+gcordalis@users.noreply.github.com>
Date: Thu, 7 Nov 2024 11:06:45 +1300
Subject: [PATCH 10/10] Update jitsi-monitor chart version to 0.1.8 and bump
 image to 0.1.6

---
 charts/jitsi-monitor/Chart.yaml  | 2 +-
 charts/jitsi-monitor/values.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/jitsi-monitor/Chart.yaml b/charts/jitsi-monitor/Chart.yaml
index 36a0537..2e579f2 100644
--- a/charts/jitsi-monitor/Chart.yaml
+++ b/charts/jitsi-monitor/Chart.yaml
@@ -3,7 +3,7 @@ name: jitsi-monitor
 description: Monitors the health of Jitsi Meet instances and bridges
 type: application
 
-version: 0.1.7
+version: 0.1.8
 
 # App metadata
 appVersion: "v0.1.3"
diff --git a/charts/jitsi-monitor/values.yaml b/charts/jitsi-monitor/values.yaml
index b90b9db..8ba81c2 100644
--- a/charts/jitsi-monitor/values.yaml
+++ b/charts/jitsi-monitor/values.yaml
@@ -1,6 +1,6 @@
 image:
   repository: docker.ethquokkaops.io/ethquokkaops/ethdevops/jitsi-monitor-docker
-  tag: v0.1.5
+  tag: v0.1.6
   pullPolicy: IfNotPresent
 config:
   jitsiUrl: "https://jitsihost"