feat: make more environment variables configurable

openmfp · Nov 19, 2024 · ae4ebab · ae4ebab
1 parent ff91770
commit ae4ebab
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 2 deletions.
diff --git a/charts/account-operator-crds/values.yaml b/charts/account-operator-crds/values.yaml
@@ -1,2 +1,2 @@
 kcp:
-  enabled: false
+  enabled: false
diff --git a/charts/account-operator/Chart.yaml b/charts/account-operator/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: account-operator
 description: A Helm chart for Kubernetes
 type: application
-version: 0.2.28
+version: 0.3.0
 appVersion: "0.94.0"
 dependencies:
   - name: account-operator-crds

diff --git a/charts/account-operator/templates/deployment.yaml b/charts/account-operator/templates/deployment.yaml
@@ -58,6 +58,16 @@ spec:
             value: "{{ .Values.subroutines.namespace.enabled }}"
           - name: SUBROUTINES_FGA_ENABLED
             value: "{{ .Values.subroutines.fga.enabled }}"
+          - name: SUBROUTINES_FGA_GRPC_ADDR
+            value: "{{ .Values.subroutines.fga.grpcAddr }}"
+          - name: SUBROUTINES_FGA_ROOT_NAMESPACE
+            value: "{{ .Values.subroutines.fga.rootNamespace }}"
+          - name: SUBROUTINES_FGA_OBJECT_TYPE
+            value: "{{ .Values.subroutines.fga.objectType }}"
+          - name: SUBROUTINES_FGA_PARENT_RELATION
+            value: "{{ .Values.subroutines.fga.parentRelation }}"
+          - name: SUBROUTINES_FGA_CREATOR_RELATION
+            value: "{{ .Values.subroutines.fga.creatorRelation }}"
           - name: SUBROUTINES_EXTENSION_ENABLED
             value: "{{ .Values.subroutines.extension.enabled }}"
           - name: SUBROUTINES_EXTENSION_READY_ENABLED

diff --git a/charts/account-operator/tests/__snapshot__/deployment_test.yaml.snap b/charts/account-operator/tests/__snapshot__/deployment_test.yaml.snap
@@ -98,6 +98,16 @@ operator match the snapshot:
                   value: "true"
                 - name: SUBROUTINES_FGA_ENABLED
                   value: "true"
+                - name: SUBROUTINES_FGA_GRPC_ADDR
+                  value: ""
+                - name: SUBROUTINES_FGA_ROOT_NAMESPACE
+                  value: openmfp-root
+                - name: SUBROUTINES_FGA_OBJECT_TYPE
+                  value: account
+                - name: SUBROUTINES_FGA_PARENT_RELATION
+                  value: parent
+                - name: SUBROUTINES_FGA_CREATOR_RELATION
+                  value: owner
                 - name: SUBROUTINES_EXTENSION_ENABLED
                   value: "true"
                 - name: SUBROUTINES_EXTENSION_READY_ENABLED
@@ -247,6 +257,16 @@ operator match the snapshot (with kubeconfigSecret):
                   value: "true"
                 - name: SUBROUTINES_FGA_ENABLED
                   value: "true"
+                - name: SUBROUTINES_FGA_GRPC_ADDR
+                  value: ""
+                - name: SUBROUTINES_FGA_ROOT_NAMESPACE
+                  value: openmfp-root
+                - name: SUBROUTINES_FGA_OBJECT_TYPE
+                  value: account
+                - name: SUBROUTINES_FGA_PARENT_RELATION
+                  value: parent
+                - name: SUBROUTINES_FGA_CREATOR_RELATION
+                  value: owner
                 - name: SUBROUTINES_EXTENSION_ENABLED
                   value: "true"
                 - name: SUBROUTINES_EXTENSION_READY_ENABLED

diff --git a/charts/account-operator/values.yaml b/charts/account-operator/values.yaml
@@ -32,6 +32,11 @@ subroutines:
     enabled: true
   fga:
     enabled: true
+    grpcAddr: ""
+    rootNamespace: openmfp-root
+    objectType: account
+    parentRelation: parent
+    creatorRelation: owner
   extension:
     enabled: true
   extensionReady: