Merge branch 'main' into fix-app-template

.circleci/config.yml

@@ -1,6 +1,6 @@
 version: 2.1
 orbs:
-  architect: giantswarm/architect@5.1.1
+  architect: giantswarm/architect@5.8.0
 
 workflows:
   package-and-push-chart-on-tag:

helm/alloy-gateway/templates/alloy-gateway-configmap.yaml

@@ -1,12 +1,17 @@
+{{- if .Values.alloy.enabled }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: observability-gateway-config
   namespace: giantswarm
 data:
   values: |
+    {{- with .Values.alloy }}
     alloy:
-      {{- .Values.alloy | nindent 6 }}
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
+    {{- with .Values.networkPolicy }}
     networkPolicy:
-      {{- .Values.networkPolicy | nindent 6 }}
-
+      {{- toYaml . | nindent 6 }}
+    {{ end }}
+{{- end -}}

helm/alloy-gateway/templates/alloy-gateway.yaml

@@ -1,3 +1,5 @@
+{{- if .Values.alloy.enabled }}
+## This app is not deployed if alloy is disabled
 apiVersion: application.giantswarm.io/v1alpha1
 kind: App
 metadata:
@@ -22,8 +24,9 @@ spec:
     secret:
       name: ""
       namespace: ""
-  name: observability-gateway
+  name: alloy
   namespace: monitoring
   # used by renovate
   # repo: giantswarm/alloy
   version: 0.5.2
+{{- end -}}

helm/alloy-gateway/values.schema.json

@@ -3,10 +3,10 @@
     "type": "object",
     "properties": {
         "alloy": {
-            "type": "string"
+            "type": "object"
         },
         "networkPolicy": {
-            "type": "string"
+            "type": "object"
         }
     }
 }

helm/alloy-gateway/values.yaml

@@ -2,5 +2,5 @@
 ## We need to put the whole configuration in a single string.
 ## This will allow us to replace this alloy gateway app with the use of the alloy-app.
 ## This is waiting for https://github.com/giantswarm/roadmap/issues/3682 to be fixed
-alloy: ""
-networkPolicy: ""
+alloy: {}
+networkPolicy: {}