Merge branch 'main' into fix-merge-to-main

revert to qwen3.6 for platform engineer
fix(myorg-assistant): point cronjobs at registry image + add imagePullSecrets
2026-07-09 00:22:22 +02:00 · 2026-07-07 23:52:37 +02:00 · 2026-07-06 14:11:44 +00:00 · 2026-07-06 14:11:44 +00:00
2 changed files with 9 additions and 3 deletions
--- a/argocd-bootstrap.yaml
+++ b/argocd-bootstrap.yaml
@@ -22,3 +22,9 @@ spec:
      selfHeal: true
    syncOptions:
      - CreateNamespace=false
  ignoreDifferences:
    - group: argoproj.io
      kind: Application
      jsonPointers:
        - /status
        - /operation
--- a/platform-engineer/configmap.yaml
+++ b/platform-engineer/configmap.yaml
@@ -9,18 +9,18 @@ data:
  config.yaml: |
    model:
      provider: openai-api
-      default: z-ai/glm-5.2
+      default: qwen3.6
      base_url: "http://litellm-service.litellm:80/v1"
      api_mode: chat_completions
    auxiliary:
      compression:
        provider: openai-api
-        model: z-ai/glm-5.2
+        model: qwen3.6
        base_url: "http://litellm-service.litellm:80/v1"
      title_generation:
        provider: openai-api
-        model: z-ai/glm-5.2
+        model: qwen3.6
        base_url: "http://litellm-service.litellm:80/v1"
    terminal:
Author	SHA1	Message	Date
roger	48f18d2a3e	Merge branch 'main' into fix-merge-to-main	2026-07-09 00:22:22 +02:00
Roger Oriol	ce08365e06	revert to qwen3.6 for platform engineer	2026-07-07 23:52:37 +02:00
Platform Engineer	0794153e56	fix(myorg-assistant): point cronjobs at registry image + add imagePullSecrets CronJob pods were stuck in ImagePullBackOff because they referenced the local-only image 'myorg-assistant:latest' which is not present on the node. Switch all 5 cronjobs to the Gitea registry image git.rogi.casa/roger/myorg-assistant/myorg-assistant:fcf79bf (matching the Deployment), set imagePullPolicy: Always, and add imagePullSecrets: gitea-registry so they can authenticate to the private registry.	2026-07-06 14:11:44 +00:00
Platform Engineer	fc1b4383c1	fix(argocd): add ignoreDifferences to root app to stop Application CRD drift loop The k3s-cluster-root app-of-apps has been in a continuous Synced<->OutOfSync oscillation (489 transitions in 24h). Each cycle, ArgoCD syncs the 'argocd' Application CRD, succeeds, then immediately detects drift because ArgoCD adds status/operation fields to Application resources at runtime. Adding ignoreDifferences for /status and /operation on Application resources stops the drift loop while keeping the app-of-apps functional.	2026-07-06 14:11:44 +00:00