Skip to content

Commit ce290e6

Browse files
committed
- fixes health probe
- adjust the min resources - upgrade to node 24
1 parent a90a969 commit ce290e6

File tree

14 files changed

+1942
-25
lines changed

14 files changed

+1942
-25
lines changed

.github/workflows/main.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ jobs:
1010
name: Build, Test & Push to Docker
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v2
14-
- name: Use Node.js 18
15-
uses: actions/setup-node@v1
13+
- uses: actions/checkout@v5
14+
- name: Use Node.js 24
15+
uses: actions/setup-node@v5
1616
with:
17-
node-version: 18
17+
node-version: 24
1818

1919
- name: Login to GitHub Container Registry
2020
run: |

.github/workflows/release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ jobs:
1212
name: Release Helm Chart
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v2
15+
- uses: actions/checkout@v5
1616

17-
- name: Use Node.js 18
18-
uses: actions/setup-node@v1
17+
- name: Use Node.js 24
18+
uses: actions/setup-node@v5
1919
with:
20-
node-version: 18
20+
node-version: 24
2121

2222
- name: Login to GitHub Container Registry
2323
run: |

.github/workflows/set-version.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ jobs:
2121
SEMVER_REGEX="^v(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)(\\-[0-9A-Za-z-]+(\\.[0-9A-Za-z-]+)*)?(\\+[0-9A-Za-z-]+(\\.[0-9A-Za-z-]+)*)?$"
2222
[[ "${SELECTED_VERSION}" =~ $SEMVER_REGEX ]] || { echo "Invalid version number '$SELECTED_VERSION'. Should be e.g. 'v2.0.0-alpha.0' with leading 'v'." ; exit 1; }
2323
24-
- uses: actions/checkout@v3
24+
- uses: actions/checkout@v5
2525

26-
- name: Use Node.js 18
27-
uses: actions/setup-node@v3
26+
- name: Use Node.js 24
27+
uses: actions/setup-node@v5
2828
with:
29-
node-version: 18
29+
node-version: 24
3030

3131
- name: Install Utilities
3232
run: yarn install

.vscode/settings.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"typescript.tsdk": "node_modules/typescript/lib"
3+
}

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:18-alpine
1+
FROM node:24-alpine
22

33
RUN mkdir -p /usr/src/app
44
COPY . /usr/src/app

README.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,10 @@ Kubernetes: `>= 1.14.0-0`
2929
| defaultSemanticIndexerConfig.bulkEmbeddingsSize | int | `1` | |
3030
| defaultSemanticIndexerConfig.bulkIndexSize | int | `50` | |
3131
| defaultSemanticIndexerConfig.chunkSizeLimit | int | `512` | |
32-
| defaultSemanticIndexerConfig.chunkSizeLimit | int | `512` | |
3332
| defaultSemanticIndexerConfig.id | string | `"csv-semantic-indexer"` | |
3433
| defaultSemanticIndexerConfig.indexName | string | `"semantic-index"` | |
3534
| defaultSemanticIndexerConfig.indexVersion | int | `1` | |
3635
| defaultSemanticIndexerConfig.overlap | int | `50` | |
37-
| defaultSemanticIndexerConfig.overlap | int | `50` | |
3836
| embeddingApiURL | string | `"http://magda-embedding-api"` | |
3937
| global | object | `{"image":{},"rollingUpdate":{},"searchEngine":{"defaultDatasetBucket":"magda-datasets","semanticIndexer":{"indexName":null,"indexVersion":null,"knnVectorFieldConfig":{"compressionLevel":"32x","dimension":768,"efConstruction":100,"efSearch":100,"m":16,"mode":"on_disk","spaceType":"l2"},"numberOfReplicas":0,"numberOfShards":1}}}` | only for providing appropriate default value for helm lint |
4038
| global.searchEngine.semanticIndexer.knnVectorFieldConfig.compressionLevel | string | `"32x"` | The compression_level mapping parameter selects a quantization encoder that reduces vector memory consumption by the given factor. |
@@ -51,8 +49,9 @@ Kubernetes: `>= 1.14.0-0`
5149
| minioConfig.useSSL | bool | `false` | |
5250
| opensearchURL | string | `"http://opensearch:9200"` | |
5351
| port | int | `6305` | Service port configuration |
54-
| resources.limits.cpu | string | `"100m"` | |
55-
| resources.requests.cpu | string | `"50m"` | |
52+
| resources.limits.cpu | string | `"500m"` | |
53+
| resources.limits.memory | string | `"512Mi"` | |
54+
| resources.requests.cpu | string | `"100m"` | |
5655
| resources.requests.memory | string | `"200Mi"` | |
5756
| semanticIndexer.bulkEmbeddingsSize | int | `nil` | number of string we request embedding api to process in one request |
5857
| semanticIndexer.bulkIndexSize | int | `nil` | Number of documents we send to OpenSearch for bulk processing in a single request |
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
dependencies:
2+
- name: magda-common
3+
repository: oci://ghcr.io/magda-io/charts
4+
version: 5.2.0
5+
digest: sha256:4bc98b935ac3e2d4d8a3e8c153ea069cc8c9c6df8c0b0a2fe5baba45d6547641
6+
generated: "2025-10-13T12:44:16.882913+11:00"

deploy/magda-csv-semantic-indexer/templates/deployment.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,14 @@ spec:
3131
"--chunkSizeLimit", "{{ .Values.semanticIndexer.chunkSizeLimit | default .Values.defaultSemanticIndexerConfig.chunkSizeLimit }}",
3232
"--overlap", "{{ .Values.semanticIndexer.overlap | default .Values.defaultSemanticIndexerConfig.overlap }}"
3333
]
34+
ports:
35+
- containerPort: {{ int .Values.port }}
36+
name: http
3437
{{- if .Values.global.enableLivenessProbes }}
3538
livenessProbe:
3639
httpGet:
3740
path: "/healthz"
38-
port: 80
41+
port: {{ .Values.port }}
3942
initialDelaySeconds: 10
4043
periodSeconds: 10
4144
timeoutSeconds: 10

deploy/magda-csv-semantic-indexer/values.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,6 @@ defaultSemanticIndexerConfig:
4242
overlap: 50
4343
indexName: "semantic-index"
4444
indexVersion: 1
45-
chunkSizeLimit: 512
46-
overlap: 50
4745
bulkEmbeddingsSize: 1
4846
bulkIndexSize: 50
4947

@@ -85,7 +83,8 @@ defaultAdminUserId: "00000000-0000-4000-8000-000000000000"
8583

8684
resources:
8785
requests:
88-
cpu: 50m
86+
cpu: 100m
8987
memory: 200Mi
9088
limits:
91-
cpu: 100m
89+
cpu: 500m
90+
memory: 512Mi

dev-config.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"internalUrl": "http://magda-csv-semantic-indexer",
3+
"registryUrl": "http://localhost:6101/v0",
4+
"registryReadonlyURL": "http://localhost:6101/v0",
5+
"semanticIndexerConfig": "../../../../dev-indexer-config.json",
6+
"minioConfig": "../../../../dev-minio-config.json",
7+
"opensearchApiURL": "http://localhost:9200",
8+
"embeddingApiURL": "http://localhost:3000",
9+
"jwtSecret": "replace_me",
10+
"minioAccessKey": "reaplce_me",
11+
"minioSecretKey": "replace_me"
12+
}

0 commit comments

Comments
 (0)