Update Yonote v2 branch

2026-09-29 12:12:01 +03:00
parent 6bdd590d1a
commit 27a07125b9
21 changed files with 843 additions and 65 deletions
@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: postgres-init-scripts
+data:
+  init-keycloak-db.sh: |
+    !/bin/bash
+    set -e
+
+    psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL
+    CREATE DATABASE {{ .Values.keycloak.database.database }};
+    CREATE USER {{ .Values.keycloak.database.username }} WITH PASSWORD '{{ .Values.keycloak.database.password }}';
+    GRANT ALL PRIVILEGES ON DATABASE keycloak TO {{ .Values.keycloak.database.username }};
+    EOSQL
@@ -0,0 +1,10 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: yonote-configs
+  labels:
+  {{- include "common.labels.standard" $ | nindent 4 }}
+  {{- with .Values.global.yonote.config.plain.data }}
+data:
+  {{- include "common.tplvalues.render" (dict "value" . "context" $) | nindent 2 }}
+  {{- end }}
@@ -0,0 +1,69 @@
+{{- if eq ($.Values.global.yonote_cron_calendar_events.cron_enabled  | toString) "true" }}
+apiVersion: batch/v1
+kind: CronJob
+metadata:
+  name: cron-calendar-events
+spec:
+  schedule: "*/1 * * * *"
+  jobTemplate:
+    spec:
+      template:
+        spec:
+          containers:
+          - name: cron-calendar-events
+            image: curlimages/curl
+            imagePullPolicy: IfNotPresent
+            envFrom:
+            - secretRef:
+                name: yonote-secrets
+            command:
+              - /bin/sh
+              - -c
+              - >-
+                date;
+                curl
+                -X POST
+                {{ .Values.global.yonote_cron_calendar_events.url }}
+                -H "Content-Type: application/json"
+                -d '
+                {
+                "token": "$(UTILS_SECRET)"
+                }
+                '                                
+          restartPolicy: OnFailure
+{{- end }}
+---
+{{- if eq ($.Values.global.yonote_cron_task_scheduler.cron_enabled  | toString) "true" }}
+apiVersion: batch/v1
+kind: CronJob
+metadata:
+  name: cron-task-scheduler
+spec:
+  schedule: "0 */1 * * *"
+  jobTemplate:
+    spec:
+      template:
+        spec:
+          containers:
+          - name: cron-task-scheduler
+            image: curlimages/curl
+            imagePullPolicy: IfNotPresent
+            envFrom:
+            - secretRef:
+                name: yonote-secrets
+            command:
+              - /bin/sh
+              - -c
+              - >-
+                date;
+                curl
+                -X POST
+                {{ .Values.global.yonote_cron_task_scheduler.url }}
+                -H "Content-Type: application/json"
+                -d '
+                {
+                "token":"$(UTILS_SECRET)", "limit":"200"
+                }
+                '                                
+          restartPolicy: OnFailure
+{{- end }}
@@ -0,0 +1,34 @@
+{{- if .Values.ingress.enabled }}
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: {{ .Values.ingress.name }}
+  namespace: {{ .Values.ingress.namespace }}
+  annotations:
+    {{- range $key, $value := .Values.ingress.annotations }}
+    {{ $key }}: "{{ $value }}"
+    {{- end }}
+spec:
+  ingressClassName: {{ .Values.ingress.ingressClassName }}
+  tls:
+    - secretName: "{{ .Values.ingress.tls.secretName }}"
+      hosts:
+        {{- range .Values.ingress.tls.hosts }}
+        - "{{ . }}"
+        {{- end }}
+  rules:
+    {{- range .Values.ingress.rules }}
+    - host: "{{ .host }}"
+      http:
+        paths:
+          {{- range .paths }}
+          - path: {{ .path }}
+            pathType: {{ .pathType }}
+            backend:
+              service:
+                name: {{ .service.name }}
+                port:
+                  number: {{ .service.port | int }}
+          {{- end }}
+    {{- end }}
+{{- end }}
@@ -0,0 +1,85 @@
+{{- if .Values.mcJob.enabled }}
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: yonote-minio-mc-job
+  labels:
+    app: yonote-minio
+spec:
+  template:
+    metadata:
+      labels:
+        app: yonote-minio
+    spec:
+      containers:
+        - name: mc-client
+          image: "minio/mc:RELEASE.2025-01-17T23-25-50Z"
+          command: ["/bin/sh", "-c"]
+          args:
+            - |
+              until mc alias set myminio http://yonote-minio:9000 {{ .Values.minio.rootUser }} {{ .Values.minio.rootPassword }}; do
+                echo "Waiting for MinIO to be ready..."
+                sleep 5
+              done
+              echo "MinIO is ready and alias is set."
+
+              # Создание бакета
+              if ! mc ls myminio/{{ .Values.global.yonote.config.plain.data.AWS_S3_UPLOAD_BUCKET_NAME }}; then
+                mc mb myminio/{{ .Values.global.yonote.config.plain.data.AWS_S3_UPLOAD_BUCKET_NAME }}
+                echo "Bucket {{ .Values.global.yonote.config.plain.data.AWS_S3_UPLOAD_BUCKET_NAME }} created successfully."
+              else
+                echo "Bucket {{ .Values.global.yonote.config.plain.data.AWS_S3_UPLOAD_BUCKET_NAME }} already exists."
+              fi
+
+              # Установка политик для бакета
+              cat <<EOF > /tmp/minio-bucket-policy.json
+              {
+                "Version": "2012-10-17",
+                "Statement": [
+                  {
+                    "Effect": "Allow",
+                    "Principal": {
+                      "AWS": [
+                        "*"
+                      ]
+                    },
+                    "Action": [
+                      "s3:GetBucketLocation"
+                    ],
+                    "Resource": [
+                      "arn:aws:s3:::{{ .Values.global.yonote.config.plain.data.AWS_S3_UPLOAD_BUCKET_NAME }}"
+                    ]
+                  },
+                  {
+                    "Effect": "Allow",
+                    "Principal": {
+                      "AWS": [
+                        "*"
+                      ]
+                    },
+                    "Action": [
+                      "s3:GetObject"
+                    ],
+                    "Resource": [
+                      "arn:aws:s3:::{{ .Values.global.yonote.config.plain.data.AWS_S3_UPLOAD_BUCKET_NAME }}/*"
+                    ]
+                  }
+                ]
+              }
+              EOF
+              echo "Bucket policy JSON file created."
+
+              mc anonymous set-json /tmp/minio-bucket-policy.json myminio/{{ .Values.global.yonote.config.plain.data.AWS_S3_UPLOAD_BUCKET_NAME }}
+              echo "Bucket policy applied."
+
+          resources:
+            requests:
+              memory: "128Mi"
+              cpu: "100m"
+            limits:
+              memory: "256Mi"
+              cpu: "200m"
+      restartPolicy: OnFailure
+  backoffLimit: 5
+  ttlSecondsAfterFinished: 180
+{{- end }}
@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: yonote-secrets
+  labels:
+  {{- include "common.labels.standard" $ | nindent 4 }}
+type: Opaque
+  {{- with .Values.global.yonote.config.secret.data }}
+data:
+  {{- toYaml . | nindent 2 }}
+  {{- end }}
+  {{- with .Values.global.yonote.config.secret.stringData }}
+stringData: {{- include "common.tplvalues.render" (dict "value" . "context" $) | nindent 2 }}
+  {{- end }}