Skip to content

Commit

Permalink
ci(prettier): format more Helm-related files (#838)
Browse files Browse the repository at this point in the history
Closes #836
  • Loading branch information
tiborsimko committed Nov 14, 2024
1 parent ae2bce5 commit 227cd30
Show file tree
Hide file tree
Showing 7 changed files with 226 additions and 216 deletions.
8 changes: 8 additions & 0 deletions .github/ctlint.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
extends: default

rules:
comments:
min-spaces-from-content: 1
document-start: disable
line-length: disable
truthy: disable
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ jobs:
uses: helm/chart-testing-action@v2

- name: Run chart-testing (lint)
run: ct lint --config .github/ct.yaml
run: ct lint --config .github/ct.yaml --lint-conf .github/ctlint.yaml

lint-yamllint:
runs-on: ubuntu-24.04
Expand Down
2 changes: 1 addition & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
@@ -1 +1 @@
helm/reana
helm/reana/templates
2 changes: 1 addition & 1 deletion .yamllint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ rules:
truthy: disable

ignore:
- helm/reana # is linted by `helm lint` and `ct lint`
- helm/reana/templates # is linted by `helm lint` and `ct lint`
2 changes: 1 addition & 1 deletion helm/reana/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ keywords:
- reusable-science
type: application
version: 0.9.3
kubeVersion: '>= 1.21.0-0 < 1.32.0-0'
kubeVersion: ">= 1.21.0-0 < 1.32.0-0"
dependencies:
- name: traefik
version: 31.1.0
Expand Down
379 changes: 190 additions & 189 deletions helm/reana/README.md

Large diffs are not rendered by default.

47 changes: 24 additions & 23 deletions helm/reana/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ maintenance:
workspaces:
retention_rules:
maximum_period: forever
cronjob_schedule: "0 2 * * *" # everyday at 2am
cronjob_schedule: "0 2 * * *" # everyday at 2am
paths:
- /var/reana:/var/reana

interactive_sessions:
cronjob_schedule: "0 3 * * *" # everyday at 3am
cronjob_schedule: "0 3 * * *" # everyday at 3am
environments:
jupyter:
recommended:
Expand All @@ -34,7 +34,7 @@ compute_backends:
- kubernetes

shared_storage:
backend: hostpath # hostpath | cephfs | nfs
backend: hostpath # hostpath | cephfs | nfs
volume_size: 200
access_modes: ReadWriteMany
shared_volume_mount_path: "/var/reana"
Expand Down Expand Up @@ -82,7 +82,7 @@ components:
enabled: true
docs_url: https://docs.reana.io
forum_url: https://forum.reana.io
file_preview_size_limit: 5242880 # 5 * 1024**2 = 5 MiB
file_preview_size_limit: 5242880 # 5 * 1024**2 = 5 MiB
imagePullPolicy: IfNotPresent
image: docker.io/reanahub/reana-ui:0.9.4
reana_db:
Expand Down Expand Up @@ -199,9 +199,10 @@ pgbouncer:
quota:
enabled: true
periodic_update_policy: "{{ .Values.quota.disk_update }}"
workflow_termination_update_policy: "{{ .Values.quota.termination_update_policy }}"
workflow_termination_update_policy:
"{{ .Values.quota.termination_update_policy }}"
# backward compatibility
disk_update: "0 3 * * *" # everyday at 3am
disk_update: "0 3 * * *" # everyday at 3am
termination_update_policy: ""

# OpenSearch chart values.yaml
Expand All @@ -220,7 +221,7 @@ opensearch:
admin:
cn: "opensearch-admin.reana.io"
ttl: 180
singleNode: true # advanced storage configuration needed if set to false
singleNode: true # advanced storage configuration needed if set to false
config:
opensearch.yml: |
cluster.name: reana-opensearch
Expand Down Expand Up @@ -288,16 +289,16 @@ opensearch:
- name: reana-opensearch-volume
hostPath:
path: /var/reana
# You can instead configure infrastructure volume:
# - name: reana-opensearch-volume
# persistentVolumeClaim:
# claimName: reana-infrastructure-persistent-volume
# readOnly: false
# Or shared volume:
# - name: reana-opensearch-volume
# persistentVolumeClaim:
# claimName: reana-shared-persistent-volume
# readOnly: false
# You can instead configure infrastructure volume:
# - name: reana-opensearch-volume
# persistentVolumeClaim:
# claimName: reana-infrastructure-persistent-volume
# readOnly: false
# Or shared volume:
# - name: reana-opensearch-volume
# persistentVolumeClaim:
# claimName: reana-shared-persistent-volume
# readOnly: false
extraVolumeMounts:
- mountPath: /usr/share/opensearch/data
subPath: opensearch
Expand All @@ -306,13 +307,13 @@ opensearch:
customSecurityConfig:
internalUsers:
reana:
hash: "" # Required. To generate hash, run plugins/opensearch-security/tools/hash.sh -p <new-password>; supply in Helm command flags
hash: "" # Required. To generate hash, run plugins/opensearch-security/tools/hash.sh -p <new-password>; supply in Helm command flags
reserved: false
backend_roles:
- readall
description: REANA user
fluentbit:
hash: "" # Required. To generate hash, run plugins/opensearch-security/tools/hash.sh -p <new-password>; supply in Helm command flags
hash: "" # Required. To generate hash, run plugins/opensearch-security/tools/hash.sh -p <new-password>; supply in Helm command flags
reserved: false
backend_roles:
- fluentbit
Expand All @@ -332,7 +333,7 @@ opensearch:
- indices:data/write/bulk*
index_permissions:
- index_patterns:
- fluentbit-*
- fluentbit-*
fls: []
masked_fields: []
allowed_actions:
Expand All @@ -347,7 +348,7 @@ opensearch:
reserved: false
hidden: false
backend_roles:
- fluentbit
- fluentbit
and_backend_roles: []
own_index:
hosts: []
Expand Down Expand Up @@ -549,8 +550,8 @@ fluent-bit:
secret:
secretName: reana-opensearch-tls-secrets
items:
- key: ca.crt
path: ca.crt
- key: ca.crt
path: ca.crt
extraVolumeMounts:
- name: reana-opensearch-ca
mountPath: /fluent-bit/etc/certs
Expand Down

0 comments on commit 227cd30

Please sign in to comment.