Skip to content

fix(chart): fix support for more than 2 parties #79

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

Merged
sbckr merged 2 commits into from
Mar 18, 2025
Merged

fix(chart): fix support for more than 2 parties #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e49b468
fix(chart): fix support for more than 2 parties
sbckr Mar 11, 2025
01a03a3
chore: address PR review findings
sbckr Mar 18, 2025
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
18 changes: 9 additions & 9 deletions amphora-service/charts/amphora/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ documentation for the
| ------------------------------------------- | ----------------------------------------------------------------------------------------- | --------------------------------------------- |
| `amphora.port ` | Port the Amphora service is bound to | `10000` |
| `amphora.playerId` | ID identifying the service in the Carbyne Stack virtual cloud | `0` |
| `amphora.vcPartner` | Defines the URI of the partner Amphora service in the virtual cloud | \`\` |
| `amphora.vcPartners` | A list of of the URLs for all partner Amphora services in the virtual cloud | `[]` |
| `amphora.openingTimeout` | Number of seconds to wait for all partners to open their multiplication input | `5000` |
| `amphora.noSslValidation` | Defines whether SSL verification should be disabled for inter VC communication | `false` |
| `amphora.trustedCertificates` | Path to certificates that should be used to verify SSL connections | \`\` |
Expand All @@ -80,21 +80,21 @@ documentation for the
| `amphora.image.tag` | Amphora Image tag | `latest` |
| `amphora.image.pullPolicy` | Amphora Image pull policy | `Never` |
| `amphora.springActiveProfiles` | Defines the Amphora's Spring profiles to be loaded | `k8s` |
| \`amphora.macKey | Defines the MacKey used for secret sharing | \`\` |
| \`amphora.castor.serviceUri | Defines the URI for Castor service | `castor.default.svc.cluster.local` |
| `amphora.macKey` | Defines the MacKey used for secret sharing | \`\` |
| `amphora.castor.serviceUri` | Defines the URI for Castor service | `castor.default.svc.cluster.local` |
| `amphora.redis.host` | The host address to the redis key/value store | `redis.default.svc.cluster.local` |
| `amphora.redis.port` | The port of the redis key/value store | `6379` |
| `amphora.minio.endpoint` | The minio secret store endpoint | `http://minio.default.svc.cluster.local:9000` |
| `amphora.db.host` | The postgres database host | `dbms-repl.default.svc.cluster.local` |
| `amphora.db.port` | The postgres database port | `5432` |
| `amphora.db.userSecretName` | Name of an existing secret to be used for the database username | \`\` |
| `amphora.db.passwordSecretName` | Name of an existing secret to be used for the database password | \`\` |
| \`amphora.probes.liveness.initialDelay | Number of seconds after the container has started before the liveness probe is initiated | `60` |
| \`amphora.probes.liveness.period | How often (in seconds) to perform the liveness probe | `10` |
| \`amphora.probes.liveness.failureThreshold | How often to fail the liveness probe before finally be marked as unsuccessful | `3` |
| \`amphora.probes.readiness.initialDelay | Number of seconds after the container has started before the readiness probe is initiated | `0` |
| \`amphora.probes.readiness.period | How often (in seconds) to perform the readiness probe | `5` |
| \`amphora.probes.readiness.failureThreshold | How often to fail the readiness probe before finally be marked as unsuccessful | `3` |
| `amphora.probes.liveness.initialDelay` | Number of seconds after the container has started before the liveness probe is initiated | `60` |
| `amphora.probes.liveness.period` | How often (in seconds) to perform the liveness probe | `10` |
| `amphora.probes.liveness.failureThreshold` | How often to fail the liveness probe before finally be marked as unsuccessful | `3` |
| `amphora.probes.readiness.initialDelay` | Number of seconds after the container has started before the readiness probe is initiated | `0` |
| `amphora.probes.readiness.period` | How often (in seconds) to perform the readiness probe | `5` |
| `amphora.probes.readiness.failureThreshold` | How often to fail the readiness probe before finally be marked as unsuccessful | `3` |

Specify each parameter using the `--set key=value[,key=value]` argument to
`helm install`. For example,
Expand Down
2 changes: 1 addition & 1 deletion amphora-service/charts/amphora/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ spec:
imagePullPolicy: {{ .Values.amphora.image.pullPolicy }}
env:
- name: AMPHORA_VC_PARTNERS
value: {{ .Values.amphora.vcPartner }}
value: {{ join "," .Values.amphora.vcPartners | quote }}
- name: AMPHORA_OPENING_TIMEOUT
value: "{{ .Values.amphora.openingTimeout }}"
- name: PLAYER_ID
Expand Down
2 changes: 1 addition & 1 deletion amphora-service/charts/amphora/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ affinity: {}

amphora:
playerId: 0
vcPartner:
vcPartners: []
openingTimeout: 5000
noSslValidation: "false"
trustedCertificates:
Expand Down
20 changes: 15 additions & 5 deletions amphora-service/src/test/java/io/carbynestack/amphora/service/AmphoraServiceSystemTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2023-2024 - 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/amphora.
*
* SPDX-License-Identifier: Apache-2.0
Expand All @@ -18,10 +18,8 @@
import static org.springframework.test.util.AssertionErrors.assertEquals;
import static org.springframework.test.util.AssertionErrors.assertTrue;

import io.carbynestack.amphora.common.Metadata;
import io.carbynestack.amphora.common.MetadataPage;
import io.carbynestack.amphora.common.SecretShare;
import io.carbynestack.amphora.common.Tag;
import io.carbynestack.amphora.common.*;
import io.carbynestack.amphora.service.config.AmphoraServiceProperties;
import io.carbynestack.amphora.service.exceptions.UnauthorizedException;
import io.carbynestack.amphora.service.opa.OpaClient;
import io.carbynestack.amphora.service.testconfig.PersistenceTestEnvironment;
Expand All @@ -36,6 +34,7 @@
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.RandomUtils;
import org.hamcrest.Matchers;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
Expand Down Expand Up @@ -83,6 +82,7 @@ public class AmphoraServiceSystemTest {
@MockBean private OpaClient opaClientMock;

@Autowired private TestRestTemplate restTemplate;
@Autowired private AmphoraServiceProperties amphoraServiceProperties;

@Autowired private PersistenceTestEnvironment testEnvironment;
private final SecretShare testSecretShare1 =
Expand Down Expand Up @@ -134,6 +134,16 @@ public void setUp() throws UnauthorizedException {
when(opaClientMock.isAllowed(any(), any(), eq(authorizedUserId), any())).thenReturn(true);
}

@Test
void givenMultipleVCPartnersDefined_whenInitialized_thenHoldExpectedConfiguration() {
assertThat(
amphoraServiceProperties.getVcPartners(),
Matchers.equalTo(
asList(
new AmphoraServiceUri("http://amphora2.carbynestack.io"),
new AmphoraServiceUri("http://amphora3.carbynestack.io"))));
}

@Test
void givenSuccessfulRequest_whenPostSecretShares_thenReturnExpectedContent() {
String expectedPath =
Expand Down
4 changes: 2 additions & 2 deletions amphora-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-2024 - 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/amphora.
#
# SPDX-License-Identifier: Apache-2.0
Expand All @@ -24,7 +24,7 @@ logging.level.org.springframework=INFO
carbynestack.auth.user-id-field-name=sub
carbynestack.opa.default-policy-package=default
carbynestack.opa.endpoint=http://opa.carbynestack.io
carbynestack.amphora.vcPartners=http://amphora2.carbynestack.io
carbynestack.amphora.vcPartners=http://amphora2.carbynestack.io,http://amphora3.carbynestack.io
carbynestack.amphora.minio.endpoint=${MINIO_ENDPOINT}
carbynestack.amphora.minio.bucket=minio-amphora-test-bucket
carbynestack.amphora.minio.access-key=${MINIO_ACCESS_KEY}
Expand Down
Loading