feat: smaller improvements to infra chart (#97)

* feat: using common value for istio/fga fixing test-values

* chore: update infra

* feat: improving tests

* docs: update readme

Author: nexus49

charts/infra/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: common
   repository: oci://ghcr.io/openmfp/helm-charts
-  version: 0.1.7
-digest: sha256:45fcb4149403eb8b2774797e82e49d0e3969274393c8958ee6d3a0268e99ef76
-generated: "2024-12-06T10:05:31.423849254Z"
+  version: 0.1.8
+digest: sha256:e4718b08670cce49ce9d031fb9a00b5e7b706c6629a4392b1244e501e42866a5
+generated: "2024-12-09T16:46:41.582356+01:00"

charts/infra/Chart.yaml

@@ -2,10 +2,10 @@ apiVersion: v2
 name: infra
 description: The infra openmfp chart configures a number of common infrastructure components for the OpenMFP platform.
 type: application
-version: 0.58.0
+version: 0.59.0
 appVersion: "1.16.0"
 
 dependencies:
   - name: common
-    version: 0.1.7
+    version: 0.1.8
     repository: oci://ghcr.io/openmfp/helm-charts

charts/infra/README.md

@@ -2,7 +2,7 @@
 
 The infra openmfp chart configures a number of common infrastructure components for the OpenMFP platform.
 
-![Version: 0.58.0](https://img.shields.io/badge/Version-0.58.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.16.0](https://img.shields.io/badge/AppVersion-1.16.0-informational?style=flat-square)
+![Version: 0.59.0](https://img.shields.io/badge/Version-0.59.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.16.0](https://img.shields.io/badge/AppVersion-1.16.0-informational?style=flat-square)
 
 ## Additional Information
 
@@ -12,7 +12,7 @@ The `common` chart is a library of common resources that are shared across all o
 
 | Repository | Name | Version |
 |------------|------|---------|
-| oci://ghcr.io/openmfp/helm-charts | common | 0.1.7 |
+| oci://ghcr.io/openmfp/helm-charts | common | 0.1.8 |
 
 ## Values
 | Key | Type | Default | Description |

charts/infra/charts/common-0.1.7.tgz

@@ -1,4 +1,4 @@
-{{- if (.Values.fga).enabled }}
+{{- if eq (include "common.getNestedValue" (dict "Values" .Values "key" "fga.enabled")) "true" -}}
 {{- range .Values.fga.stores }}
 ---
 apiVersion: core.openmfp.io/v1alpha1

charts/infra/charts/common-0.1.8.tgz

@@ -1,3 +1,4 @@
+{{- if eq (include "common.getKeyValue" (dict "Values" .Values "key" "istio.enabled")) "true" -}}
 apiVersion: {{ .Values.istio.networking.apiVersion }}
 kind: Gateway
 metadata:
@@ -11,4 +12,5 @@ spec:
   selector:
 {{ .Values.istio.gateway.selector | toYaml | indent 4 }}
   servers:
-{{ toYaml .Values.istio.gateway.servers | indent 4 }}
+{{ toYaml .Values.istio.gateway.servers | indent 4 }}
+{{- end -}}

charts/infra/templates/fga-store.yaml

@@ -1,36 +1,33 @@
-gateway:
-  apiVersion: networking.istio.io/v1
-  name: gateway
-  selector:
-    istio: gateway
-  servers:
-    - port:
-        number: 8080
-        name: http
-        protocol: HTTP
-      hosts:
-        - "*"
+istio:
+  enabled: true
+  serviceEntries:
+    https:
+      enabled: true
+      hosts: [ "example.com" ]
+  gateway:
+    apiVersion: networking.istio.io/v1
+    name: gateway
+    selector:
+      istio: gateway
+    servers:
+      - port:
+          number: 8080
+          name: http
+          protocol: HTTP
+        hosts:
+          - "*"
 
-kcp:
-  enabled: false
-#  host: ""
-
-auth:
-#  host: ""
-
-externalSecrets:
-  accountOperatorSaKubeconfig: account-operator-sa-kubeconfig
-  enabled: false
-
-stores:
-  - name: test
-    namespace: test
-    coreModuleName: |
-      module core
-
-      type user
-
-      type account
-        relations
-          define owner: [user]
-          define member: [user] or owner
+fga:
+  enabled: true
+  stores:
+    - name: test
+      namespace: test
+      coreModuleName: |
+        module core
+  
+        type user
+  
+        type account
+          relations
+            define owner: [user]
+            define member: [user] or owner

charts/infra/templates/gateway.yaml

@@ -1,5 +1,21 @@
 matches the snapshot:
   1: |
+    apiVersion: core.openmfp.io/v1alpha1
+    kind: Store
+    metadata:
+      name: test
+      namespace: test
+    spec:
+      coreModule: |2-
+        module core
+
+        type user
+
+        type account
+          relations
+            define owner: [user]
+            define member: [user] or owner
+  2: |
     apiVersion: networking.istio.io/v1
     kind: Gateway
     metadata:
@@ -15,7 +31,7 @@ matches the snapshot:
             name: http
             number: 8080
             protocol: HTTP
-  2: |
+  3: |
     apiVersion: networking.istio.io/v1
     kind: ServiceEntry
     metadata:

charts/infra/test-values.yaml

@@ -3,12 +3,6 @@ values:
   - ../test-values.yaml
 tests:
   - it: matches the snapshot
-    set:
-      istio:
-        serviceEntries:
-          https:
-            enabled: true
-            hosts: ["example.com"]
     asserts:
       - matchSnapshot: {}