Skip to content

Commit 13e4cb2

Browse files
MisterTimnMisterTimn
committed
Merge branch 'feat/css-v5.0.0'
2 parents 3ea20ad + bba01b6 commit 13e4cb2

File tree

11 files changed

+155
-23
lines changed

11 files changed

+155
-23
lines changed

‎.github/workflows/lint-test.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,12 @@ jobs:
1313
- name: Checkout
1414
uses: actions/checkout@v3
1515
with:
16-
token: ${{ secrets.OBLX_PAT || secrets.github_token }}
1716
fetch-depth: 0
1817

1918
- name: Set up Helm
2019
uses: azure/setup-helm@v3.3
2120
with:
22-
version: v3.9.2
21+
version: v3.9.4
2322

2423
# Python is required because `ct lint` runs Yamale (https://github.com/23andMe/Yamale) and
2524
# yamllint (https://github.com/adrienverge/yamllint) which require Python

‎.github/workflows/check-readme-metadata.yml ‎.github/workflows/readme-metadata.yml

+7-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ on:
77
- next
88
paths:
99
- '*/values.yaml'
10+
push:
11+
branches:
12+
- main
13+
- next
14+
paths:
15+
- '*/values.yaml'
1016

1117
jobs:
1218
check-and-update-readme:
@@ -47,5 +53,5 @@ jobs:
4753
git config user.name "$GITHUB_ACTOR"
4854
git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
4955
git add community-solid-server/README.md
50-
git commit -am "docs: Update chart parameters readme"
56+
git commit -am "docs: Update chart parameters readme [skip ci]"
5157
git push

‎community-solid-server/Chart.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ type: application
1515
# This is the chart version. This version number should be incremented each time you make changes
1616
# to the chart and its templates, including the app version.
1717
# Versions are expected to follow Semantic Versioning (https://semver.org/)
18-
version: 2.1.0
18+
version: 3.0.0
1919

2020
# This is the version number of the application being deployed. This version number should be
2121
# incremented each time you make changes to the application. Versions are not expected to
2222
# follow Semantic Versioning. They should reflect the version the application is using.
2323
# It is recommended to use it with quotes.
24-
appVersion: "4.1.0"
24+
appVersion: "6.0.2"
2525

26-
home: https://github.com/idlab-gent/css-helm-chart
26+
home: https://github.com/CommunitySolidServer/css-helm-chart
2727
icon: https://raw.githubusercontent.com/solid/community-server/main/templates/images/solid.svg
2828
keywords:
2929
- solid
@@ -32,4 +32,4 @@ maintainers:
3232
- email: jasper.vaneessen@gmail.com
3333
name: MisterTimn
3434
sources:
35-
- https://github.com/solid/community-server
35+
- https://github.com/CommunitySolidServer/CommunitySolidServer

‎community-solid-server/templates/NOTES.txt

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
1. Get the application URL by running these commands:
22
{{- if .Values.ingress.enabled }}
3-
{{- range $host := .Values.ingress.hosts }}
4-
{{- range .paths }}
5-
http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }}
6-
{{- end }}
7-
{{- end }}
3+
http{{ if $.Values.ingress.tls }}s{{ end }}://{{ .Values.ingress.host }}{{ .Values.ingress.path }}
84
{{- else if contains "NodePort" .Values.service.type }}
95
export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "community-solid-server.fullname" . }})
106
export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")

‎community-solid-server/templates/_helpers.tpl

+2-2
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ Pass a correct baseUrl
6868
{{- if .Values.baseUrlOverride }}
6969
{{- .Values.baseUrlOverride }}
7070
{{- else if .Values.ingress.enabled }}
71-
{{- printf "http://%s%s" .Values.ingress.host .Values.ingress.path}}
71+
{{- printf "https://%s%s" .Values.ingress.host .Values.ingress.path}}
7272
{{- else }}
7373
{{- printf "http://%s.%s/" ( include "community-solid-server.fullname" . ) .Release.Namespace }}
7474
{{- end }}
75-
{{- end }}
75+
{{- end }}

‎community-solid-server/templates/deployment.yaml

+14-4
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ spec:
1818
labels:
1919
{{- include "community-solid-server.selectorLabels" . | nindent 8 }}
2020
spec:
21+
enableServiceLinks: false
2122
{{- with .Values.imagePullSecrets }}
2223
imagePullSecrets:
2324
{{- toYaml . | nindent 8 }}
@@ -30,9 +31,9 @@ spec:
3031
{{- toYaml .Values.securityContext | nindent 12 }}
3132
{{- $appVersion := .Chart.AppVersion -}}
3233
{{- with .Values.image }}
33-
image: "{{.registry}}/{{ .repository }}:{{ .tag | default $appVersion }}"
34-
{{- end}}
35-
args:
34+
image: "{{.registry}}/{{ .repository }}:{{ default $appVersion .tag }}"
35+
{{- end }}
36+
args:
3637
- "-l"
3738
- "{{ .Values.logLevel}}"
3839
- "-b"
@@ -43,7 +44,7 @@ spec:
4344
{{- with .Values.config}}
4445
- "-c"
4546
{{- if not .configMapName }}
46-
- "config/{{.bundled}}.json"
47+
- "config/{{ .bundled }}.json"
4748
{{- else }}
4849
- "/config/{{ .configMapKey }}"
4950
{{- end }}
@@ -52,10 +53,19 @@ spec:
5253
- "-f"
5354
- "/data/"
5455
{{- end }}
56+
{{- if .Values.multithreading.enabled }}
57+
- "-w"
58+
- {{ .Values.multithreading.workers | quote }}
59+
{{- end }}
5560
{{- range $val := .Values.customParameters }}
5661
- {{ $val.flag | quote }}
5762
- {{ $val.value | quote }}
5863
{{- end }}
64+
env:
65+
{{- range $val := .Values.env }}
66+
- name: {{ $val.name | quote}}
67+
value: {{ $val.value | quote}}
68+
{{- end }}
5969
imagePullPolicy: {{ .Values.image.pullPolicy }}
6070
ports:
6171
- name: http

‎community-solid-server/templates/persistentVolumeClaim.yaml

+7-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,13 @@ metadata:
66
labels:
77
{{- include "community-solid-server.labels" . | nindent 4 }}
88
spec:
9-
storageClassName: {{ .Values.persistence.storageClassName }}
9+
{{- if .Values.persistence.storageClassName }}
10+
{{- if (eq "-" .Values.persistence.storageClassName) }}
11+
storageClassName: ""
12+
{{- else }}
13+
storageClassName: {{ .Values.persistence.storageClassName | quote }}
14+
{{- end }}
15+
{{- end }}
1016
accessModes:
1117
- ReadWriteOnce
1218
resources:

‎community-solid-server/values.yaml

+17-4
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,25 @@ sparqlEndpoint: ""
5353
## @param baseUrlOverride From the helm config, an appropriate --baseUrl value will be passed to the community server. If however you wish to override this set this parameter appropriately.
5454
baseUrlOverride: ""
5555

56+
## @param multithreading.enabled Run in multithreaded mode using workers.
57+
## See [CSS - Multithreading](https://github.com/CommunitySolidServer/CommunitySolidServer#-multithreading).
58+
## @param multithreading.workers define how many worker threads to use, special values: -1 (num_cores-1) and 0 (num_cores)
59+
multithreading:
60+
enabled: false
61+
workers: "-1"
62+
5663
## @param customParameters An array of `flag` `value` pairs to be added to the CSS cli command for custom parameters/overwrites.
5764
customParameters: []
58-
# - flag: --serverKey
59-
# value: server.key
60-
# - flag: --serverCert
61-
# value: server.cert
65+
# - flag: --serverKey
66+
# value: server.key
67+
# - flag: --serverCert
68+
# value: server.cert
69+
70+
## @param env Array of `name: ""` and `value: ""` pairs to be passed as environment variables to the CSS.
71+
## See [CSS - Environment Variables](https://github.com/CommunitySolidServer/CommunitySolidServer#%EF%B8%8F-environment-variables).
72+
env: []
73+
# - name: CSS_LOGGING_LEVEL
74+
# value: debug
6275

