Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(chart/service)!: fix support for more than 2 parties #74

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(chart/service)!: fix support for more than 2 parties #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions castor-service/charts/castor/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,14 +66,14 @@ documentation for the
[Zalando postgres operator](https://github.com/zalando-incubator/postgres-operator).

| Parameter | Description | Default |
| ------------------------------------------ | ----------------------------------------------------------------------------------------- | --------------------------------------------- |
|--------------------------------------------|-------------------------------------------------------------------------------------------| --------------------------------------------- |
| `castor.image.registry` | Castor Image registry | `ghcr.io` |
| `castor.image.repository` | Castor Image name | `carbynestack/castor` |
| `castor.image.tag` | Castor Image tag | `latest` |
| `castor.image.pullPolicy` | Castor Image pull policy | `IfNotPresent` |
| `castor.springActiveProfiles` | Defines the Castor's Spring profiles to be loaded | `k8s` |
| `castor.isMaster` | Defines if Castor is running as a master service | `true` |
| `castor.slaveUri` | Defines the URI for the Castor slave service | \`\` |
| `castor.slaveUris` | List of URIs for all Castor slave services | \`\` |
| `castor.initialFragmentSize` | Defines the initial size of the fragments a chunk is split into | `1000` |
| `castor.redis.host` | The host address to the redis key/value store | `redis.default.svc.cluster.local` |
| `castor.redis.port` | The port of the redis key/value store | `6379` |
Expand Down
4 changes: 2 additions & 2 deletions castor-service/charts/castor/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ spec:
value: {{ .Values.castor.springActiveProfiles }}
- name: IS_MASTER
value: {{ .Values.castor.isMaster | quote }}
- name: SLAVE_URI
value: {{ .Values.castor.slaveUri | quote }}
- name: SLAVE_URIS
value: {{ join "," .Values.castor.slaveUris | quote }}
- name: NO_SSL_VALIDATION
value: {{ .Values.castor.noSslValidation | quote }}
- name: INITIAL_FRAGMENT_SIZE
Expand Down
2 changes: 1 addition & 1 deletion castor-service/charts/castor/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ castor:
pullSecrets: []
springActiveProfiles: "k8s"
isMaster: "true"
slaveUri: ""
slaveUris: []
noSslValidation: "false"
initialFragmentSize: 1000
redis:
Expand Down
6 changes: 3 additions & 3 deletions castor-service/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2023 - for information on the respective copyright owner
# Copyright (c) 2023-2025 - for information on the respective copyright owner
# see the NOTICE file and/or the repository https://github.com/carbynestack/castor.
#
# SPDX-License-Identifier: Apache-2.0
Expand Down Expand Up @@ -29,8 +29,8 @@ carbynestack.castor.noSslValidation=${NO_SSL_VALIDATION:false}
carbynestack.castor.trustedCertificates=${TRUSTED_CERTIFICATES:}
# Default size of the fragments an uploaded tuple chunk is split into.
carbynestack.castor.initialFragmentSize=${INITIAL_FRAGMENT_SIZE:1000}
# can be an empty string, if this is the slave
carbynestack.castor.slaveUris=${SLAVE_URI:}
# can be an empty string, if this is a slave
carbynestack.castor.slaveUris=${SLAVE_URIS:}

# reservation timeout in milliseconds
carbynestack.castor.slave.waitForReservationTimeout=${RESERVATION_TIMEOUT:5000}
Expand Down
4 changes: 2 additions & 2 deletions castor-service/src/test/resources/application-test.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2023 - for information on the respective copyright owner
# Copyright (c) 2023-2025 - for information on the respective copyright owner
# see the NOTICE file and/or the repository https://github.com/carbynestack/castor.
#
# SPDX-License-Identifier: Apache-2.0
Expand All @@ -23,7 +23,7 @@ carbynestack.castor.messageBuffer=10485760
carbynestack.castor.master=true
carbynestack.castor.noSslValidation=false
carbynestack.castor.trustedCertificates=
carbynestack.castor.slaveUris=https://castor.carbynestack.io:8080
carbynestack.castor.slaveUris=https://castor1.carbynestack.io:8080,https://castor2.carbynestack.io:8080
carbynestack.castor.slave.waitForReservationTimeout=5000
carbynestack.castor.slave.retryDelay=50
carbynestack.castor.minio.endpoint=${MINIO_ENDPOINT}
Expand Down
Loading