Merge branch 'main' into fix-app-template

giantswarm · Sep 25, 2024 · 648ed29 · 648ed29
2 parents 599a825 + 91a1ed5
commit 648ed29
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/.circleci/config.yml b/.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:

diff --git a/helm/alloy-gateway/templates/alloy-gateway-configmap.yaml b/helm/alloy-gateway/templates/alloy-gateway-configmap.yaml
@@ -6,7 +6,7 @@ metadata:
 data:
   values: |
     alloy:
-      {{- .Values.alloy | nindent 6 }}
+      {{- .Values.alloy | toYaml | nindent 6 }}
     networkPolicy:
-      {{- .Values.networkPolicy | nindent 6 }}
+      {{- .Values.networkPolicy | toYaml | nindent 6 }}
 
diff --git a/helm/alloy-gateway/values.schema.json b/helm/alloy-gateway/values.schema.json
@@ -3,10 +3,10 @@
     "type": "object",
     "properties": {
         "alloy": {
-            "type": "string"
+            "type": "object"
         },
         "networkPolicy": {
-            "type": "string"
+            "type": "object"
         }
     }
 }
diff --git a/helm/alloy-gateway/values.yaml b/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: {}