Skip to content

Commit 813fd2d

Browse files
at88mphat88mph
committed
Merge branch 'main' of https://github.com/opencadc/deployments into portal-resource-slider
2 parents 2178492 + 2cc1e0a commit 813fd2d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+803
-64
lines changed

‎.github/dependabot.yaml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
version: 2
2+
3+
updates:
4+
- package-ecosystem: "helm"
5+
directories:
6+
- "helm/applications/skaha"
7+
schedule:
8+
interval: "daily"
9+
open-pull-requests-limit: 10
10+
pull-request-branch-name:
11+
separator: "-"
12+
labels:
13+
- "dependencies"
14+
- "helm"

‎.github/workflows/pre-commit.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,13 @@ jobs:
2020
- name: Checkout
2121
uses: actions/checkout@v4
2222

23+
- name: Helm tool installer
24+
uses: Azure/[email protected]
25+
26+
- name: Helm Dependency Updates
27+
run: |
28+
for chart in helm/applications/*/; do helm dependency update "$chart" 2>/dev/null || true; done
29+
2330
- name: Set up uv
2431
uses: astral-sh/setup-uv@v6
2532
with:

‎.pre-commit-config.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ repos:
6868
hooks:
6969
- id: helmlint
7070
- repo: https://github.com/norwoodj/helm-docs
71-
rev: v1.10.0
71+
rev: v1.14.2
7272
hooks:
73-
- id: helm-docs
73+
- id: helm-docs-container
7474
files: (README\.md\.gotmpl|(Chart|requirements|values)\.yaml)$

‎.release-please-manifest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
"helm/applications/skaha": "1.0.4",
77
"helm/applications/sshd": "1.0.1",
88
"helm/applications/storage-ui": "0.7.0",
9-
"helm/applications/utils": "0.1.0",
9+
"helm/applications/utils": "0.1.1",
1010
"helm/common": "1.0.0"
1111
}

‎docs/helm/cavern.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ $ curl https://myhost.example.com/cavern/availability
101101
| `deployment.resources.requests.cpu` | CPU request for the Cavern container | `500m` |
102102
| `deployment.resources.limits.memory` | Memory limit for the Cavern container | `1Gi` |
103103
| `deployment.resources.limits.cpu` | CPU limit for the Cavern container | `500m` |
104+
| `deployment.cavern.registryURL` | (list OR string) | `[]` IVOA Registry array of IVOA Registry locations or single IVOA Registry location |
104105
| `livenessProbe` | Configure the liveness probe check | `{}` |
105106
| `readinessProbe` | Configure the readiness probe check | `{}` |
106107
| `tolerations` | Tolerations to apply to the Cavern Pod | `[]` |

‎docs/helm/posix-mapper.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ See the [values.yaml](values.yaml) file for a complete list of configuration opt
146146
| `deployment.posixMapper.extraHosts` | List of extra hosts to be added to the POSIX Mapper deployment. See the `values.yaml` file for examples. | `[]` |
147147
| `deployment.posixMapper.extraEnv` | List of extra environment variables to be set in the POSIX Mapper service. See the `values.yaml` file for examples. | `[]` |
148148
| `deployment.posixMapper.resources` | Resource requests and limits for the POSIX Mapper API | `{}` |
149+
| `deployment.posixMapper.registryURL` | (list OR string) | `[]` IVOA Registry array of IVOA Registry locations or single IVOA Registry location |
149150
| `postgresql.maxActive` | Maximum number of active connections to the PostgreSQL database | `8` |
150151
| `postgresql.url` | Required JDBC URL for the PostgreSQL database | `""` |
151152
| `postgresql.schema` | Required Database schema to use for the POSIX Mapper | `""` |

‎docs/helm/skaha.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ The following table lists the configurable parameters for the Skaha Helm chart:
7979
| `deployment.skaha.serviceAccountName` | Name of the Service Account for the Skaha API Pod | `"skaha"` |
8080
| `deployment.skaha.identityManagerClass` | Java Class name for the [IdentityManager](https://github.com/opencadc/core/blob/main/cadc-util/src/main/java/ca/nrc/cadc/auth/IdentityManager.java) to use. Defaults to [`org.opencadc.auth.StandardIdentityManager`](https://github.com/opencadc/ac/blob/main/cadc-gms/src/main/java/org/opencadc/auth/StandardIdentityManager.java) for use with bearer tokens (OIDC) | `"org.opencadc.auth.StandardIdentityManager"` |
8181
| `deployment.skaha.apiVersion` | API version used to match the Ingress path (e.g. `/skaha/v0`) | `"v0"` |
82+
| `deployment.skaha.registryURL` | (list OR string) | `[]` IVOA Registry array of IVOA Registry locations or single IVOA Registry location |
8283
| `deployment.skaha.sessions.expirySeconds` | Expiry time, in seconds, for interactive sessions. Defaults to four (4) days. | `"345600"` |
8384
| `deployment.skaha.sessions.imagePullPolicy` | Image pull policy for all User Sessions. | `"Always"` |
8485
| `deployment.skaha.sessions.maxCount` | Maximum number of interactive sessions per user. Defaults to three (3). | `"3"` |

‎helm/applications/canfar-next/science-portal/.helmignore‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
# Patterns to ignore when building packages.
2+
# This supports shell glob matching, relative path matching, and
3+
# negation (prefixed with !). Only one pattern per line.
4+
5+
# Common VCS directories
6+
.git/
7+
.gitignore
8+
.bzr/
9+
.bzrignore
10+
.hg/
11+
.hgignore
12+
.svn/
13+
14+
# Common backup files
15+
*.swp
16+
*.bak
17+
*.tmp
18+
*.orig
19+
*~
20+
21+
# Various IDEs
22+
.project
23+
.idea/
24+
*.tmproj
25+
.vscode/
26+
*.code-workspace
27+
28+
# OS files
29+
.DS_Store
30+
Thumbs.db
31+
32+
# Helm-specific files
33+
.helmignore
34+
35+
# Documentation
36+
README.md
37+
NOTES.md
38+
39+
# CI/CD
40+
.github/
41+
.gitlab-ci.yml
42+
.travis.yml
43+
.circleci/
44+
45+
# Development files
46+
values-dev.yaml
47+
values-local.yaml
48+
*.test.yaml
49+
50+
# Temporary files
51+
tmp/
52+
temp/

‎helm/applications/canfar-next/science-portal/Chart.yaml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
apiVersion: v2
2+
name: science-portal
3+
description: A Helm chart for Science Portal Next.js application
4+
type: application
5+
version: 0.1.0
6+
appVersion: "0.1.0"
7+
keywords:
8+
- nextjs
9+
- science-portal
10+
- web-application
11+
maintainers:
12+
- name: Science Portal Team
13+
home: https://github.com/opencadc/science-portal

‎helm/applications/canfar-next/science-portal/templates/_helpers.tpl‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
{{/*
2+
Expand the name of the chart.
3+
*/}}
4+
{{- define "science-portal.name" -}}
5+
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
6+
{{- end }}
7+
8+
{{/*
9+
Create a default fully qualified app name.
10+
*/}}
11+
{{- define "science-portal.fullname" -}}
12+
{{- if .Values.fullnameOverride }}
13+
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
14+
{{- else }}
15+
{{- $name := default .Chart.Name .Values.nameOverride }}
16+
{{- if contains $name .Release.Name }}
17+
{{- .Release.Name | trunc 63 | trimSuffix "-" }}
18+
{{- else }}
19+
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
20+
{{- end }}
21+
{{- end }}
22+
{{- end }}
23+
24+
{{/*
25+
Create chart name and version as used by the chart label.
26+
*/}}
27+
{{- define "science-portal.chart" -}}
28+
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
29+
{{- end }}
30+
31+
{{/*
32+
Common labels
33+
*/}}
34+
{{- define "science-portal.labels" -}}
35+
helm.sh/chart: {{ include "science-portal.chart" . }}
36+
{{ include "science-portal.selectorLabels" . }}
37+
{{- if .Chart.AppVersion }}
38+
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
39+
{{- end }}
40+
app.kubernetes.io/managed-by: {{ .Release.Service }}
41+
{{- end }}
42+
43+
{{/*
44+
Selector labels
45+
*/}}
46+
{{- define "science-portal.selectorLabels" -}}
47+
app.kubernetes.io/name: {{ include "science-portal.name" . }}
48+
app.kubernetes.io/instance: {{ .Release.Name }}
49+
{{- end }}
50+
51+
{{/*
52+
Create the name of the service account to use
53+
*/}}
54+
{{- define "science-portal.serviceAccountName" -}}
55+
{{- if .Values.serviceAccount.create }}
56+
{{- default (include "science-portal.fullname" .) .Values.serviceAccount.name }}
57+
{{- else }}
58+
{{- default "default" .Values.serviceAccount.name }}
59+
{{- end }}
60+
{{- end }}

0 commit comments

Comments
 (0)