6376
## @section Persistence parameters
6477
## Enable persistence using Persistent Volume Claims

‎examples/redis-locking/README.md

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# Multithreaded CSS with Redis based resource locking
2+
3+
A config has been provided to setup CSS with a file backend and Redis resource locking. First we need to get this config deployed on the cluster in a configmap:
4+
5+
```bash
6+
kubectl create configmap css-redis-file --from-file examples/redis-locking/config.json
7+
```
8+
9+
```bash
10+
helm install css-redis bitnami/redis --set auth.enabled=false
11+
```

‎examples/redis-locking/config.json

+78
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
{
2+
"@context": "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^5.0.0/components/context.jsonld",
3+
"@graph": [
4+
{
5+
"comment": "A single-pod server that stores its resources on disk."
6+
},
7+
{
8+
"@id": "urn:solid-server-app-setup:default:CliExtractor",
9+
"@type": "YargsCliExtractor",
10+
"parameters": [
11+
{
12+
"@type": "YargsParameter",
13+
"name": "redisUri",
14+
"options": {
15+
"demandOption": true,
16+
"describe": "Connection URI of Redis instance to be used for resource locking",
17+
"requiresArg": true,
18+
"type": "string"
19+
}
20+
}
21+
]
22+
},
23+
{
24+
"@id": "urn:solid-server-app-setup:default:ShorthandResolver",
25+
"@type": "CombinedShorthandResolver",
26+
"comment": "Adds resolvers to assign the Redis CLI values to the Components.js variables.",
27+
"resolvers": [
28+
{
29+
"CombinedShorthandResolver:_resolvers_key": "urn:solid-server:custom:variable:redisUri",
30+
"CombinedShorthandResolver:_resolvers_value": {
31+
"@type": "KeyExtractor",
32+
"key": "redisUri"
33+
}
34+
}
35+
]
36+
},
37+
{
38+
"@id": "urn:solid-server:default:RedisLocker",
39+
"@type": "RedisLocker",
40+
"redisClient": {
41+
"@id": "urn:solid-server:custom:variable:redisUri",
42+
"@type": "Variable"
43+
}
44+
}
45+
],
46+
"import": [
47+
"css:config/app/main/default.json",
48+
"css:config/app/init/default.json",
49+
"css:config/app/setup/required.json",
50+
"css:config/app/variables/default.json",
51+
"css:config/http/handler/default.json",
52+
"css:config/http/middleware/websockets.json",
53+
"css:config/http/server-factory/websockets.json",
54+
"css:config/http/static/default.json",
55+
"css:config/identity/access/public.json",
56+
"css:config/identity/email/default.json",
57+
"css:config/identity/handler/default.json",
58+
"css:config/identity/ownership/token.json",
59+
"css:config/identity/pod/static.json",
60+
"css:config/identity/registration/enabled.json",
61+
"css:config/ldp/authentication/dpop-bearer.json",
62+
"css:config/ldp/authorization/webacl.json",
63+
"css:config/ldp/handler/default.json",
64+
"css:config/ldp/metadata-parser/default.json",
65+
"css:config/ldp/metadata-writer/default.json",
66+
"css:config/ldp/modes/default.json",
67+
"css:config/storage/backend/file.json",
68+
"css:config/storage/key-value/resource-store.json",
69+
"css:config/storage/middleware/default.json",
70+
"css:config/util/auxiliary/acl.json",
71+
"css:config/util/identifiers/suffix.json",
72+
"css:config/util/index/default.json",
73+
"css:config/util/logging/winston.json",
74+
"css:config/util/representation-conversion/default.json",
75+
"css:config/util/resource-locker/redis.json",
76+
"css:config/util/variables/default.json"
77+
]
78+
}

‎examples/redis-locking/values.yaml

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
config:
2+
configMapKey: config.json
3+
configMapName: css-redis-file
4+
logLevel: info
5+
multithreading:
6+
enabled: true
7+
workers: 4
8+
persistence:
9+
enabled: true
10+
size: 512Mi
11+
env:
12+
- name: CSS_REDIS_URI
13+
value: css-redis-master:6379

0 commit comments

Comments
 (0)