Skip to content

Commit

Permalink
Add support to cors support on tsuru-api
Browse files Browse the repository at this point in the history
  • Loading branch information
wpjunior committed Jul 18, 2023
1 parent 3e98ff0 commit c234936
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 30 deletions.
2 changes: 1 addition & 1 deletion charts/tsuru-api/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.9
version: 0.2.10

# 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
Expand Down
25 changes: 6 additions & 19 deletions charts/tsuru-api/templates/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -128,25 +128,6 @@ data:
{{- .Values.tsuruConfig.volumePlans | toYaml | nindent 6 }}
{{- end }}

{{- if .Values.tsuruConfig.iaas }}
# - Iaas configuration
# http://docs.tsuru.io/en/stable/reference/config.html#iaas-configuration
iaas:
default: {{ .Values.tsuruConfig.iaas.iaas_default | default "ec2" }}
{{- if .Values.tsuruConfig.iaas.cloudstack }}
{{ .Values.tsuruConfig.iaas.cloudstack | indent 6 }}
{{- end }}
{{- if .Values.tsuruConfig.iaas.ec2 }}
{{ .Values.tsuruConfig.iaas.ec2 | indent 6 }}
{{- end }}
{{- if .Values.tsuruConfig.iaas.customIaaS }}
custom:
{{- toYaml .Values.tsuruConfig.iaas.customIaaS | nindent 8 }}
{{- end }}
node-protocol: {{ .Values.tsuruConfig.iaas.nodeProtocol | default "http" }}
node-port: {{ .Values.tsuruConfig.iaas.nodePort | default "2375" }}
{{- end }}

# - Debug configuration
# http://docs.tsuru.io/en/stable/reference/config.html#log-level
debug: {{ .Values.tsuruConfig.debug | default "false" }}
Expand All @@ -168,3 +149,9 @@ data:
throttling:
{{ .Values.tsuruConfig.eventThrottling | toYaml | indent 6 }}
{{- end }}


{{ if .Values.tsuruConfig.cors }}
cors:
{{ .Values.tsuruConfig.cors | toYaml | indent 6 }}
{{- end }}
13 changes: 3 additions & 10 deletions charts/tsuru-api/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,8 @@ tsuruConfig:
# https://docs.tsuru.io/stable/managing/volumes.html#volume-plans
volumePlans: {}

cors: {}

# http://docs.tsuru.io/en/stable/reference/config.html#provisioner
provisioner: ""
docker: {}
Expand All @@ -226,15 +228,6 @@ tsuruConfig:
poolNamespaces:
progressTimeout:

# http://docs.tsuru.io/en/stable/reference/config.html#iaas-configuration
iaas:
nodeProtocol: "http"
nodePort: "2375"
default: "ec2"
ec2: {}
cloudstack: {}
customIaaS: {}

events:
suppressSensitiveEnvs: true

Expand All @@ -247,4 +240,4 @@ tsuruConfig:
disableSyslog: true
syslogTag: ""
useStdErr: true
appLogBufferBytes: "1048576"
appLogBufferBytes: "1048576"

0 comments on commit c234936

Please sign in to comment.