Skip to content

Commit

Permalink
Merge pull request #1541 from thehyve/dev
Browse files Browse the repository at this point in the history
Fix helm chart in version 1.0.1.
  • Loading branch information
ewelinagr authored Jul 24, 2024
2 parents 499cab5 + d1350dd commit a6c1153
Show file tree
Hide file tree
Showing 2 changed files with 53 additions and 53 deletions.
104 changes: 52 additions & 52 deletions charts/fairspace/templates/project/configmap-pluto.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,64 +25,64 @@ data:
{{ toYaml (index .Values.fairspace.services ) | indent 8 }}
icons:
{{ toYaml (index .Values.fairspace.icons ) | indent 8 }}
management:
endpoint:
health:
probes:
enabled: true
management:
endpoint:
health:
probes:
enabled: true

logging:
level:
root: {{ .Values.pluto.logLevel }}
logging:
level:
root: {{ .Values.pluto.logLevel }}

server:
error:
whitelabel:
enabled: false
max-http-header-size: 65535
server:
error:
whitelabel:
enabled: false
max-http-header-size: 65535

security:
oidc:
redirect-after-logout-url: {{ template "fairspace.scheme" . }}://{{ .Values.fairspace.ingress.domain }}/login
clientId: {{ .Values.external.keycloak.clientId }}
clientSecret: '{{ .Values.external.keycloak.clientSecret }}'
security:
oidc:
redirect-after-logout-url: {{ template "fairspace.scheme" . }}://{{ .Values.fairspace.ingress.domain }}/login
clientId: {{ .Values.external.keycloak.clientId }}
clientSecret: '{{ .Values.external.keycloak.clientSecret }}'

spring:
web:
resources:
static-locations: classpath:static,file:/opt/mercury
cloud:
gateway:
routes:
spring:
web:
resources:
static-locations: classpath:static,file:/opt/mercury
cloud:
gateway:
routes:
{{ if .Values.pluto.backends.storageRoutes }}
{{ toYaml .Values.pluto.backends.storageRoutes | indent 12 }}
{{ toYaml .Values.pluto.backends.storageRoutes | indent 10 }}
{{ end }}
- id: saturn-post-request-size
uri: {{ .Values.pluto.backends.saturn | default "http://localhost:8090/api/" }}
predicates:
- Method=POST
- Path=/api/**
filters:
- name: RequestSize
args:
maxSize: {{ .Values.pluto.maxFileSize }}
- id: saturn
uri: {{ .Values.pluto.backends.saturn | default "http://localhost:8090"}}
predicates:
- Path=/api/**
default-filters:
- RemoveRequestHeader=Pragma X-Frame-Options X-Content-Type-Options X-XSS-Protection X-Permitted-Cross-Domain-Policies Origin
# Including the ORIGIN header would trigger CORS filtering downstream, but Pluto is already doing the filtering.
- name: Retry
args:
methods: GET,PUT,POST,DELETE
exceptions:
- reactor.netty.http.client.PrematureCloseException
httpclient:
connect-timeout: {{ .Values.pluto.connectTimeoutMillis }}
response-timeout: {{ .Values.pluto.responseTimeoutMillis }}
pool:
max-idle-time: 20s
- id: saturn-post-request-size
uri: {{ .Values.pluto.backends.saturn | default "http://localhost:8090/api/" }}
predicates:
- Method=POST
- Path=/api/**
filters:
- name: RequestSize
args:
maxSize: {{ .Values.pluto.maxFileSize }}
- id: saturn
uri: {{ .Values.pluto.backends.saturn | default "http://localhost:8090"}}
predicates:
- Path=/api/**
default-filters:
- RemoveRequestHeader=Pragma X-Frame-Options X-Content-Type-Options X-XSS-Protection X-Permitted-Cross-Domain-Policies Origin
# Including the ORIGIN header would trigger CORS filtering downstream, but Pluto is already doing the filtering.
- name: Retry
args:
methods: GET,PUT,POST,DELETE
exceptions:
- reactor.netty.http.client.PrematureCloseException
httpclient:
connect-timeout: {{ .Values.pluto.connectTimeoutMillis }}
response-timeout: {{ .Values.pluto.responseTimeoutMillis }}
pool:
max-idle-time: 20s

# Add external svg icons to the configmap data
{{- range $key, $value := .Values.svgicons }}
Expand Down
2 changes: 1 addition & 1 deletion charts/fairspace/templates/project/configmap-saturn.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ data:
blobStorePath: "/data/saturn/files/blobs"
viewDatabase:
enabled: true
mvRefreshOnStartRequired: true
mvRefreshOnStartRequired: {{ default true .Values.saturn.mvRefreshOnStartRequired }}
features:
{{ toYaml .Values.fairspace.features | indent 6 }}
{{ if has "ExtraStorage" .Values.fairspace.features }}
Expand Down

0 comments on commit a6c1153

Please sign in to comment.