diff --git a/argocd/application.yaml b/argocd/application.yaml index 820aaf0..ca4fa64 100644 --- a/argocd/application.yaml +++ b/argocd/application.yaml @@ -6,8 +6,8 @@ metadata: spec: project: default source: - repoURL: https://github.com/YOUR_ORG/telegram-groupfactory.git - targetRevision: main + repoURL: https://git.devops.lnxc.it/dev/IMS/telegram-groupfactory.git + targetRevision: master path: k8s destination: server: https://kubernetes.default.svc diff --git a/k8s/deployment.yaml b/k8s/deployment.yaml index abe3827..68e9c21 100644 --- a/k8s/deployment.yaml +++ b/k8s/deployment.yaml @@ -20,6 +20,8 @@ spec: spec: securityContext: runAsNonRoot: true + runAsUser: 1000 + runAsGroup: 1000 seccompProfile: type: RuntimeDefault containers: @@ -60,6 +62,9 @@ spec: cpu: 500m memory: 512Mi securityContext: + runAsNonRoot: true + runAsUser: 1000 + runAsGroup: 1000 allowPrivilegeEscalation: false capabilities: drop: diff --git a/src/main.py b/src/main.py index b587a2f..5c4cd54 100644 --- a/src/main.py +++ b/src/main.py @@ -2,8 +2,7 @@ import asyncio import logging import json import uvicorn -from telethon import TelegramClient, events -from telethon.tl.types import InlineKeyboardMarkup, InlineKeyboardButton +from telethon import Button, TelegramClient, events from src.config import load_config, save_user_admin_role, get_user_admin_role from src.services.mongodb_service import MongoDBService from src.services.user_service import UserService @@ -195,12 +194,12 @@ async def main(): response = await group_handler.handle_create_group(group_name, user_ids) # Ask about admin role with inline buttons - buttons = InlineKeyboardMarkup([ + buttons = [ [ - InlineKeyboardButton(text="✅ Yes, I want to be full admin", data=b"admin_role:yes"), - InlineKeyboardButton(text="❌ No, just regular member", data=b"admin_role:no") + Button.inline("✅ Yes, I want to be full admin", b"admin_role:yes"), + Button.inline("❌ No, just regular member", b"admin_role:no"), ] - ]) + ] await event.respond( f"{response}\n\n" +