Merge branch 'main' into main

openfga · Jan 30, 2025 · cf17f81 · cf17f81
2 parents 9f6c961 + be2c395
commit cf17f81
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 7 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1,2 +1,2 @@
-* @openfga/backend @openfga/dx
-README.md @openfga/product @openfga/community @openfga/docs @openfga/backend @openfga/dx
+* @openfga/backend @openfga/dx @openfga/helm-chart-maintainers
+README.md @openfga/product @openfga/community @openfga/docs @openfga/backend @openfga/dx
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -42,7 +42,7 @@ jobs:
           helm repo update
 
       - name: Run chart-releaser
-        uses: helm/chart-releaser-action@v1.6.0
+        uses: helm/chart-releaser-action@v1.7.0
         with:
           config: .github/cr.yaml
         env:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -22,7 +22,7 @@ jobs:
           check-latest: true
 
       - name: Set up chart-testing
-        uses: helm/chart-testing-action@v2.6.1
+        uses: helm/chart-testing-action@v2.7.0
 
       - name: Run chart-testing (list-changed)
         id: list-changed
@@ -48,7 +48,7 @@ jobs:
 
       - name: Create kind cluster
         if: steps.list-changed.outputs.changed == 'true'
-        uses: helm/kind-action@v1.11.0
+        uses: helm/kind-action@v1.12.0
 
       - name: Run chart-testing (install)
         if: steps.list-changed.outputs.changed == 'true'

diff --git a/charts/openfga/templates/deployment.yaml b/charts/openfga/templates/deployment.yaml
@@ -29,6 +29,9 @@ spec:
         {{- with .Values.commonLabels }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
+        {{- with .Values.podExtraLabels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
@@ -161,7 +164,7 @@ spec:
             - name: OPENFGA_DATASTORE_CONN_MAX_LIFETIME
               value: "{{ .Values.datastore.connMaxLifetime }}"
             {{- end }}
-            
+
             {{- if .Values.maxConcurrentReadsForCheck }}
             - name: OPENFGA_MAX_CONCURRENT_READS_FOR_CHECK
               value: "{{ .Values.maxConcurrentReadsForCheck }}"
@@ -189,7 +192,7 @@ spec:
 
             {{- if .Values.grpc.tls.enabled }}
             - name: OPENFGA_GRPC_TLS_ENABLED
-              value: {{ .Values.grpc.tls.enabled }}
+              value: "{{ .Values.grpc.tls.enabled }}"
 
             - name: OPENFGA_GRPC_TLS_CERT
               value: {{ .Values.grpc.tls.cert }}

diff --git a/charts/openfga/values.schema.json b/charts/openfga/values.schema.json
@@ -783,6 +783,14 @@
             },
             "default": {}
         },
+        "podExtraLabels": {
+            "type": "object",
+            "description": "Map of labels to add to the pods' manifest",
+            "additionalProperties": {
+                "type": "string"
+            },
+            "default": {}
+        },
         "service": {
             "type": "object",
             "properties": {

diff --git a/charts/openfga/values.yaml b/charts/openfga/values.yaml
@@ -28,6 +28,7 @@ serviceAccount:
 annotations: {}
 
 podAnnotations: {}
+podExtraLabels: {}
 
 extraEnvVars: []
 extraVolumes: []
@@ -204,6 +205,7 @@ datastore:
   connMaxLifetime:
   applyMigrations: true
   waitForMigrations: true
+  migrationType: job
   migrations:
     resources: {}
     image: