Add k8s deploy example

.gitignore

@@ -6,4 +6,5 @@ memory.sqlite3
 /video
 /voice
 /.idea
-Cargo.lock
+Cargo.lock
+k8s/k8s-deploy.yaml

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "desubot"
-version = "0.5.5"
+version = "0.5.7"
 authors = ["AB <ab@hexor.ru>"]
 edition = "2018"
 
@@ -8,23 +8,24 @@ edition = "2018"
 
 [dependencies]
 bytes = "0.5"
-tokio = { version = "1.10.0", features = ["full"]}
+tokio = { version = "0.2", features = ["full"]}
 tracing = "0.1.9"
 tracing-futures = "0.2"
 multipart = { version = "0.16", default-features = false, features = ["client"] }
-telegram-bot = "0.8.0"
+#telegram-bot = "0.8.0"
+telegram-bot = { git = "https://github.com/ayrat555/telegram-bot", branch = "ayrat555/api-fixes-10" }
 silicon = "0.4.0"
-hyper = "0.14"
+hyper = "0.13"
 hyper-tls = { version = "0.4", optional = true  }
 futures = "0.3"
 hyper-rustls = { version = "0.19", optional = true }
 rusqlite = { version = "0.24.2", features = ["bundled"]}
 html-escape = "0.2"
 regex = "1"
-reqwest = "0.11.4"
+reqwest = "0.10.9"
 uuid = { version = "0.8", features = ["v4"] }
 sha1 = "0.6.0"
-env_logger = "0.9.0"
+env_logger = "0.7"
 log = { version = "^0.4.5", features = ["std"] }
 subprocess = "0.2.6"
 serde_json = "1.0"
@@ -33,7 +34,7 @@ rand = "0.7.3"
 mystem = "^0.2"
 #mystem = { path = "../mystem-rs" }
 async-trait = "0.1.42"
-sqlparser = "0.9.0"
+sqlparser = "0.7.0"
 
 [dependencies.syntect]
 version = "4.4"

Dockerfile

@@ -0,0 +1,14 @@
+# syntax=docker/dockerfile:1
+
+FROM rust:latest AS builder
+WORKDIR /desubot
+ADD ./ /desubot/
+RUN cargo build --release
+
+FROM ubuntu:latest
+WORKDIR /storage
+COPY --from=builder /desubot/target/release/desubot /usr/bin/
+COPY mystem /usr/bin/
+RUN apt update && apt install -y fontconfig openssl ca-certificates && rm -rf /var/lib/apt/lists/*
+ENTRYPOINT desubot
+

k8s/k8s-deploy-example.yaml

@@ -0,0 +1,43 @@
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: desubot-api-token
+data:
+  token: 123.... # Base64 encoded token.
+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: desubot
+spec:
+  serviceName: "desubot"
+  replicas: 1
+  selector:
+    matchLabels:
+      app: desubot
+  template:
+    metadata:
+      labels:
+        app: desubot
+    spec:
+      containers:
+      - name: desubot
+        image: ultradesu/desubot:latest
+        volumeMounts:
+        - name: storage
+          mountPath: /storage
+        env:
+        - name: TELEGRAM_BOT_TOKEN
+          valueFrom:
+            secretKeyRef:
+              name: desubot-api-token
+              key: token
+  volumeClaimTemplates:
+  - metadata:
+      name: storage
+    spec:
+      accessModes: [ "ReadWriteOnce" ]
+      resources:
+        requests:
+          storage: 50Gi

src/handlers.rs

@@ -53,7 +53,12 @@ pub async fn handler(
                         }
                     }
                 }
-                s if s.contains("/here") || s.contains("@here") || s.contains("/хере") || s.contains("@хере") || s.contains("\"хере") => {
+                s if s.contains("/here")
+                    || s.contains("@here")
+                    || s.contains("/хере")
+                    || s.contains("@хере")
+                    || s.contains("\"хере") =>
+                {
                     db::add_sentence(&message, mystem).await?;
                     Here {
                         data: "".to_string(),

src/main.rs

@@ -1,5 +1,6 @@
 #![allow(unreachable_code)]
 use std::{env, process};
+use tokio::time::{delay_for, Duration};
 
 use futures::StreamExt;
 use telegram_bot::*;
@@ -47,18 +48,31 @@ async fn main() -> Result<(), errors::Error> {
     );
     loop {
         while let Some(update) = stream.next().await {
-            let update = update?;
+            match update {
-            if let UpdateKind::Message(message) = update.kind {
+                Ok(u) => {
-                db::add_conf(message.clone()).await?;
+                    if let UpdateKind::Message(message) = u.kind {
-                db::add_user(message.clone()).await?;
+                        db::add_conf(message.clone()).await?;
-                match handlers::handler(api.clone(), message, token.clone(), &mut mystem, me.clone())
+                        db::add_user(message.clone()).await?;
-                    .await
+                        match handlers::handler(
-                {
+                            api.clone(),
-                    Ok(_) => {}
+                            message,
-                    Err(e) => warn!("An error occurred handling command. {:?}", e),
+                            token.clone(),
+                            &mut mystem,
+                            me.clone(),
+                        )
+                        .await
+                        {
+                            Ok(_) => {}
+                            Err(e) => warn!("An error occurred handling command. {:?}", e),
+                        }
+                    }
                 }
-            }
+                Err(e) => {
+                    warn!("Telegram API Error: {:?}", e);
+                }
+            };
         }
+        delay_for(Duration::from_secs(2)).await;
     }
     Ok(())
 }