tsuru-api: Add support to be more flexible on auth configuration

tsuru · Jul 21, 2023 · 23c243c · 23c243c
1 parent 893e1a8
commit 23c243c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/charts/tsuru-api/Chart.yaml b/charts/tsuru-api/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.2.10
+version: 0.2.11
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/tsuru-api/templates/configmap.yaml b/charts/tsuru-api/templates/configmap.yaml
@@ -52,6 +52,9 @@ data:
 {{- end }}
 
     auth:
+    {{- if .Values.tsuruConfig.authBlock }}
+{{ .Values.tsuruConfig.authBlock | toYaml | indent 6 }}
+    {{- else }}
       scheme: {{ .Values.tsuruConfig.auth.scheme }}
       user-registration: {{ .Values.tsuruConfig.auth.userRegistration }}
       {{- with .Values.tsuruConfig.auth.maxSimultaneousSessions }}
@@ -70,6 +73,7 @@ data:
         info-url: {{ .Values.tsuruConfig.auth.oauth.infoURL }}
         collection: {{ .Values.tsuruConfig.auth.oauth.collection }}
         callback-port: {{ .Values.tsuruConfig.auth.oauth.callbackPort }}
+{{- end }}
 {{- end }}
 
     queue:

diff --git a/charts/tsuru-api/values.yaml b/charts/tsuru-api/values.yaml
@@ -206,6 +206,8 @@ tsuruConfig:
       collection:
       callbackPort:
 
+  authBlock: {}
+
   # http://docs.tsuru.io/en/stable/reference/config.html#config-queue
   queue:
     mongodbURL: "localhost:27017"