refactor etherpad into jitsi-meet chart

deploy_jitsi.sh

@@ -195,8 +195,7 @@ function do_app {
     --helm-set fqdn=${FQDN} \
     --helm-set jitsi-meet.publicURL=https://${FQDN} \
     --helm-set jitsi-meet.jvb.publicIP=${PUBLIC_IP} \
-    --helm-set jitsi-meet.jvb.UDPPort=${JVB_PORT} \
-    --helm-set jitsi-meet.web.extraEnvs.ETHERPAD_URL_BASE=http://${HELM_NAME}-etherpad.${NAMESPACE}.svc:9001
+    --helm-set jitsi-meet.jvb.UDPPort=${JVB_PORT}
 
   sleep 5 # there is a race if sync happens too quickly, so that it becomes a partial sync
   argocd app sync ${HELM_NAME}

jitsi/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: jitsi-meet
   repository: ""
-  version: 1.2.2
-digest: sha256:f27d02481ecd087ba8c56aa5e8f76e97f177ff8488a17b016e4bc1c54c253f23
-generated: "2022-05-20T21:45:04.926228+08:00"
+  version: 1.2.2+etherpad.1
+digest: sha256:8ef0f113e499152fd5b0a2861d93713bdd3e9e4ea0e57b7be2992a7947e748ff
+generated: "2022-05-22T10:40:05.978749+08:00"

jitsi/Chart.yaml

@@ -1,7 +1,7 @@
 ---
 apiVersion: v2
 name: jitsi-deploy
-version: 0.1.2
+version: 0.1.3
 dependencies:
   - name: jitsi-meet
-    version: 1.2.2
+    version: "1.2.2+etherpad.1"

jitsi/charts/jitsi-meet/Chart.yaml

@@ -3,9 +3,8 @@ appVersion: stable-7287
 dependencies:
 - condition: prosody.enabled
   name: prosody
-  repository: ""
   version: 1.2.2
 description: A Helm chart for Kubernetes
 name: jitsi-meet
 type: application
-version: 1.2.2
+version: "1.2.2+etherpad.1"

jitsi/charts/jitsi-meet/templates/etherpad/_helper.tpl

@@ -0,0 +1,13 @@
+{{- define "jitsi-meet.etherpad.fullname" -}}
+{{ include "jitsi-meet.fullname" . }}-etherpad
+{{- end -}}
+
+{{- define "jitsi-meet.etherpad.labels" -}}
+{{ include "jitsi-meet.labels" . }}
+app.kubernetes.io/component: etherpad
+{{- end -}}
+
+{{- define "jitsi-meet.etherpad.selectorLabels" -}}
+{{ include "jitsi-meet.selectorLabels" . }}
+app.kubernetes.io/component: etherpad
+{{- end -}}

jitsi/charts/jitsi-meet/templates/etherpad/deployment.yaml

@@ -0,0 +1,48 @@
+{{- if .Values.etherpad.enabled }}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "jitsi-meet.etherpad.fullname" . }}
+  labels:
+    {{- include "jitsi-meet.etherpad.labels" . | nindent 4 }}
+  {{- with .Values.etherpad.annotations }}
+  annotations:
+    {{ toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      {{- include "jitsi-meet.etherpad.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      labels:
+        {{- include "jitsi-meet.etherpad.selectorLabels" . | nindent 8 }}
+    spec:
+    {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+    {{- end }}
+      serviceAccountName: {{ include "jitsi-meet.serviceAccountName" . }}
+      containers:
+        - name: {{ .Chart.Name }}
+          securityContext:
+            {{- toYaml .Values.etherpad.securityContext | nindent 12 }}
+          image: "{{ .Values.etherpad.image.repository }}:{{ .Values.etherpad.image.tag }}"
+          imagePullPolicy: {{ pluck "pullPolicy" .Values.etherpad.image .Values.image | first }}
+          ports:
+          - name: http
+            containerPort: 9001
+            protocol: TCP
+          {{- with .Values.etherpad.livenessProbe }}
+          livenessProbe:
+          {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- with .Values.etherpad.readinessProbe }}
+          readinessProbe:
+          {{- toYaml . | nindent 12 }}
+          {{- end }}
+
+          resources:
+            {{- toYaml .Values.etherpad.resources | nindent 12 }}
+{{- end }}

jitsi/charts/jitsi-meet/templates/etherpad/service.yaml

@@ -0,0 +1,17 @@
+{{- if .Values.etherpad.enabled }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "jitsi-meet.etherpad.fullname" . }}
+  labels:
+    {{- include "jitsi-meet.etherpad.labels" . | nindent 4 }}
+spec:
+  type: ClusterIP
+  ports:
+  - name: http
+    port: 9001
+    targetPort: 9001
+    protocol: TCP
+  selector:
+    {{- include "jitsi-meet.etherpad.selectorLabels" . | nindent 4 }}
+{{- end }}

jitsi/charts/jitsi-meet/templates/web/configmap.yaml

@@ -17,6 +17,9 @@ data:
   ENABLE_RECORDING: "true"
   ENABLE_FILE_RECORDING_SERVICE_SHARING: "true"
   {{- end }}
+  {{- if .Values.etherpad.enabled}}
+  ETHERPAD_URL_BASE: 'http://{{ include "jitsi-meet.etherpad.fullname" . }}.{{ .Release.Namespace }}.svc:9001'  
+  {{- end }}
   {{- range $key, $value := .Values.web.extraEnvs }}
   {{- if not (kindIs "invalid" $value) }}
   {{ $key }}: {{ tpl $value $ | quote }}

jitsi/charts/jitsi-meet/values.yaml

@@ -252,6 +252,24 @@ jibri:
 
   extraEnvs: {}
 
+etherpad:
+  enabled: false
+
+  image:
+    repository: etherpad/etherpad
+    tag: 1.8.18
+
+  livenessProbe:
+    httpGet:
+      path: /
+      port: 9001
+  readinessProbe:
+    httpGet:
+      path: /
+      port: 9001
+
+  resources: {}
+
 serviceAccount:
   # Specifies whether a service account should be created
   create: true

jitsi/templates/etherpad/deployment.yaml

@@ -1,30 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ .Release.Name }}-etherpad
-  namespace: {{ .Release.Namespace }}
-  labels:
-    app.kubernetes.io/name: etherpad
-    app.kubernetes.io/instance: {{ .Release.Name }}
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: etherpad
-      app.kubernetes.io/instance: {{ .Release.Name }}
-  template:
-    metadata:
-      labels:
-        app.kubernetes.io/name: etherpad
-        app.kubernetes.io/instance: {{ .Release.Name }}
-    spec:
-      containers:
-        - name: etherpad
-          image: "etherpad/etherpad:1.8.18"
-          imagePullPolicy: IfNotPresent
-          ports:
-            - name: http
-              containerPort: 9001
-              protocol: TCP
-          resources:
-            {{- toYaml .Values.etherpad.resources | nindent 12 }}

jitsi/templates/etherpad/service.yaml

@@ -1,17 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ .Release.Name }}-etherpad
-  namespace: {{ .Release.Namespace }}
-  labels:
-    app.kubernetes.io/name: etherpad
-    app.kubernetes.io/instance: {{ .Release.Name }}
-spec:
-  type: ClusterIP
-  ports:
-    - port: 9001
-      protocol: TCP
-      name: http
-  selector:
-    app.kubernetes.io/name: etherpad
-    app.kubernetes.io/instance: {{ .Release.Name }}

jitsi/values.yaml

@@ -12,8 +12,6 @@ jitsi-meet:
   tz: Asia/Shanghai
 
   web:
-    extraEnvs:
-      ETHERPAD_URL_BASE: ""
     ingress:
       enabled: false
 
@@ -27,7 +25,6 @@ jitsi-meet:
 
   jvb:
     service:
-      # enabled: true
       type: NodePort
     UDPPort: 30000
 
@@ -42,3 +39,6 @@ jitsi-meet:
       enabled: true
 
     publicIP: ""
+
+  etherpad:
+    enabled: true