From 03dd810cdd692d9e100e0c99bbb97a7af4d6d457 Mon Sep 17 00:00:00 2001
From: Patrick Hermann <patrick.hermann@sva.de>
Date: Sat, 3 Oct 2026 10:38:51 +0000
Subject: [PATCH] fix(flux-operator): flux-operator 0.61.0, sthings-cluster
 0.3.20, repo condition on instance

- flux-operator chart 0.28.0 -> 0.61.0 (latest, 2026-10-01). The default
  was 33 minors behind; blueprints/flux bootstrap overrides it with its
  own --operator-version default (0.47.0), so callers that rely on this
  file's default got 0.28.0.
- sthings-cluster 0.3.15 -> 0.3.20 for the secrets and FluxInstance
  releases. helmfile template with the same state values renders the
  Secrets and the FluxInstance byte-identical on both versions.
- The stuttgart-things repository was gated on hasKey "instances" while
  the release uses .Values.instance: an instance without secrets failed
  with 'repo stuttgart-things not found' (reproduced on main; passes now).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 cicd/flux-operator.yaml.gotmpl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cicd/flux-operator.yaml.gotmpl b/cicd/flux-operator.yaml.gotmpl
index 7c0d1fcc..39f5b115 100644
--- a/cicd/flux-operator.yaml.gotmpl
+++ b/cicd/flux-operator.yaml.gotmpl
@@ -4,7 +4,7 @@ environments:
     values:
       - namespace: flux-system
       # renovate: datasource=docker depName=ghcr.io/controlplaneio-fluxcd/charts/flux-operator
-      - version: 0.28.0
+      - version: 0.61.0
       - installOperator: true
 ---
 releases:
@@ -22,7 +22,7 @@ releases:
     installed: true
     namespace: {{ .Values.namespace }}
     chart: stuttgart-things/sthings-cluster
-    version: 0.3.15
+    version: 0.3.20
     values:
       - "values/secrets.values.yaml.gotmpl"
 {{- end }}
@@ -33,7 +33,7 @@ releases:
     installed: true
     namespace: {{ .Values.namespace }}
     chart: stuttgart-things/sthings-cluster
-    version: 0.3.15
+    version: 0.3.20
     values:
       - "values/flux-instance.values.yaml.gotmpl"
 {{- end }}
@@ -42,7 +42,7 @@ repositories:
   - name: fluxcd
     url: ghcr.io/controlplaneio-fluxcd/charts
     oci: true
-{{- if or (hasKey .Values "secrets") (hasKey .Values "instances") }}
+{{- if or (hasKey .Values "secrets") (hasKey .Values "instance") }}
   - name: stuttgart-things
     url: ghcr.io/stuttgart-things
     oci: true