Skip to content

Commit 783fbdb

Browse files
shinybrarshinybrar
authored
Merge pull request #144 from opencadc/fix/pre-commit
fix(pre-commit): linting
2 parents c8e3356 + ab0a3d4 commit 783fbdb

File tree

15 files changed

+178
-31
lines changed

15 files changed

+178
-31
lines changed

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ This section is automatically generated. Do not edit manually.
2020
| Chart | Description |
2121
| --- | --- |
2222
| [base](helm/applications/base) | A Helm chart to install base components of the CANFAR Science Platform |
23+
| [science-portal](helm/applications/canfar-next/science-portal) | A Helm chart for Science Portal Next.js application |
2324
| [cavern](helm/applications/cavern) | A Helm chart to install the VOSpace User Storage API (Cavern) |
2425
| [posixmapper](helm/applications/posix-mapper) | A Helm chart to install the UID/GID POSIX Mapper |
2526
| [scienceportal](helm/applications/science-portal) | A Helm chart to install the Science Portal UI |

‎helm/applications/canfar-next/README.md.gotmpl‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{{ template "chart.header" . }}
2+
3+
{{ template "chart.description" . }}
4+
5+
| Chart | AppVersion | Type |
6+
|:-----:|:----------:|:----:|
7+
|{{ template "chart.version" . }}<!-- x-release-please-version --> | {{ template "chart.appVersion" . }} | {{ template "chart.type" . }} |
8+
9+
{{ template "chart.homepageLine" . }}
10+
11+
{{ template "chart.requirementsSection" . }}
12+
13+
{{ template "chart.valuesSection" . }}

‎helm/applications/canfar-next/science-portal/README.md‎

