Merge pull request #30 from justgithubaccount/refactor/cluster-crash-install-again

Cluster crash install again

Author: justgithubaccount

.gitignore

@@ -15,10 +15,8 @@ package-lock.json
 
 # Secrets
 .env
-chat-api-secrets.yaml
 litellm-secrets.yaml
 loki-secrets.yaml
-pg-secrets.yaml
 .env.litellm
 secret-cloudflare-external-dns.yaml
 secret-cloudflare-cert-manager.yaml

README.md

@@ -62,10 +62,10 @@ GitOps составляющая взята из подкаста [DKT66 - Что
 Установить в новый кластер с нуля с восстановлением всех ресов кластера на основе роли (секреты нужно обновить)  
 ```bash
 kubectl create namespace argocd  
-kubectl apply -n argocd -f https://raw.githubusercontent.com/argoproj/argo-cd/stable/manifests/install.yaml  
+kubectl apply -n argocd -f https://raw.githubusercontent.com/argoproj/argo-cd/v3.0.12/manifests/ha/install.yaml  
 git clone https://github.com/justgithubaccount/app-release.git  
 cd app-release  
-kubectl apply -f infra/_roles/role-dev-enviroment.yaml  
+kubectl apply -f infra/roles/role-dev-enviroment.yaml  
 ```
 ---
 То что дальше требует обновления, но +/- так оно и есть, тесты, да нужно, накинуть...

charts/chat/templates/deployment.yaml

@@ -72,12 +72,12 @@ spec:
 
           envFrom:
             - secretRef:
-                name: {{ .Values.secretsRefName | default "chat-api-secrets" }}
-            {{- if .Values.dbSecretRefName }}
+                name: {{ .Values.openrouterSecretRefName | default "chat-openrouter" }}
+            {{- if .Values.postgresSecretRefName }}
             - secretRef:
-                name: {{ .Values.dbSecretRefName }}
+                name: {{ .Values.postgresSecretRefName }}
             {{- end }}
-            
+                      
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
 

charts/chat/values.yaml

@@ -69,10 +69,9 @@ externalServices:
     host: ""
     port: 5432
 
-# === Secrets ===
-# Имя внешнего секрета с OPENROUTER_API_KEY
-secretsRefName: "chat-api-secrets"
-dbSecretRefName: "chat-api-db"
+# Secrets
+openrouterSecretRefName: "chat-openrouter"
+postgresSecretRefName: "chat-postgres"
 
 # PostgreSQL
 postgres:

infra/base/services/agent/chat/api-secrets-sealed.yaml

@@ -1,6 +1,12 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
+  labels:
+    app.kubernetes.io/name: chat-api
+    app.kubernetes.io/part-of: chat
+    app.kubernetes.io/managed-by: argocd
+    app.kubernetes.io/component: backend
+    env: dev
   name: chat-api
   namespace: argocd
   annotations:
@@ -15,6 +21,11 @@ metadata:
     argocd-image-updater.argoproj.io/write-back-target-branch: main
     argocd-image-updater.argoproj.io/git-commit-user-name: justgithubaccount
     argocd-image-updater.argoproj.io/git-commit-user-email: [email protected]
+
+    argocd-image-updater.argoproj.io/git-credentialSecret: chat-github 
+
+    # notifications.argoproj.io/subscribe.on-sync-succeeded.slack: chat-devops
+    # notifications.argoproj.io/subscribe.on-sync-failed.slack: chat-devops
 spec:
   project: default
   source:

infra/base/services/agent/chat/application.yaml

@@ -0,0 +1,13 @@
+---
+apiVersion: bitnami.com/v1alpha1
+kind: SealedSecret
+metadata:
+  name: chat-github
+  namespace: argocd
+spec:
+  encryptedData:
+    GITHUB_TOKEN: AgDaaztNFNBTqtw7l8SrtaPYpQokc0P3hrzmqhn4f8JtT67wEvr3NjAlPUqOkd0SYXM0utS0t+awIwXIra2HuL1UDD0130wZFiz1mZAaZOmVDQNUsZx4v79say+KIncLCVxnMzJcrlKozN0vB0ybmrWQcZJ9HeQsT0kdbbYANEMGXjm98e0Rze1ThIMfBhCguQpbyTyCCd9bsmT0Clt5SJFTR55XeULiKkSdg2qyZbf5lVfyHCKH81bi+BB+wrgfb73O2codtUBd6Ps4yHfQMVuWrY6ca0TBcFgHEH2AhAJpwU0RQP90cY41Zo/6DnB49KF5i24dnelNWzREP0V2BChB/HSjdIUNJCHd2yzWl+60r6jveS53DNtn75fCeZDG6EJDpwhtceXM6wVMnk32VfQAD/WPh74OkwjYcL8LYKwiS+tHcTSeAnG2I+tSbsPKH/sxbMY5OmFRRfhB8/Rt5HMs17LvDONSbRPKbLalcRsOo2aQzriVMFDGouCDxmj5qDaA/UHXJWqghPJaYZOudG9UVp8MXkDKUyJzEk+7zV/2/gYecTtuIBP7+z+bmnTR5YxhIdbysLv5Av+yBaxew3rVnkr5/I5cRfeA2CmqszYIXcj7ySQoc0kWgQi4lNeHhonpcjfEFHczezU/CgNbsrAYvTQx7NI6BtC9wl22c56Pg/rjRHFUJmKXc8LhWYuZR3SufExHYPNnixxfXunU4Xwvlo+03ggiF6kQpbjfYTrs5+B4iH+UGDd3
+  template:
+    metadata:
+      name: chat-github
+      namespace: argocd

infra/base/services/agent/chat/github-secrets.yaml

@@ -1,4 +1,5 @@
 resources:
   - application.yaml
-  - pg-secrets-sealed.yaml
-  - api-secrets-sealed.yaml
+  - postgree-secrets.yaml
+  - openrouter-secrets.yaml
+  - github-secrets.yaml

infra/base/services/agent/chat/kustomization.yaml

@@ -0,0 +1,13 @@
+---
+apiVersion: bitnami.com/v1alpha1
+kind: SealedSecret
+metadata:
+  name: chat-openrouter
+  namespace: chat-api
+spec:
+  encryptedData:
+    OPENROUTER_API_KEY: AgApDOexTWU8J7gVykjaBH28Urk8gFrpAzTteXrwcs6ELpuc7oqAvrxeADb80gYu3HC9QUPx69UuY2/zSKXC+Nu8zYnSJlQxQ/C+EeCrShG+LrCfRD1zyKv6ijRKp6jQUouR7DE1VGIWedFoDstZNqgqRAc9nwDn/qAh/z5xdzvqxCxzDT6B+dQMRF6Ae1ytPKU+0xC+J/lTzL2yBkNR0ixjrQyAR52svNxnsV7rDEROsR6wUmLdhsXeXfwnV4bT7xuDhDd4x49QX3YmlLub6384rNaO7rSVjn4cvcoCH9WZzEoCgyR2d1morNjrkVjxHMCbzNqr8tI4wHuZuA762cKJxAKnPtkvsOsysc5QQlYhsBlSAo73NYc/OYkA3ULU+NLHCeegtBCOS2+nQMhbvdsCIzo0s+Hlb48oMzupF6Dl3YfoyQeJERJJ9yZYxkSj7wl5NfhGSUqkd9pDtKHuFkOm9N9+k4bzJdj4GJUxNhSVkq9QvxRtpC+zqxCN6JEpQ8nY9ZEAmcO2tx3Efb/mgN2dZtwa1WGgTF2IJoAAC2Ouzr64ttXXbOdP3m3dF8fLXcEn+CzN50clsgDcxVZN0Upykd2MQFCo4fm90ehbmUIlbl93wGmsHdL6QgJ7+Kb8DjVf758MYzx28ZCaRDgq1MMG+LwPuU/LZ3TKw1Wb7BaGdObkubfuDUVbHyFm1oB+ctdd6/lzNpEzDVQbC7FjJGmvcLAFiL/DHr0eKg2ufyUAmM258IY/1cyHBY94Nl//YJ/MP9jRxeNgCghlDlboPSiu+mziemNXu3Pj
+  template:
+    metadata:
+      name: chat-openrouter
+      namespace: chat-api