[SIS-xxx] introducing helm chart

restructuring
2026-01-26 19:21:43 +00:00 · 2023-08-27 23:04:42 +02:00
parent 30d45952be
commit d65f6d380f
60 changed files with 1955 additions and 3246 deletions
--- a/deployment/image-packaging/src/main/docker/.env
+++ b/deployment/image-packaging/src/main/docker/.env
@@ -1,6 +1,2 @@
-PROMTAIL_VERSION=2.2.1
-LOKI_VERSION=2.2.1
-PROMETHEUS_VERSION=v2.28.1
-PG_ADMIN_VERSION=5.5
-GRAFANA_VERSION=8.0.6
-POSTGRES_VERSION=13.3-buster
+REGISTRY_PREFIX=harbor.sheldan.dev/sissi/
+VERSION=0.0.1
--- a/deployment/image-packaging/src/main/docker/database/Dockerfile
+++ b/deployment/image-packaging/src/main/docker/database/Dockerfile
@@ -1,5 +0,0 @@
-ARG POSTGRES_VERSION
-FROM postgres:${POSTGRES_VERSION}
-MAINTAINER Sheldan
-VOLUME /tmp
-ADD sql/init.sql /docker-entrypoint-initdb.d/init.sql
--- a/deployment/image-packaging/src/main/docker/database/sql/init.sql
+++ b/deployment/image-packaging/src/main/docker/database/sql/init.sql
@@ -1 +0,0 @@
-CREATE SCHEMA abstracto
--- a/deployment/image-packaging/src/main/docker/db-data/Dockerfile
+++ b/deployment/image-packaging/src/main/docker/db-data/Dockerfile
@@ -0,0 +1,6 @@
+FROM alpine:3.18.0
+MAINTAINER Sheldan
+ADD config/ /var/db-config/
+ADD liquibase-artifacts /var/db-config/liquibase-zips
+
+CMD ["/bin/sh", "/var/db-config/move.sh"]
--- a/deployment/image-packaging/src/main/docker/deployment/config/artifact_versions.json
+++ b/deployment/image-packaging/src/main/docker/deployment/config/artifact_versions.json
@@ -1,17 +1,4 @@
 {
-  "template_artifacts": [
-    "core","starboard", "link-embed", "moderation", "entertainment", "custom-command", "utility", "webservices", "remind", "suggestion", "modmail", "assignable-roles", "experience-tracking", "logging", "statistic", "twitch",
-    "quotes", "meetup", "debra",
-    "moderation-custom",
-    "moderation-template-overrides", "experience-template-overrides", "logging-template-overrides"
-  ],
-  "translation_artifacts": [
-    "core",
-    "starboard", "link-embed", "moderation", "entertainment", "custom-command", "utility", "webservices", "suggestion", "remind", "modmail", "assignable-roles", "experience-tracking", "logging", "statistic", "twitch",
-    "quotes", "meetup", "debra",
-    "moderation-custom",
-    "moderation-translation-overrides", "experience-translation-overrides", "logging-translation-overrides"
-  ],
  "liquibase_artifacts": [
    { "zip": "scheduling", "file": "scheduling-changeLog.xml" },
    { "zip": "core", "file": "core-changeLog.xml" },
--- a/deployment/image-packaging/src/main/docker/db-data/config/move.sh
+++ b/deployment/image-packaging/src/main/docker/db-data/config/move.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+mv /var/db-config/* /var/run-config/
--- a/deployment/image-packaging/src/main/docker/deployment/Dockerfile
+++ b/deployment/image-packaging/src/main/docker/deployment/Dockerfile
@@ -1,8 +0,0 @@
-ARG ABSTRACTO_REGISTRY_PREFIX
-ARG ABSTRACTO_VERSION=latest
-FROM ${ABSTRACTO_REGISTRY_PREFIX}abstracto_deployment:${ABSTRACTO_VERSION:-latest}
-MAINTAINER Sheldan
-ADD template-artifacts /templates
-ADD translation-artifacts /translations
-ADD liquibase-artifacts /liquibase-zips
-ADD config /
--- a/deployment/image-packaging/src/main/docker/docker-compose.yml
+++ b/deployment/image-packaging/src/main/docker/docker-compose.yml
@@ -5,46 +5,11 @@ services:
    build:
      context: sissi
    image: ${REGISTRY_PREFIX}sissi:${VERSION:-latest}
-  database:
+  db-data:
    build:
-      context: database
-      args:
-        POSTGRES_VERSION: ${POSTGRES_VERSION}
-    image: ${REGISTRY_PREFIX}sissi_database:${VERSION:-latest}
-  pg_admin:
+      context: db-data
+    image: ${REGISTRY_PREFIX}sissi-db-data:${VERSION:-latest}
+  template-data:
    build:
-      context: pgAdmin
-      args:
-        PG_ADMIN_VERSION: ${PG_ADMIN_VERSION}
-    image: ${REGISTRY_PREFIX}sissi_pg_admin:${VERSION:-latest}
-  deployment_container:
-    build:
-      context: deployment
-      args:
-        ABSTRACTO_REGISTRY_PREFIX: ${ABSTRACTO_REGISTRY_PREFIX}
-        ABSTRACTO_VERSION: ${ABSTRACTO_VERSION}
-    image: ${REGISTRY_PREFIX}sissi_deployment:${VERSION:-latest}
-  prometheus:
-    build:
-      context: prometheus
-      args:
-        PROMETHEUS_VERSION: ${PROMETHEUS_VERSION}
-    image: ${REGISTRY_PREFIX}sissi_prometheus:${VERSION:-latest}
-  grafana:
-    build:
-      context: grafana
-      args:
-        GRAFANA_VERSION: ${GRAFANA_VERSION}
-    image: ${REGISTRY_PREFIX}sissi_grafana:${VERSION:-latest}
-  promtail:
-    build:
-      context: promtail
-      args:
-        PROMTAIL_VERSION: ${PROMTAIL_VERSION}
-    image: ${REGISTRY_PREFIX}sissi_promtail:${VERSION:-latest}
-  loki:
-    build:
-      context: loki
-      args:
-        LOKI_VERSION: ${LOKI_VERSION}
-    image: ${REGISTRY_PREFIX}sissi_loki:${VERSION:-latest}
+      context: template-data
+    image:  ${REGISTRY_PREFIX}sissi-template-data:${VERSION:-latest}
--- a/deployment/image-packaging/src/main/docker/grafana/Dockerfile
+++ b/deployment/image-packaging/src/main/docker/grafana/Dockerfile
@@ -1,6 +0,0 @@
-ARG GRAFANA_VERSION
-FROM grafana/grafana:${GRAFANA_VERSION}
-MAINTAINER Sheldan
-ADD ./provisioning /etc/grafana/provisioning
-ADD ./config.ini /etc/grafana/config.ini
-ADD ./dashboards /var/lib/grafana/dashboards
--- a/deployment/image-packaging/src/main/docker/grafana/config.ini
+++ b/deployment/image-packaging/src/main/docker/grafana/config.ini
@@ -1,2 +0,0 @@
-[paths]
-provisioning = conf/provisioning
--- a/deployment/image-packaging/src/main/docker/grafana/dashboards/jvm-dashboard.json
+++ b/deployment/image-packaging/src/main/docker/grafana/dashboards/jvm-dashboard.json
--- a/deployment/image-packaging/src/main/docker/grafana/dashboards/r-austria-bot-logs.json
+++ b/deployment/image-packaging/src/main/docker/grafana/dashboards/r-austria-bot-logs.json
@@ -1,65 +0,0 @@
-{
-  "annotations": {
-    "list": [
-      {
-        "builtIn": 1,
-        "datasource": "-- Grafana --",
-        "enable": true,
-        "hide": true,
-        "iconColor": "rgba(0, 211, 255, 1)",
-        "name": "Annotations & Alerts",
-        "type": "dashboard"
-      }
-    ]
-  },
-  "editable": true,
-  "gnetId": null,
-  "graphTooltip": 0,
-  "id": 4,
-  "links": [],
-  "panels": [
-    {
-      "datasource": "Loki",
-      "gridPos": {
-        "h": 14,
-        "w": 24,
-        "x": 0,
-        "y": 0
-      },
-      "id": 2,
-      "options": {
-        "dedupStrategy": "none",
-        "enableLogDetails": true,
-        "showLabels": false,
-        "showTime": false,
-        "sortOrder": "Descending",
-        "wrapLogMessage": true
-      },
-      "targets": [
-        {
-          "expr": "{job=\"sissi-logs\", filename=\"/logs/log.log\"}",
-          "queryType": "randomWalk",
-          "refId": "A"
-        }
-      ],
-      "title": "Sissi logs",
-      "type": "logs"
-    }
-  ],
-  "refresh": "",
-  "schemaVersion": 30,
-  "style": "dark",
-  "tags": [],
-  "templating": {
-    "list": []
-  },
-  "time": {
-    "from": "now-3h",
-    "to": "now"
-  },
-  "timepicker": {},
-  "timezone": "",
-  "title": "Sissi logs",
-  "uid": "1uGb0q4nz",
-  "version": 2
-}
--- a/deployment/image-packaging/src/main/docker/grafana/dashboards/r-austria-bot-status-dashboard.json
+++ b/deployment/image-packaging/src/main/docker/grafana/dashboards/r-austria-bot-status-dashboard.json
--- a/deployment/image-packaging/src/main/docker/grafana/provisioning/dashboards/all.yml
+++ b/deployment/image-packaging/src/main/docker/grafana/provisioning/dashboards/all.yml
@@ -1,6 +0,0 @@
- name: 'sissi-bot-dashboards'
-  org_id: 1
-  folder: ''
-  type: 'file'
-  options:
-    folder: '/var/lib/grafana/dashboards'
--- a/deployment/image-packaging/src/main/docker/grafana/provisioning/datasources/all.yml
+++ b/deployment/image-packaging/src/main/docker/grafana/provisioning/datasources/all.yml
@@ -1,29 +0,0 @@
-apiVersion: 1
-datasources:
-  -  access: 'proxy'
-     editable: true
-     is_default: true
-     name: 'prometheus'
-     org_id: 1
-     type: 'prometheus'
-     url: 'http://${PROMETHEUS_HOST}:${PROMETHEUS_PORT}'
-     version: 1
-  - name: 'postgres-db'
-    type: postgres
-    access: 'proxy'
-    url: '${DB_HOST}:${DB_PORT}'
-    password: '${DB_PASS}'
-    user: '${DB_USER}'
-    database: '${DB_NAME}'
-    basicAuth: false
-    is_default: false
-    jsonData:
-       sslmode: 'disable'
-    version: 1
-    editable: false
-  - name: Loki
-    type: loki
-    access: proxy
-    url: 'http://${LOKI_HOST}:${LOKI_PORT}'
-    jsonData:
-      maxLines: 2000
--- a/deployment/image-packaging/src/main/docker/loki/Dockerfile
+++ b/deployment/image-packaging/src/main/docker/loki/Dockerfile
@@ -1,4 +0,0 @@
-ARG LOKI_VERSION
-FROM grafana/loki:${LOKI_VERSION}
-MAINTAINER Sheldan
-ADD loki.yml /mnt/config/loki-config.yaml
--- a/deployment/image-packaging/src/main/docker/loki/loki.yml
+++ b/deployment/image-packaging/src/main/docker/loki/loki.yml
@@ -1,66 +0,0 @@
-auth_enabled: false
-
-server:
-  http_listen_port: 3100
-  grpc_listen_port: 9096
-
-ingester:
-  wal:
-    enabled: true
-    dir: /tmp/wal
-  lifecycler:
-    address: 127.0.0.1
-    ring:
-      kvstore:
-        store: inmemory
-      replication_factor: 1
-    final_sleep: 0s
-  chunk_idle_period: 1h
-  max_chunk_age: 1h
-  chunk_target_size: 1048576
-  chunk_retain_period: 30s
-  max_transfer_retries: 0
-
-schema_config:
-  configs:
-    - from: 2020-10-24
-      store: boltdb-shipper
-      object_store: filesystem
-      schema: v11
-      index:
-        prefix: index_
-        period: 24h
-
-storage_config:
-  boltdb_shipper:
-    active_index_directory: /tmp/loki/boltdb-shipper-active
-    cache_location: /tmp/loki/boltdb-shipper-cache
-    cache_ttl: 24h
-    shared_store: filesystem
-  filesystem:
-    directory: /tmp/loki/chunks
-
-compactor:
-  working_directory: /tmp/loki/boltdb-shipper-compactor
-  shared_store: filesystem
-
-limits_config:
-  reject_old_samples: true
-  reject_old_samples_max_age: 168h
-
-chunk_store_config:
-  max_look_back_period: 0s
-
-table_manager:
-  retention_deletes_enabled: true
-  retention_period: 360h
-
-ruler:
-  storage:
-    type: local
-    local:
-      directory: /tmp/loki/rules
-  rule_path: /tmp/loki/rules-temp
-  ring:
-    kvstore:
-      store: inmemory
--- a/deployment/image-packaging/src/main/docker/pgAdmin/Dockerfile
+++ b/deployment/image-packaging/src/main/docker/pgAdmin/Dockerfile
@@ -1,5 +0,0 @@
-ARG PG_ADMIN_VERSION
-FROM dpage/pgadmin4:${PG_ADMIN_VERSION}
-MAINTAINER Sheldan
-VOLUME /tmp
-ADD config/servers.json /pgadmin4/servers.json
--- a/deployment/image-packaging/src/main/docker/pgAdmin/config/servers.json
+++ b/deployment/image-packaging/src/main/docker/pgAdmin/config/servers.json
@@ -1,13 +0,0 @@
-{
-  "Servers": {
-    "1": {
-      "Name": "Sissi database",
-      "Group": "Server Group 1",
-      "Port": 5432,
-      "Username": "abstracto",
-      "Host": "sissi_database",
-      "SSLMode": "prefer",
-      "MaintenanceDB": "postgres"
-    }
-  }
-}
--- a/deployment/image-packaging/src/main/docker/prometheus/Dockerfile
+++ b/deployment/image-packaging/src/main/docker/prometheus/Dockerfile
@@ -1,4 +0,0 @@
-ARG PROMETHEUS_VERSION
-FROM prom/prometheus:${PROMETHEUS_VERSION}
-MAINTAINER Sheldan
-ADD prometheus.yml /etc/prometheus/prometheus.yml
--- a/deployment/image-packaging/src/main/docker/prometheus/prometheus.yml
+++ b/deployment/image-packaging/src/main/docker/prometheus/prometheus.yml
@@ -1,17 +0,0 @@
-global:
-  scrape_interval: 10s
-  scrape_timeout: 10s
-  evaluation_interval: 1m
-scrape_configs:
-  - job_name: sissi_micrometer
-    honor_timestamps: true
-    scrape_interval: 5s
-    scrape_timeout: 5s
-    metrics_path: /actuator/prometheus
-    scheme: http
-    static_configs:
-      - targets:
-          - sissibot:8080
-    basic_auth:
-      username: "abstracto"
-      password_file: /etc/prometheus/micrometer_password
--- a/deployment/image-packaging/src/main/docker/promtail/Dockerfile
+++ b/deployment/image-packaging/src/main/docker/promtail/Dockerfile
@@ -1,4 +0,0 @@
-ARG PROMTAIL_VERSION
-FROM grafana/promtail:${PROMTAIL_VERSION}
-MAINTAINER Sheldan
-ADD promtail.yaml /mnt/config/promtail-config.yaml
--- a/deployment/image-packaging/src/main/docker/promtail/promtail.yaml
+++ b/deployment/image-packaging/src/main/docker/promtail/promtail.yaml
@@ -1,17 +0,0 @@
-server:
-  disable: true
-
-positions:
-  filename: /tmp/positions.yaml
-
-clients:
-  - url: http://sissi_loki:3100/loki/api/v1/push
-
-scrape_configs:
-  - job_name: system
-    static_configs:
-      - targets:
-          - localhost
-        labels:
-          job: sissi-logs
-          __path__: /logs/*.log
--- a/deployment/image-packaging/src/main/docker/sissi/Dockerfile
+++ b/deployment/image-packaging/src/main/docker/sissi/Dockerfile
@@ -1,10 +1,8 @@
 FROM openjdk:17-alpine
 MAINTAINER Sheldan
 VOLUME /tmp
-ADD bot/app.jar /app.jar
 ADD config/* /config/
-VOLUME ["/config"]
-VOLUME ["/logs"]
 ADD wrapper/*.sh /
 RUN chmod +x /start.sh
+ADD bot/app.jar /app.jar
 CMD ["/start.sh"]
--- a/deployment/image-packaging/src/main/docker/template-data/Dockerfile
+++ b/deployment/image-packaging/src/main/docker/template-data/Dockerfile
@@ -0,0 +1,7 @@
+FROM alpine:3.18.0
+MAINTAINER Sheldan
+ADD config /var/template-config/
+ADD template-artifacts /var/template-config/templates
+ADD translation-artifacts /var/template-config/translations
+
+CMD ["/bin/sh", "/var/template-config/move.sh"]
--- a/deployment/image-packaging/src/main/docker/template-data/config/artifact_versions.json
+++ b/deployment/image-packaging/src/main/docker/template-data/config/artifact_versions.json
@@ -0,0 +1,17 @@
+{
+  "template_artifacts": [
+    "core","starboard", "link-embed", "moderation", "entertainment", "custom-command", "utility", "webservices", "remind", "suggestion", "modmail", "assignable-roles", "experience-tracking", "logging", "statistic", "twitch",
+    "quotes", "meetup", "debra",
+    "moderation-custom",
+    "moderation-template-overrides", "experience-template-overrides", "logging-template-overrides"
+  ],
+  "translation_artifacts": [
+    "core",
+    "starboard", "link-embed", "moderation", "entertainment", "custom-command", "utility", "webservices", "suggestion", "remind", "modmail", "assignable-roles", "experience-tracking", "logging", "statistic", "twitch",
+    "quotes", "meetup", "debra",
+    "moderation-custom",
+    "moderation-translation-overrides", "experience-translation-overrides", "logging-translation-overrides"
+  ]
+}
+
+
--- a/deployment/image-packaging/src/main/docker/template-data/config/move.sh
+++ b/deployment/image-packaging/src/main/docker/template-data/config/move.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+mv /var/template-config/* /var/run-config/