Lines changed: 136 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,136 @@
1+
# science-portal
2+
3+
![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.0](https://img.shields.io/badge/AppVersion-0.1.0-informational?style=flat-square)
4+
5+
A Helm chart for Science Portal Next.js application
6+
7+
**Homepage:** <https://github.com/opencadc/science-portal>
8+
9+
## Maintainers
10+
11+
| Name | Email | Url |
12+
| ---- | ------ | --- |
13+
| Science Portal Team | | |
14+
15+
## Values
16+
17+
| Key | Type | Default | Description |
18+
|-----|------|---------|-------------|
19+
| affinity.podAntiAffinity.preferredDuringSchedulingIgnoredDuringExecution[0].podAffinityTerm.labelSelector.matchExpressions[0].key | string | `"app.kubernetes.io/name"` | |
20+
| affinity.podAntiAffinity.preferredDuringSchedulingIgnoredDuringExecution[0].podAffinityTerm.labelSelector.matchExpressions[0].operator | string | `"In"` | |
21+
| affinity.podAntiAffinity.preferredDuringSchedulingIgnoredDuringExecution[0].podAffinityTerm.labelSelector.matchExpressions[0].values[0] | string | `"science-portal"` | |
22+
| affinity.podAntiAffinity.preferredDuringSchedulingIgnoredDuringExecution[0].podAffinityTerm.topologyKey | string | `"kubernetes.io/hostname"` | |
23+
| affinity.podAntiAffinity.preferredDuringSchedulingIgnoredDuringExecution[0].weight | int | `100` | |
24+
| autoscaling.enabled | bool | `true` | |
25+
| autoscaling.maxReplicas | int | `10` | |
26+
| autoscaling.minReplicas | int | `2` | |
27+
| autoscaling.targetCPUUtilizationPercentage | int | `80` | |
28+
| autoscaling.targetMemoryUtilizationPercentage | int | `80` | |
29+
| env[0].name | string | `"SERVICE_STORAGE_API"` | |
30+
| env[0].value | string | `"https://ws-uv.canfar.net/arc/nodes/home/"` | |
31+
| env[10].name | string | `"NEXT_PUBLIC_API_TIMEOUT"` | |
32+
| env[10].value | string | `"30000"` | |
33+
| env[11].name | string | `"NEXT_PUBLIC_ENABLE_QUERY_DEVTOOLS"` | |
34+
| env[11].value | string | `"false"` | |
35+
| env[12].name | string | `"NEXT_PUBLIC_EXPERIMENTAL"` | |
36+
| env[12].value | string | `"true"` | |
37+
| env[13].name | string | `"NEXT_USE_CANFAR"` | |
38+
| env[13].value | string | `"true"` | |
39+
| env[14].name | string | `"NEXT_PUBLIC_USE_CANFAR"` | |
40+
| env[14].value | string | `"true"` | |
41+
| env[15].name | string | `"AUTH_TRUST_HOST"` | |
42+
| env[15].value | string | `"true"` | |
43+
| env[16].name | string | `"NEXTAUTH_URL"` | |
44+
| env[16].value | string | `"https://science-portal.example.com"` | |
45+
| env[1].name | string | `"LOGIN_API"` | |
46+
| env[1].value | string | `"https://ws-cadc.canfar.net/ac"` | |
47+
| env[2].name | string | `"SKAHA_API"` | |
48+
| env[2].value | string | `"https://ws-uv.canfar.net/skaha"` | |
49+
| env[3].name | string | `"SRC_SKAHA_API"` | |
50+
| env[3].value | string | `"https://src.canfar.net/skaha"` | |
51+
| env[4].name | string | `"SRC_CAVERN_API"` | |
52+
| env[4].value | string | `"https://src.canfar.net/cavern"` | |
53+
| env[5].name | string | `"API_TIMEOUT"` | |
54+
| env[5].value | string | `"30000"` | |
55+
| env[6].name | string | `"NEXT_PUBLIC_LOGIN_API"` | |
56+
| env[6].value | string | `"https://ws-cadc.canfar.net/ac"` | |
57+
| env[7].name | string | `"NEXT_PUBLIC_SKAHA_API"` | |
58+
| env[7].value | string | `"https://ws-uv.canfar.net/skaha"` | |
59+
| env[8].name | string | `"NEXT_PUBLIC_SRC_SKAHA_API"` | |
60+
| env[8].value | string | `"https://src.canfar.net/skaha"` | |
61+
| env[9].name | string | `"NEXT_PUBLIC_SRC_CAVERN_API"` | |
62+
| env[9].value | string | `"https://src.canfar.net/cavern"` | |
63+
| fullnameOverride | string | `""` | |
64+
| image.pullPolicy | string | `"IfNotPresent"` | |
65+
| image.repository | string | `"science-portal-nextjs"` | |
66+
| image.tag | string | `""` | |
67+
| imagePullSecrets | list | `[]` | |
68+
| ingress.annotations."cert-manager.io/cluster-issuer" | string | `"letsencrypt-prod"` | |
69+
| ingress.annotations."nginx.ingress.kubernetes.io/force-ssl-redirect" | string | `"true"` | |
70+
| ingress.annotations."nginx.ingress.kubernetes.io/ssl-redirect" | string | `"true"` | |
71+
| ingress.className | string | `"nginx"` | |
72+
| ingress.enabled | bool | `true` | |
73+
| ingress.hosts[0].host | string | `"science-portal.example.com"` | |
74+
| ingress.hosts[0].paths[0].path | string | `"/"` | |
75+
| ingress.hosts[0].paths[0].pathType | string | `"Prefix"` | |
76+
| ingress.tls[0].hosts[0] | string | `"science-portal.example.com"` | |
77+
| ingress.tls[0].secretName | string | `"science-portal-tls"` | |
78+
| livenessProbe.failureThreshold | int | `3` | |
79+
| livenessProbe.httpGet.path | string | `"/api/health"` | |
80+
| livenessProbe.httpGet.port | int | `3000` | |
81+
| livenessProbe.initialDelaySeconds | int | `30` | |
82+
| livenessProbe.periodSeconds | int | `10` | |
83+
| livenessProbe.timeoutSeconds | int | `3` | |
84+
| nameOverride | string | `""` | |
85+
| networkPolicy.egress[0].ports[0].port | int | `443` | |
86+
| networkPolicy.egress[0].ports[0].protocol | string | `"TCP"` | |
87+
| networkPolicy.egress[0].ports[1].port | int | `53` | |
88+
| networkPolicy.egress[0].ports[1].protocol | string | `"TCP"` | |
89+
| networkPolicy.egress[0].ports[2].port | int | `53` | |
90+
| networkPolicy.egress[0].ports[2].protocol | string | `"UDP"` | |
91+
| networkPolicy.egress[0].to[0].namespaceSelector | object | `{}` | |
92+
| networkPolicy.enabled | bool | `true` | |
93+
| networkPolicy.ingress[0].from[0].namespaceSelector.matchLabels.name | string | `"ingress-nginx"` | |
94+
| networkPolicy.ingress[0].ports[0].port | int | `3000` | |
95+
| networkPolicy.ingress[0].ports[0].protocol | string | `"TCP"` | |
96+
| networkPolicy.policyTypes[0] | string | `"Ingress"` | |
97+
| networkPolicy.policyTypes[1] | string | `"Egress"` | |
98+
| nodeSelector | object | `{}` | |
99+
| oidc.callbackUri | string | `"https://science-portal.example.com/science-portal"` | |
100+
| oidc.clientId | string | `""` | |
101+
| oidc.redirectUri | string | `"https://science-portal.example.com/api/auth/callback/oidc"` | |
102+
| oidc.scope | string | `"openid profile offline_access"` | |
103+
| oidc.uri | string | `"https://ska-iam.stfc.ac.uk/"` | |
104+
| podAnnotations | object | `{}` | |
105+
| podDisruptionBudget.enabled | bool | `true` | |
106+
| podDisruptionBudget.minAvailable | int | `1` | |
107+
| podSecurityContext.fsGroup | int | `1001` | |
108+
| podSecurityContext.runAsGroup | int | `1001` | |
109+
| podSecurityContext.runAsNonRoot | bool | `true` | |
110+
| podSecurityContext.runAsUser | int | `1001` | |
111+
| podSecurityContext.seccompProfile.type | string | `"RuntimeDefault"` | |
112+
| readinessProbe.failureThreshold | int | `3` | |
113+
| readinessProbe.httpGet.path | string | `"/api/health/ready"` | |
114+
| readinessProbe.httpGet.port | int | `3000` | |
115+
| readinessProbe.initialDelaySeconds | int | `10` | |
116+
| readinessProbe.periodSeconds | int | `5` | |
117+
| readinessProbe.timeoutSeconds | int | `3` | |
118+
| replicaCount | int | `2` | |
119+
| resources.limits.cpu | string | `"1000m"` | |
120+
| resources.limits.memory | string | `"1Gi"` | |
121+
| resources.requests.cpu | string | `"100m"` | |
122+
| resources.requests.memory | string | `"256Mi"` | |
123+
| secrets.existingSecret | string | `"science-portal-secrets"` | |
124+
| secrets.keys.authSecret | string | `"auth-secret"` | |
125+
| secrets.keys.oidcClientSecret | string | `"oidc-client-secret"` | |
126+
| securityContext.allowPrivilegeEscalation | bool | `false` | |
127+
| securityContext.capabilities.drop[0] | string | `"ALL"` | |
128+
| securityContext.readOnlyRootFilesystem | bool | `false` | |
129+
| service.annotations | object | `{}` | |
130+
| service.port | int | `80` | |
131+
| service.targetPort | int | `3000` | |
132+
| service.type | string | `"ClusterIP"` | |
133+
| serviceAccount.annotations | object | `{}` | |
134+
| serviceAccount.create | bool | `true` | |
135+
| serviceAccount.name | string | `""` | |
136+
| tolerations | list | `[]` | |

‎helm/applications/cavern/Chart.lock‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dependencies:
22
- name: utils
33
repository: file://../utils
4-
version: 0.1.0
5-
digest: sha256:35dcfd2b0224f26139769156a6228da89b560f29e0733e59a55906c854a80779
6-
generated: "2025-10-22T16:51:16.042426-07:00"
4+
version: 0.1.1
5+
digest: sha256:58af5c673fa42dd5ff12bdfb3827b6ea8294240f37509d24bfc062207cc006b0
6+
generated: "2025-10-31T13:44:32.94257-07:00"

‎helm/applications/cavern/README.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ A Helm chart to install the VOSpace User Storage API (Cavern)
2929
| deployment.cavern.identityManagerClass | string | `"org.opencadc.auth.StandardIdentityManager"` | |
3030
| deployment.cavern.image | string | `"images.opencadc.org/platform/cavern:0.9.0"` | |
3131
| deployment.cavern.imagePullPolicy | string | `"IfNotPresent"` | |
32-
| deployment.cavern.registryURL | (list OR string) | `[]` | IVOA Registry array of IVOA Registry locations or single IVOA Registry location |
3332
| deployment.cavern.resourceID | string | `"ivo://example.org/cavern"` | |
3433
| deployment.cavern.resources.limits.cpu | string | `"500m"` | |
3534
| deployment.cavern.resources.limits.memory | string | `"1Gi"` | |

‎helm/applications/posix-mapper/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ A Helm chart to install the UID/GID POSIX Mapper
1717
| deployment.posixMapper.minGID | int | `900000` | |
1818
| deployment.posixMapper.minUID | int | `10000` | |
1919
| deployment.posixMapper.oidcURI | string | `nil` | |
20-
| deployment.posixMapper.registryURL | (list OR string) | `[]` | IVOA Registry array of IVOA Registry locations or single IVOA Registry location |
20+
| deployment.posixMapper.registryURL | string | `nil` | |
2121
| deployment.posixMapper.resourceID | string | `"ivo://opencadc.org/posix-mapper"` | |
2222
| deployment.posixMapper.resources.limits.cpu | string | `"750m"` | |
23-
| deployment.posixMapper.resources.limits.memory | string | `"1500Mi"` | |
23+
| deployment.posixMapper.resources.limits.memory | string | `"1750Mi"` | |
2424
| deployment.posixMapper.resources.requests.cpu | string | `"500m"` | |
2525
| deployment.posixMapper.resources.requests.memory | string | `"1Gi"` | |
2626
| kubernetesClusterDomain | string | `"cluster.local"` | |

‎helm/applications/science-portal/Chart.lock‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ dependencies:
44
version: 18.19.4
55
- name: utils
66
repository: file://../utils
7-
version: 0.1.0
8-
digest: sha256:fd98d2ca0917e2d209018020b126ffd197f8dfe1a6a1a9d4c5455b5da8539cb6
9-
generated: "2025-10-22T16:51:17.944992-07:00"
7+
version: 0.1.1
8+
digest: sha256:bee4865b79686ce802f8e425a43b3e208b38f5ed1c27f5413294e41ceda1e539
9+
generated: "2025-10-31T13:44:34.326176-07:00"

‎helm/applications/science-portal/README.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ A Helm chart to install the Science Portal UI
44

55
| Chart | AppVersion | Type |
66
|:-----:|:----------:|:----:|
7-
|1.0.2<!-- x-release-please-version --> | 1.2.0 | application |
7+
|1.0.3<!-- x-release-please-version --> | 1.2.0 | application |
88

99
## Requirements
1010

@@ -18,21 +18,21 @@ A Helm chart to install the Science Portal UI
1818
| Key | Type | Default | Description |
1919
|-----|------|---------|-------------|
2020
| deployment.hostname | string | `"example.host.com"` | |
21+
| deployment.sciencePortal.defaultProjectName | string | `"skaha"` | |
2122
| deployment.sciencePortal.gmsID | string | `nil` | |
2223
| deployment.sciencePortal.identityManagerClass | string | `"org.opencadc.auth.StandardIdentityManager"` | |
23-
| deployment.sciencePortal.defaultProjectName | string | `"skaha"` | Name of the project to select by default when selecting images on new User Sessions |
2424
| deployment.sciencePortal.image | string | `"images.opencadc.org/platform/science-portal:1.2.0"` | |
2525
| deployment.sciencePortal.imagePullPolicy | string | `"Always"` | |
26-
| deployment.sciencePortal.registryURL | (list OR string) | `[]` | IVOA Registry array of IVOA Registry locations or single IVOA Registry location |
27-
| deployment.sciencePortal.resources.limits.cpu | string | `"500m"` | |
28-
| deployment.sciencePortal.resources.limits.memory | string | `"500M"` | |
26+
| deployment.sciencePortal.resources.limits.cpu | string | `"1"` | |
27+
| deployment.sciencePortal.resources.limits.memory | string | `"1000Mi"` | |
2928
| deployment.sciencePortal.resources.requests.cpu | string | `"500m"` | |
30-
| deployment.sciencePortal.resources.requests.memory | string | `"500M"` | |
29+
| deployment.sciencePortal.resources.requests.memory | string | `"750Mi"` | |
3130
| deployment.sciencePortal.skahaResourceID | string | `nil` | |
3231
| deployment.sciencePortal.tabLabels[0] | string | `"Standard"` | |
3332
| deployment.sciencePortal.tabLabels[1] | string | `"Advanced"` | |
3433
| deployment.sciencePortal.themeName | string | `nil` | |
3534
| experimentalFeatures.enabled | bool | `false` | |
35+
| experimentalFeatures.slider.enabled | bool | `false` | |
3636
| kubernetesClusterDomain | string | `"cluster.local"` | |
3737
| podSecurityContext | object | `{}` | |
3838
| redis.architecture | string | `"standalone"` | |

‎helm/applications/science-portal/config/cadc-registry.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ ivo://ivoa.net/std/CDP#proxy-1.0 = ivo://cadc.nrc.ca/cred
2323
{{- $urls := ternary (list $raw) $raw (kindIs "string" $raw) -}}
2424
{{- range $urls }}
2525
ca.nrc.cadc.reg.client.RegistryClient.baseURL = {{ . | required "Please ensure deployment.sciencePortal.registryURL is set." }}
26-
{{- end }}
26+
{{- end }}

‎helm/applications/science-portal/values.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ deployment:
127127
# themeName: canfar
128128
themeName:
129129

130-
# Optional. The absolute base URL of the /home folder containing the user's home directories. This is used to query the storage quota
130+
# Optional. The absolute base URL of the /home folder containing the user's home directories. This is used to query the storage quota
131131
# information, and display a panel in the Portal UI.
132132
# Example:
133133
# storageHomeURL: https://example.org/cavern/nodes/home
@@ -141,7 +141,7 @@ experimentalFeatures:
141141
# This feature allows users to dynamically adjust the resource limits of their jobs with a different User Interface experience.
142142
slider:
143143
enabled: false
144-
144+
145145
# This is a list of tolerations that will be added to the Pod spec of the Science Portal UI.
146146
# @see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
147147
#

0 commit comments

Comments
 (0)