From 9f3e8c2957e746b994c378fc9f9103d6601d053f Mon Sep 17 00:00:00 2001 From: elishadavidi <62501723+elishadavidi@users.noreply.github.com> Date: Thu, 28 May 2026 13:18:46 +0300 Subject: [PATCH 01/16] Adding omegabasms and breaking dvirlabs --- argocd-apps/omegabasms.yaml | 21 +++++ charts/omegabasms-chart/Chart.yaml | 6 ++ .../omegabasms-chart/templates/_helpers.tpl | 47 ++++++++++ .../templates/deployment.yaml | 90 +++++++++++++++++++ .../omegabasms-chart/templates/ingress.yaml | 45 ++++++++++ charts/omegabasms-chart/templates/pvc.yaml | 23 +++++ .../omegabasms-chart/templates/service.yaml | 19 ++++ charts/omegabasms-chart/values.yaml | 65 ++++++++++++++ manifests/omegabasms/cname.yaml | 2 + manifests/omegabasms/values.yaml | 72 +++++++++++++++ 10 files changed, 390 insertions(+) create mode 100644 argocd-apps/omegabasms.yaml create mode 100644 charts/omegabasms-chart/Chart.yaml create mode 100644 charts/omegabasms-chart/templates/_helpers.tpl create mode 100644 charts/omegabasms-chart/templates/deployment.yaml create mode 100644 charts/omegabasms-chart/templates/ingress.yaml create mode 100644 charts/omegabasms-chart/templates/pvc.yaml create mode 100644 charts/omegabasms-chart/templates/service.yaml create mode 100644 charts/omegabasms-chart/values.yaml create mode 100644 manifests/omegabasms/cname.yaml create mode 100644 manifests/omegabasms/values.yaml diff --git a/argocd-apps/omegabasms.yaml b/argocd-apps/omegabasms.yaml new file mode 100644 index 0000000..70d104f --- /dev/null +++ b/argocd-apps/omegabasms.yaml @@ -0,0 +1,21 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: omegabasms + namespace: argocd +spec: + project: my-apps + source: + repoURL: ssh://git@gitea-ssh.dev-tools.svc.cluster.local:2222/dvirlabs/my-apps.git + targetRevision: HEAD + path: charts/omegabasms-chart + helm: + valueFiles: + - ../../manifests/omegabasms/values.yaml + destination: + server: https://kubernetes.default.svc + namespace: my-apps + syncPolicy: + automated: + prune: true + selfHeal: true diff --git a/charts/omegabasms-chart/Chart.yaml b/charts/omegabasms-chart/Chart.yaml new file mode 100644 index 0000000..a04599f --- /dev/null +++ b/charts/omegabasms-chart/Chart.yaml @@ -0,0 +1,6 @@ +apiVersion: v2 +name: omegabasms +description: A Helm chart for OmegaBaSMS - WhatsApp to SMS relay with dashboard +type: application +version: 1.0.0 +appVersion: "1.0.0" diff --git a/charts/omegabasms-chart/templates/_helpers.tpl b/charts/omegabasms-chart/templates/_helpers.tpl new file mode 100644 index 0000000..e1e0055 --- /dev/null +++ b/charts/omegabasms-chart/templates/_helpers.tpl @@ -0,0 +1,47 @@ +{{- define "omegabasms.name" -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{- define "omegabasms.fullname" -}} +{{- if .Values.fullnameOverride }} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- $name := default .Chart.Name .Values.nameOverride }} +{{- if contains $name .Release.Name }} +{{- .Release.Name | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} +{{- end }} +{{- end }} +{{- end }} + +{{- define "omegabasms.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{- define "omegabasms.labels" -}} +helm.sh/chart: {{ include "omegabasms.chart" . }} +{{ include "omegabasms.selectorLabels" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- with .Values.commonLabels }} +{{ toYaml . }} +{{- end }} +{{- end }} + +{{- define "omegabasms.selectorLabels" -}} +app.kubernetes.io/name: {{ include "omegabasms.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +{{- end }} + +{{- define "omegabasms.backend.labels" -}} +{{ include "omegabasms.labels" . }} +app.kubernetes.io/component: backend +{{- end }} + +{{- define "omegabasms.backend.selectorLabels" -}} +{{ include "omegabasms.selectorLabels" . }} +app.kubernetes.io/component: backend +{{- end }} diff --git a/charts/omegabasms-chart/templates/deployment.yaml b/charts/omegabasms-chart/templates/deployment.yaml new file mode 100644 index 0000000..90bd413 --- /dev/null +++ b/charts/omegabasms-chart/templates/deployment.yaml @@ -0,0 +1,90 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ include "omegabasms.fullname" . }}-backend + labels: + {{- include "omegabasms.backend.labels" . | nindent 4 }} + {{- with .Values.commonAnnotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + replicas: {{ .Values.backend.replicas }} + selector: + matchLabels: + {{- include "omegabasms.backend.selectorLabels" . | nindent 6 }} + template: + metadata: + labels: + {{- include "omegabasms.backend.selectorLabels" . | nindent 8 }} + {{- with .Values.commonAnnotations }} + annotations: + {{- toYaml . | nindent 8 }} + {{- end }} + spec: + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + containers: + - name: omegabasms + image: "{{ .Values.backend.image.repository }}:{{ .Values.backend.image.tag }}" + imagePullPolicy: {{ .Values.backend.image.pullPolicy }} + ports: + - name: http + containerPort: {{ .Values.backend.service.port }} + protocol: TCP + env: + - name: GROUP_NAMES + value: {{ .Values.backend.env.groupNames | quote }} + - name: TEXTBEE_DEVICE_ID + value: {{ .Values.backend.env.textbeeDeviceId | quote }} + - name: TEXTBEE_API_KEY + value: {{ .Values.backend.env.textbeeApiKey | quote }} + - name: SMS_RECIPIENT + value: {{ .Values.backend.env.smsRecipient | quote }} + - name: TELEGRAM_BOT_TOKEN + value: {{ .Values.backend.env.telegramBotToken | quote }} + - name: TELEGRAM_CHAT_ID + value: {{ .Values.backend.env.telegramChatId | quote }} + - name: BATCH_INTERVAL_MS + value: {{ .Values.backend.env.batchIntervalMs | quote }} + - name: BATCH_MAX_CHARS + value: {{ .Values.backend.env.batchMaxChars | quote }} + - name: INCLUDE_OWN_MESSAGES + value: {{ .Values.backend.env.includeOwnMessages | quote }} + - name: OWN_NAME + value: {{ .Values.backend.env.ownName | quote }} + - name: OWN_LAST_NAME + value: {{ .Values.backend.env.ownLastName | quote }} + - name: KEEP_ALIVE_URL + value: {{ .Values.backend.env.keepAliveUrl | quote }} + - name: KEEP_ALIVE_INTERVAL_MS + value: {{ .Values.backend.env.keepAliveIntervalMs | quote }} + - name: PORT + value: {{ .Values.backend.service.port | quote }} + volumeMounts: + - name: wwebjs-auth + mountPath: /app/.wwebjs_auth + - name: wwebjs-cache + mountPath: /app/.wwebjs_cache + livenessProbe: + httpGet: + path: /liveness + port: http + initialDelaySeconds: 30 + periodSeconds: 15 + readinessProbe: + httpGet: + path: /liveness + port: http + initialDelaySeconds: 10 + periodSeconds: 5 + resources: + {{- toYaml .Values.backend.resources | nindent 12 }} + volumes: + - name: wwebjs-auth + persistentVolumeClaim: + claimName: {{ include "omegabasms.fullname" . }}-backend-auth + - name: wwebjs-cache + emptyDir: {} diff --git a/charts/omegabasms-chart/templates/ingress.yaml b/charts/omegabasms-chart/templates/ingress.yaml new file mode 100644 index 0000000..f6e5667 --- /dev/null +++ b/charts/omegabasms-chart/templates/ingress.yaml @@ -0,0 +1,45 @@ +{{- if .Values.backend.ingress.enabled }} +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: {{ include "omegabasms.fullname" . }}-backend + labels: + {{- include "omegabasms.labels" . | nindent 4 }} + component: backend + {{- with .Values.backend.ingress.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} + {{- with .Values.commonAnnotations }} + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + {{- if .Values.backend.ingress.className }} + ingressClassName: {{ .Values.backend.ingress.className }} + {{- end }} + rules: + {{- range .Values.backend.ingress.hosts }} + - host: {{ .host | quote }} + http: + paths: + {{- range .paths }} + - path: {{ .path }} + pathType: {{ .pathType }} + backend: + service: + name: {{ include "omegabasms.fullname" $ }}-backend + port: + number: {{ $.Values.backend.service.port }} + {{- end }} + {{- end }} + {{- if .Values.backend.ingress.tls }} + tls: + {{- range .Values.backend.ingress.tls }} + - hosts: + {{- range .hosts }} + - {{ . | quote }} + {{- end }} + secretName: {{ .secretName }} + {{- end }} + {{- end }} +{{- end }} diff --git a/charts/omegabasms-chart/templates/pvc.yaml b/charts/omegabasms-chart/templates/pvc.yaml new file mode 100644 index 0000000..09ab883 --- /dev/null +++ b/charts/omegabasms-chart/templates/pvc.yaml @@ -0,0 +1,23 @@ +{{- if .Values.backend.persistence.enabled }} +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: {{ include "omegabasms.fullname" . }}-backend-auth + labels: + {{- include "omegabasms.backend.labels" . | nindent 4 }} + {{- with .Values.commonAnnotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + accessModes: + {{- range .Values.backend.persistence.accessModes }} + - {{ . | quote }} + {{- end }} + {{- if .Values.backend.persistence.storageClass }} + storageClassName: {{ .Values.backend.persistence.storageClass }} + {{- end }} + resources: + requests: + storage: {{ .Values.backend.persistence.size }} +{{- end }} diff --git a/charts/omegabasms-chart/templates/service.yaml b/charts/omegabasms-chart/templates/service.yaml new file mode 100644 index 0000000..6db3455 --- /dev/null +++ b/charts/omegabasms-chart/templates/service.yaml @@ -0,0 +1,19 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ include "omegabasms.fullname" . }}-backend + labels: + {{- include "omegabasms.backend.labels" . | nindent 4 }} + {{- with .Values.commonAnnotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + type: {{ .Values.backend.service.type }} + ports: + - port: {{ .Values.backend.service.port }} + targetPort: http + protocol: TCP + name: http + selector: + {{- include "omegabasms.backend.selectorLabels" . | nindent 4 }} diff --git a/charts/omegabasms-chart/values.yaml b/charts/omegabasms-chart/values.yaml new file mode 100644 index 0000000..57e9858 --- /dev/null +++ b/charts/omegabasms-chart/values.yaml @@ -0,0 +1,65 @@ +nameOverride: "" +fullnameOverride: "" + +imagePullSecrets: [] + +commonLabels: {} +commonAnnotations: {} + +backend: + image: + repository: omegabasms + tag: latest + pullPolicy: IfNotPresent + + replicas: 1 + + resources: + limits: + cpu: 1000m + memory: 1Gi + requests: + cpu: 500m + memory: 512Mi + + env: + groupNames: "Group1,Group2" + textbeeDeviceId: "" + textbeeApiKey: "" + smsRecipient: "" + telegramBotToken: "" + telegramChatId: "" + batchIntervalMs: "900000" + batchMaxChars: "700" + includeOwnMessages: "true" + ownName: "" + ownLastName: "" + keepAliveUrl: "" + keepAliveIntervalMs: "300000" + + persistence: + enabled: true + accessModes: + - ReadWriteOnce + storageClass: "" + size: 1Gi + + service: + type: ClusterIP + port: 3000 + + healthCheck: + path: /liveness + initialDelaySeconds: 10 + periodSeconds: 30 + + ingress: + enabled: false + className: "" + annotations: {} + hosts: + - host: omegabasms.example.com + paths: + - path: / + pathType: Prefix + tls: [] diff --git a/manifests/omegabasms/cname.yaml b/manifests/omegabasms/cname.yaml new file mode 100644 index 0000000..17ff2a5 --- /dev/null +++ b/manifests/omegabasms/cname.yaml @@ -0,0 +1,2 @@ +enabled: true +hostname: omegabasms.dvirlabs.com diff --git a/manifests/omegabasms/values.yaml b/manifests/omegabasms/values.yaml new file mode 100644 index 0000000..b665f04 --- /dev/null +++ b/manifests/omegabasms/values.yaml @@ -0,0 +1,72 @@ +nameOverride: "" +fullnameOverride: "" + +commonLabels: {} +commonAnnotations: {} + +imagePullSecrets: + - name: harbor-regcred + +backend: + image: + repository: harbor.dvirlabs.com/my-apps/omegabasms + tag: latest + pullPolicy: IfNotPresent + + replicas: 1 + + resources: + limits: + cpu: 1000m + memory: 1Gi + requests: + cpu: 500m + memory: 512Mi + + env: + groupNames: "בדיקה" + textbeeDeviceId: "6a159ba75ccc2dc46eac318a" + textbeeApiKey: "a0728b4d-858f-4bab-ab9c-ddb390fc0a69" + smsRecipient: "+972509915261" + telegramBotToken: "8143716130:AAFw5ZPLG9SHp45m8bfICcA9A00sa-n3utQ" + telegramChatId: "283184115" + batchIntervalMs: "70000" + batchMaxChars: "700" + includeOwnMessages: "true" + ownName: "אלישע" + ownLastName: "דוידי" + keepAliveUrl: "" + keepAliveIntervalMs: "300000" + + persistence: + enabled: true + accessModes: + - ReadWriteOnce + storageClass: "nfs-client" + size: 1Gi + + service: + type: ClusterIP + port: 3000 + + healthCheck: + path: /liveness + initialDelaySeconds: 10 + periodSeconds: 30 + + ingress: + enabled: true + className: "traefik" + annotations: + traefik.ingress.kubernetes.io/router.entrypoints: websecure + traefik.ingress.kubernetes.io/router.tls: "true" + cert-manager.io/cluster-issuer: "letsencrypt-prod" + hosts: + - host: omegabasms.dvirlabs.com + paths: + - path: / + pathType: Prefix + tls: + - secretName: omegabasms-tls + hosts: + - omegabasms.dvirlabs.com From 7dae5f59f62ad3c2e000b6aa486cfd57265ab10d Mon Sep 17 00:00:00 2001 From: elishadavidi <62501723+elishadavidi@users.noreply.github.com> Date: Thu, 28 May 2026 16:12:49 +0300 Subject: [PATCH 02/16] fix: point omegabasms to Docker Hub image --- manifests/omegabasms/values.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifests/omegabasms/values.yaml b/manifests/omegabasms/values.yaml index b665f04..1e82ed9 100644 --- a/manifests/omegabasms/values.yaml +++ b/manifests/omegabasms/values.yaml @@ -5,13 +5,13 @@ commonLabels: {} commonAnnotations: {} imagePullSecrets: - - name: harbor-regcred + - name: dockerhub-regcred backend: image: - repository: harbor.dvirlabs.com/my-apps/omegabasms + repository: elisha852/omegabasms tag: latest - pullPolicy: IfNotPresent + pullPolicy: Always replicas: 1 From 5a1a3f74d818ffd1560758decf3c5b6cf71191b4 Mon Sep 17 00:00:00 2001 From: elishadavidi <62501723+elishadavidi@users.noreply.github.com> Date: Thu, 28 May 2026 16:14:39 +0300 Subject: [PATCH 03/16] Update image repo --- manifests/omegabasms/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/omegabasms/values.yaml b/manifests/omegabasms/values.yaml index 1e82ed9..398dae5 100644 --- a/manifests/omegabasms/values.yaml +++ b/manifests/omegabasms/values.yaml @@ -5,7 +5,7 @@ commonLabels: {} commonAnnotations: {} imagePullSecrets: - - name: dockerhub-regcred + - name: omegabasms-dockerhub backend: image: From 0b169c67bd8fc9f57b8bd05bb00534e0ae640d34 Mon Sep 17 00:00:00 2001 From: elishadavidi <62501723+elishadavidi@users.noreply.github.com> Date: Thu, 28 May 2026 16:43:28 +0300 Subject: [PATCH 04/16] Remove relicas --- charts/omegabasms-chart/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/omegabasms-chart/values.yaml b/charts/omegabasms-chart/values.yaml index 57e9858..d6ade77 100644 --- a/charts/omegabasms-chart/values.yaml +++ b/charts/omegabasms-chart/values.yaml @@ -12,7 +12,7 @@ backend: tag: latest pullPolicy: IfNotPresent - replicas: 1 + replicas: 0 resources: limits: From 7a4cba0074233ee3a615988317d6ae24b9f2a028 Mon Sep 17 00:00:00 2001 From: elishadavidi <62501723+elishadavidi@users.noreply.github.com> Date: Thu, 28 May 2026 16:59:12 +0300 Subject: [PATCH 05/16] Remove liveness and rediness tests --- charts/omegabasms-chart/templates/deployment.yaml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/charts/omegabasms-chart/templates/deployment.yaml b/charts/omegabasms-chart/templates/deployment.yaml index 90bd413..6efc9cc 100644 --- a/charts/omegabasms-chart/templates/deployment.yaml +++ b/charts/omegabasms-chart/templates/deployment.yaml @@ -68,18 +68,6 @@ spec: mountPath: /app/.wwebjs_auth - name: wwebjs-cache mountPath: /app/.wwebjs_cache - livenessProbe: - httpGet: - path: /liveness - port: http - initialDelaySeconds: 30 - periodSeconds: 15 - readinessProbe: - httpGet: - path: /liveness - port: http - initialDelaySeconds: 10 - periodSeconds: 5 resources: {{- toYaml .Values.backend.resources | nindent 12 }} volumes: From e2800b8e4678affb829e9879ddebc98798f583f7 Mon Sep 17 00:00:00 2001 From: elishadavidi <62501723+elishadavidi@users.noreply.github.com> Date: Thu, 28 May 2026 18:05:42 +0300 Subject: [PATCH 06/16] Clear chromium lock file on startup --- charts/omegabasms-chart/templates/deployment.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/charts/omegabasms-chart/templates/deployment.yaml b/charts/omegabasms-chart/templates/deployment.yaml index 6efc9cc..83db5f9 100644 --- a/charts/omegabasms-chart/templates/deployment.yaml +++ b/charts/omegabasms-chart/templates/deployment.yaml @@ -30,6 +30,7 @@ spec: - name: omegabasms image: "{{ .Values.backend.image.repository }}:{{ .Values.backend.image.tag }}" imagePullPolicy: {{ .Values.backend.image.pullPolicy }} + command: ["sh", "-c", "find /app/.wwebjs_auth -name 'Singleton*' -delete 2>/dev/null; node index.js"] ports: - name: http containerPort: {{ .Values.backend.service.port }} From 9c8615d553a7bdbac0ab1190d22e2b8a15745c05 Mon Sep 17 00:00:00 2001 From: elishadavidi <62501723+elishadavidi@users.noreply.github.com> Date: Thu, 28 May 2026 18:15:02 +0300 Subject: [PATCH 07/16] Update batching time --- manifests/omegabasms/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/omegabasms/values.yaml b/manifests/omegabasms/values.yaml index 398dae5..00d931e 100644 --- a/manifests/omegabasms/values.yaml +++ b/manifests/omegabasms/values.yaml @@ -30,7 +30,7 @@ backend: smsRecipient: "+972509915261" telegramBotToken: "8143716130:AAFw5ZPLG9SHp45m8bfICcA9A00sa-n3utQ" telegramChatId: "283184115" - batchIntervalMs: "70000" + batchIntervalMs: "300000" batchMaxChars: "700" includeOwnMessages: "true" ownName: "אלישע" From ea5cb5dfe1f709694ffff4faf91f040629df74a4 Mon Sep 17 00:00:00 2001 From: elishadavidi <62501723+elishadavidi@users.noreply.github.com> Date: Thu, 28 May 2026 18:35:16 +0300 Subject: [PATCH 08/16] UPDATE TO PRODUCTION VALUES --- manifests/omegabasms/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/omegabasms/values.yaml b/manifests/omegabasms/values.yaml index 00d931e..e3f7934 100644 --- a/manifests/omegabasms/values.yaml +++ b/manifests/omegabasms/values.yaml @@ -24,10 +24,10 @@ backend: memory: 512Mi env: - groupNames: "בדיקה" + groupNames: 'אומגה בשו"ב' textbeeDeviceId: "6a159ba75ccc2dc46eac318a" textbeeApiKey: "a0728b4d-858f-4bab-ab9c-ddb390fc0a69" - smsRecipient: "+972509915261" + smsRecipient: "+972509215656" telegramBotToken: "8143716130:AAFw5ZPLG9SHp45m8bfICcA9A00sa-n3utQ" telegramChatId: "283184115" batchIntervalMs: "300000" From e09a917a1097884f72b2f14dc5762d72b079e804 Mon Sep 17 00:00:00 2001 From: elishadavidi <62501723+elishadavidi@users.noreply.github.com> Date: Thu, 28 May 2026 19:30:33 +0300 Subject: [PATCH 09/16] Update to 15 mins --- manifests/omegabasms/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/omegabasms/values.yaml b/manifests/omegabasms/values.yaml index e3f7934..2067fef 100644 --- a/manifests/omegabasms/values.yaml +++ b/manifests/omegabasms/values.yaml @@ -30,7 +30,7 @@ backend: smsRecipient: "+972509215656" telegramBotToken: "8143716130:AAFw5ZPLG9SHp45m8bfICcA9A00sa-n3utQ" telegramChatId: "283184115" - batchIntervalMs: "300000" + batchIntervalMs: "900000" batchMaxChars: "700" includeOwnMessages: "true" ownName: "אלישע" From 1ddf2bcad0f01762806e86737d1ddbd86f664f8d Mon Sep 17 00:00:00 2001 From: elishadavidi <62501723+elishadavidi@users.noreply.github.com> Date: Tue, 2 Jun 2026 15:08:20 +0300 Subject: [PATCH 10/16] Update deployment values --- charts/omegabasms-chart/templates/deployment.yaml | 2 ++ charts/omegabasms-chart/values.yaml | 1 + manifests/omegabasms/values.yaml | 1 + 3 files changed, 4 insertions(+) diff --git a/charts/omegabasms-chart/templates/deployment.yaml b/charts/omegabasms-chart/templates/deployment.yaml index 83db5f9..8919fcd 100644 --- a/charts/omegabasms-chart/templates/deployment.yaml +++ b/charts/omegabasms-chart/templates/deployment.yaml @@ -48,6 +48,8 @@ spec: value: {{ .Values.backend.env.telegramBotToken | quote }} - name: TELEGRAM_CHAT_ID value: {{ .Values.backend.env.telegramChatId | quote }} + - name: APPS_SCRIPT_URL + value: {{ .Values.backend.env.appsScriptUrl | quote }} - name: BATCH_INTERVAL_MS value: {{ .Values.backend.env.batchIntervalMs | quote }} - name: BATCH_MAX_CHARS diff --git a/charts/omegabasms-chart/values.yaml b/charts/omegabasms-chart/values.yaml index d6ade77..5540d77 100644 --- a/charts/omegabasms-chart/values.yaml +++ b/charts/omegabasms-chart/values.yaml @@ -36,6 +36,7 @@ backend: ownLastName: "" keepAliveUrl: "" keepAliveIntervalMs: "300000" + appsScriptUrl: "" persistence: enabled: true diff --git a/manifests/omegabasms/values.yaml b/manifests/omegabasms/values.yaml index 2067fef..caa6194 100644 --- a/manifests/omegabasms/values.yaml +++ b/manifests/omegabasms/values.yaml @@ -37,6 +37,7 @@ backend: ownLastName: "דוידי" keepAliveUrl: "" keepAliveIntervalMs: "300000" + appsScriptUrl: https://script.google.com/macros/s/AKfycbznoWH7h0yAh7oPqyQNZXUzq-CiqRqyf5cQ0f-SWNNz863SrSQ9MPdA-nVhXVqyMv5aAw/exec persistence: enabled: true From ce022bcbc200532e2bf31c5d3f51996c9e6b673a Mon Sep 17 00:00:00 2001 From: woodpecker-bot Date: Wed, 3 Jun 2026 23:00:48 +0000 Subject: [PATCH 11/16] frontend: update tag to master-dac10f2 --- manifests/brand-master/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/brand-master/values.yaml b/manifests/brand-master/values.yaml index 05c1a38..f78b9cc 100644 --- a/manifests/brand-master/values.yaml +++ b/manifests/brand-master/values.yaml @@ -70,7 +70,7 @@ frontend: image: repository: harbor.dvirlabs.com/my-apps/brand-master-frontend pullPolicy: IfNotPresent - tag: "master-f02f810" + tag: "master-dac10f2" service: type: ClusterIP port: 80 From 945a1ee1ea4364eff95e3a619dafee54ee7e7ff3 Mon Sep 17 00:00:00 2001 From: woodpecker-bot Date: Wed, 3 Jun 2026 23:00:53 +0000 Subject: [PATCH 12/16] backend: update tag to master-dac10f2 --- manifests/brand-master/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/brand-master/values.yaml b/manifests/brand-master/values.yaml index f78b9cc..11d290c 100644 --- a/manifests/brand-master/values.yaml +++ b/manifests/brand-master/values.yaml @@ -9,7 +9,7 @@ backend: image: repository: harbor.dvirlabs.com/my-apps/brand-master-backend pullPolicy: IfNotPresent - tag: "master-f02f810" + tag: "master-dac10f2" service: type: ClusterIP port: 8000 From c588759bb4e5397b82d5375da6e74ddb45af2608 Mon Sep 17 00:00:00 2001 From: woodpecker-bot Date: Wed, 3 Jun 2026 23:14:35 +0000 Subject: [PATCH 13/16] frontend: update tag to master-61d5832 --- manifests/brand-master/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/brand-master/values.yaml b/manifests/brand-master/values.yaml index 11d290c..b86b470 100644 --- a/manifests/brand-master/values.yaml +++ b/manifests/brand-master/values.yaml @@ -70,7 +70,7 @@ frontend: image: repository: harbor.dvirlabs.com/my-apps/brand-master-frontend pullPolicy: IfNotPresent - tag: "master-dac10f2" + tag: "master-61d5832" service: type: ClusterIP port: 80 From e9e6f89e900c00c8178dfd03f03661b8854499f2 Mon Sep 17 00:00:00 2001 From: elishadavidi <62501723+elishadavidi@users.noreply.github.com> Date: Thu, 4 Jun 2026 15:38:06 +0300 Subject: [PATCH 14/16] Update values to support returning messages --- charts/omegabasms-chart/templates/deployment.yaml | 8 ++++++++ charts/omegabasms-chart/values.yaml | 4 ++++ manifests/omegabasms/values.yaml | 7 +++++-- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/charts/omegabasms-chart/templates/deployment.yaml b/charts/omegabasms-chart/templates/deployment.yaml index 8919fcd..444fc25 100644 --- a/charts/omegabasms-chart/templates/deployment.yaml +++ b/charts/omegabasms-chart/templates/deployment.yaml @@ -50,6 +50,14 @@ spec: value: {{ .Values.backend.env.telegramChatId | quote }} - name: APPS_SCRIPT_URL value: {{ .Values.backend.env.appsScriptUrl | quote }} + - name: SMS_WEBHOOK_TOKEN + value: {{ .Values.backend.env.smsWebhookToken | quote }} + - name: TEST_GROUP_NAMES + value: {{ .Values.backend.env.testGroupNames | quote }} + - name: TEST_SMS_RECIPIENT + value: {{ .Values.backend.env.testSmsRecipient | quote }} + - name: TEST_SMS_FROM + value: {{ .Values.backend.env.testSmsFrom | quote }} - name: BATCH_INTERVAL_MS value: {{ .Values.backend.env.batchIntervalMs | quote }} - name: BATCH_MAX_CHARS diff --git a/charts/omegabasms-chart/values.yaml b/charts/omegabasms-chart/values.yaml index 5540d77..b39c54a 100644 --- a/charts/omegabasms-chart/values.yaml +++ b/charts/omegabasms-chart/values.yaml @@ -37,6 +37,10 @@ backend: keepAliveUrl: "" keepAliveIntervalMs: "300000" appsScriptUrl: "" + smsWebhookToken: "" + testGroupNames: "" + testSmsRecipient: "" + testSmsFrom: "" persistence: enabled: true diff --git a/manifests/omegabasms/values.yaml b/manifests/omegabasms/values.yaml index caa6194..4d48c53 100644 --- a/manifests/omegabasms/values.yaml +++ b/manifests/omegabasms/values.yaml @@ -33,10 +33,13 @@ backend: batchIntervalMs: "900000" batchMaxChars: "700" includeOwnMessages: "true" - ownName: "אלישע" - ownLastName: "דוידי" + ownName: "אלישע דוידי" keepAliveUrl: "" keepAliveIntervalMs: "300000" + smsWebhookToken: "https://script.google.com/macros/s/AKfycbznoWH7h0yAh7oPqyQNZXUzq-CiqRqyf5cQ0f-SWNNz863SrSQ9MPdA-nVhXVqyMv5aAw/exec" + testGroupNames: "בדיקה בלי איילת" + testSmsRecipient: "+972509915261" + testSmsFrom: "+972509915261" appsScriptUrl: https://script.google.com/macros/s/AKfycbznoWH7h0yAh7oPqyQNZXUzq-CiqRqyf5cQ0f-SWNNz863SrSQ9MPdA-nVhXVqyMv5aAw/exec persistence: From 0c1cd58829adba15628ca1cacc7dfa2c6adc64d5 Mon Sep 17 00:00:00 2001 From: elishadavidi <62501723+elishadavidi@users.noreply.github.com> Date: Thu, 4 Jun 2026 15:51:37 +0300 Subject: [PATCH 15/16] Update sms from --- manifests/omegabasms/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/omegabasms/values.yaml b/manifests/omegabasms/values.yaml index 4d48c53..85e31a7 100644 --- a/manifests/omegabasms/values.yaml +++ b/manifests/omegabasms/values.yaml @@ -39,7 +39,7 @@ backend: smsWebhookToken: "https://script.google.com/macros/s/AKfycbznoWH7h0yAh7oPqyQNZXUzq-CiqRqyf5cQ0f-SWNNz863SrSQ9MPdA-nVhXVqyMv5aAw/exec" testGroupNames: "בדיקה בלי איילת" testSmsRecipient: "+972509915261" - testSmsFrom: "+972509915261" + testSmsFrom: "+972585909815" appsScriptUrl: https://script.google.com/macros/s/AKfycbznoWH7h0yAh7oPqyQNZXUzq-CiqRqyf5cQ0f-SWNNz863SrSQ9MPdA-nVhXVqyMv5aAw/exec persistence: From e29f74e30860457a82597f3c5330139767e4fb4c Mon Sep 17 00:00:00 2001 From: elishadavidi <62501723+elishadavidi@users.noreply.github.com> Date: Thu, 4 Jun 2026 16:33:08 +0300 Subject: [PATCH 16/16] Update sms webhook token --- manifests/omegabasms/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/omegabasms/values.yaml b/manifests/omegabasms/values.yaml index 85e31a7..7422b87 100644 --- a/manifests/omegabasms/values.yaml +++ b/manifests/omegabasms/values.yaml @@ -36,7 +36,7 @@ backend: ownName: "אלישע דוידי" keepAliveUrl: "" keepAliveIntervalMs: "300000" - smsWebhookToken: "https://script.google.com/macros/s/AKfycbznoWH7h0yAh7oPqyQNZXUzq-CiqRqyf5cQ0f-SWNNz863SrSQ9MPdA-nVhXVqyMv5aAw/exec" + smsWebhookToken: "798a3bb5-98b7-4e70-9783-550af4779964" testGroupNames: "בדיקה בלי איילת" testSmsRecipient: "+972509915261" testSmsFrom: "+972585909815"