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.

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

Acceptance release #132

Open
wants to merge 13 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 6 commits
Commits
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
2 changes: 1 addition & 1 deletion acceptance/annotation/annotation-processor-kafka-auto.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spec:
automountServiceAccountToken: false
containers:
- name: dissco-core-annotation-processing-kafka-auto
image: public.ecr.aws/dissco/dissco-core-annotation-processing-service:sha-ec9e638
image: public.ecr.aws/dissco/dissco-core-annotation-processing-service:sha-fdda894 # Jan-09-2025
imagePullPolicy: Always
ports:
- containerPort: 8080
Expand Down
2 changes: 1 addition & 1 deletion acceptance/annotation/annotation-processor-kafka-mas.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spec:
automountServiceAccountToken: false
containers:
- name: dissco-core-annotation-processing-kafka-mas
image: public.ecr.aws/dissco/dissco-core-annotation-processing-service:sha-ec9e638
image: public.ecr.aws/dissco/dissco-core-annotation-processing-service:sha-fdda894 # Jan-09-2025
imagePullPolicy: Always
ports:
- containerPort: 8080
Expand Down
2 changes: 1 addition & 1 deletion acceptance/annotation/annotation-processor-web.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spec:
automountServiceAccountToken: false
containers:
- name: dissco-core-annotation-processing-web
image: public.ecr.aws/dissco/dissco-core-annotation-processing-service:sha-ec9e638
image: public.ecr.aws/dissco/dissco-core-annotation-processing-service:sha-fdda894 # Jan-09-2025
imagePullPolicy: Always
ports:
- containerPort: 8080
Expand Down
16 changes: 10 additions & 6 deletions acceptance/backend/backend-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ spec:
automountServiceAccountToken: true
containers:
- name: dissco-backend
image: public.ecr.aws/dissco/dissco-core-backend:sha-de16d3b
image: public.ecr.aws/dissco/dissco-core-backend:sha-44ee880 # Feb-19-2025
imagePullPolicy: Always
ports:
- containerPort: 80
Expand Down Expand Up @@ -51,10 +51,14 @@ spec:
secretKeyRef:
name: aws-secrets
key: elastic-password
- name: springdoc.api-docs.path
value: /api/v3/api-docs
- name: springdoc.swagger-ui.path
value: /api/swagger-ui.html
value: /docs/swagger-ui.html
- name: springdoc.api-docs.path
value: /docs/api-docs
- name: springdoc.swagger-ui.config-url
value: /api/docs/api-docs/swagger-config
- name: springdoc.swagger-ui.url
value: /api/docs/api-docs
- name: spring.security.oauth2.resourceserver.jwt.issuer-uri
value: https://login-demo.dissco.eu/auth/realms/dissco
- name: spring.security.oauth2.authorizationserver.endpoint.jwk-set-uri
Expand Down Expand Up @@ -105,13 +109,13 @@ spec:
httpGet:
path: /actuator/health/liveness
port: 8080
initialDelaySeconds: 60
initialDelaySeconds: 120
periodSeconds: 3
readinessProbe:
httpGet:
path: /actuator/health/readiness
port: 8080
initialDelaySeconds: 60
initialDelaySeconds: 120
failureThreshold: 2
securityContext:
runAsNonRoot: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ spec:
automountServiceAccountToken: true
containers:
- name: data-exporter-backend
image: public.ecr.aws/dissco/dissco-data-exporter-backend:sha-bbdbc24
image: public.ecr.aws/dissco/dissco-data-exporter-backend:sha-74f9ce7 # Jan-09-2025
imagePullPolicy: Always
ports:
- containerPort: 80
Expand Down
4 changes: 3 additions & 1 deletion acceptance/datacite-publisher/datacite-publisher.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ spec:
automountServiceAccountToken: false
containers:
- name: datacite-publisher
image: public.ecr.aws/dissco/datacite-publisher:latest
image: public.ecr.aws/dissco/datacite-publisher:sha-493aaed # Jan-15-2025
imagePullPolicy: Always
env:
- name: doi.prefix
Expand All @@ -34,6 +34,8 @@ spec:
value: ${spring.security.oauth2.resourceserver.jwt.issuer-uri}/protocol/openid-connect/certs
- name: datacite.endpoint
value: https://api.test.datacite.org/dois
- name: handle.endpoint
value: https://sandbox.dissco.tech/doi-manager/api/pids/v1/
- name: datacite.repository-id
valueFrom:
secretKeyRef:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spec:
automountServiceAccountToken: false
containers:
- name: dissco-digital-media-object-processor-kafka
image: public.ecr.aws/dissco/dissco-core-digital-media-object-processor:sha-d6302da
image: public.ecr.aws/dissco/dissco-core-digital-media-object-processor:sha-0ae4294 # Feb-17-2025
imagePullPolicy: Always
ports:
- containerPort: 80
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spec:
automountServiceAccountToken: false
containers:
- name: dissco-digital-media-object-processor-web
image: public.ecr.aws/dissco/dissco-core-digital-media-object-processor:sha-d6302da
image: public.ecr.aws/dissco/dissco-core-digital-media-object-processor:sha-0ae4294 # Feb-17-2025
imagePullPolicy: Always
ports:
- containerPort: 80
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spec:
automountServiceAccountToken: false
containers:
- name: dissco-digital-specimen-processor-kafka
image: public.ecr.aws/dissco/dissco-core-digital-specimen-processor:sha-02035fa
image: public.ecr.aws/dissco/dissco-core-digital-specimen-processor:sha-2d2948c # Feb-10-2025
imagePullPolicy: Always
ports:
- containerPort: 80
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spec:
automountServiceAccountToken: false
containers:
- name: dissco-digital-specimen-processor-web
image: public.ecr.aws/dissco/dissco-core-digital-specimen-processor:sha-02035fa
image: public.ecr.aws/dissco/dissco-core-digital-specimen-processor:sha-2d2948c # Feb-10-2025
imagePullPolicy: Always
ports:
- containerPort: 80
Expand Down
2 changes: 1 addition & 1 deletion acceptance/frontend/frontend-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
automountServiceAccountToken: false
containers:
- name: disscover
image: public.ecr.aws/dissco/disscover:sha-3f8a872
image: public.ecr.aws/dissco/disscover:sha-2afbc74 # Jan-23-2025
ports:
- containerPort: 3000
resources:
Expand Down
16 changes: 12 additions & 4 deletions acceptance/handle-manager/handle-manager-deployment-doi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spec:
automountServiceAccountToken: false
containers:
- name: dissco-handle-manager
image: public.ecr.aws/dissco/handle-manager:sha-ac4b16d # Dec 12
image: public.ecr.aws/dissco/handle-manager:sha-c9da430 # Jan-23-2025
imagePullPolicy: Always
ports:
- containerPort: 80
Expand All @@ -30,9 +30,9 @@ spec:
- name: spring.security.oauth2.authorizationserver.endpoint.jwk-set-uri
value: ${spring.security.oauth2.resourceserver.jwt.issuer-uri}/protocol/openid-connect/certs
- name: application.ui-url
value: https://sandbox.dissco.tech/api
value: https://sandbox.dissco.tech
- name: application.api-url
value: ${application.ui-url}/api/v1
value: ${application.ui-url}/api
- name: application.orchestration-api
value: https://acc.orchestration.dissco.tech/api
- name: application.orchestration-ui
Expand All @@ -43,6 +43,14 @@ spec:
value: group-1
- name: application.maxHandles
value: '1000'
- name: springdoc.swagger-ui.path
value: /docs/swagger-ui.html
- name: springdoc.api-docs.path
value: /docs/api-docs
- name: springdoc.swagger-ui.config-url
value: /doi-manager/api/pids/v1/docs/api-docs/swagger-config
- name: springdoc.swagger-ui.url
value: /doi-manager/api/pids/v1/docs/api-docs
- name: spring.datasource.url
value: jdbc:postgresql://terraform-20230828064251677200000001.cbppwfnjypll.eu-west-2.rds.amazonaws.com:5432/dissco
- name: spring.datasource.username
Expand All @@ -58,7 +66,7 @@ spec:
- name: application.prefix
value: SANDBOX
- name: caching.spring.ttl
value: "43200000"
value: PT6H
- name: mongo.database
value: handle
- name: mongo.connection-string
Expand Down
18 changes: 14 additions & 4 deletions acceptance/handle-manager/handle-manager-deployment-handle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spec:
automountServiceAccountToken: false
containers:
- name: dissco-handle-manager
image: public.ecr.aws/dissco/handle-manager:sha-a24c92e
image: public.ecr.aws/dissco/handle-manager:sha-c9da430 # Jan-23-2025
imagePullPolicy: Always
ports:
- containerPort: 80
Expand All @@ -33,10 +33,20 @@ spec:
value: https://sandbox.dissco.tech
- name: application.api-url
value: ${application.ui-url}/api
- name: application.orchestration-url
value: https://orchestration.dissco.tech/api
- name: application.orchestration-api
value: https://acc.orchestration.dissco.tech/api
- name: application.orchestration-ui
value: https://acc.orchestration.dissco.tech
- name: application.maxHandles
value: '1000'
- name: springdoc.swagger-ui.path
value: /docs/swagger-ui.html
- name: springdoc.api-docs.path
value: /docs/api-docs
- name: springdoc.swagger-ui.config-url
value: /handle-manager/api/pids/v1/docs/api-docs/swagger-config
- name: springdoc.swagger-ui.url
value: /handle-manager/api/pids/v1/docs/api-docs
- name: spring.datasource.url
value: jdbc:postgresql://terraform-20230828064251677200000001.cbppwfnjypll.eu-west-2.rds.amazonaws.com:5432/dissco
- name: spring.datasource.username
Expand All @@ -52,7 +62,7 @@ spec:
- name: application.prefix
value: SANDBOX
- name: caching.spring.ttl
value: "43200000"
value: PT6H
- name: mongo.database
value: handle
- name: mongo.connection-string
Expand Down
2 changes: 1 addition & 1 deletion acceptance/mas-inspector/kubernetes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
automountServiceAccountToken: false
containers:
- name: mas-job-timeout-inspector
image: public.ecr.aws/dissco/mas-inspector:latest
image: public.ecr.aws/dissco/mas-inspector:latest # Apr-17-2024
imagePullPolicy: IfNotPresent
env:
- name: HOST
Expand Down
2 changes: 1 addition & 1 deletion acceptance/nu-search/nu-search-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ spec:
serviceAccountName: nu-search-sa
containers:
- name: dissco-nu-search-deployment
image: public.ecr.aws/dissco/dissco-nusearch-service:sha-534dd6d
image: public.ecr.aws/dissco/dissco-nusearch-service:sha-8cbd7a3 # Jan-27-2025
imagePullPolicy: Always
env:
- name: spring.profiles.active
Expand Down
2 changes: 1 addition & 1 deletion acceptance/nu-search/nu-search-indexer-job.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ spec:
serviceAccountName: nu-search-sa
containers:
- name: dissco-nu-search-indexer-job
image: public.ecr.aws/dissco/dissco-nusearch-service:sha-eab04af
image: public.ecr.aws/dissco/dissco-nusearch-service:sha-8cbd7a3 # Jan-27-2025
imagePullPolicy: Always
env:
- name: spring.profiles.active
Expand Down
6 changes: 3 additions & 3 deletions acceptance/orchestration-backend/orchestration-backend.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ spec:
serviceAccountName: dissco-orchestration-backend-sa
containers:
- name: dissco-orchestration-backend
image: public.ecr.aws/dissco/dissco-core-orchestration-backend:sha-fd83f45
image: public.ecr.aws/dissco/dissco-core-orchestration-backend:sha-e1c4e87 # Feb-13-2025
imagePullPolicy: Always
ports:
- containerPort: 8080
Expand Down Expand Up @@ -62,9 +62,9 @@ spec:
name: aws-secrets
key: handle-endpoint-token
- name: translator-job.image
value: public.ecr.aws/dissco/dissco-core-translator:sha-7e781fc
value: public.ecr.aws/dissco/dissco-core-translator:sha-a1a75bd # Feb-14-2025
- name: mas.runningEndpoint
value: https://dev.dissco.tech/api/v1/mjr
value: https://sandbox.dissco.tech/api/v1/mjr
resources:
requests:
memory: "500Mi"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
automountServiceAccountToken: false
containers:
- name: dissco-orchestration-frontend
image: public.ecr.aws/dissco/orchestration-frontend:sha-c1b9990
image: public.ecr.aws/dissco/orchestration-frontend:sha-c6226fb # Dec-16-2024
ports:
- containerPort: 3000
resources:
Expand Down
2 changes: 1 addition & 1 deletion acceptance/provenance/provenance-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spec:
automountServiceAccountToken: false
containers:
- name: dissco-provenance-service
image: public.ecr.aws/dissco/dissco-core-provenance-service:sha-880d34e
image: public.ecr.aws/dissco/dissco-core-provenance-service:sha-1ac8c0c # Jan-13-2025
imagePullPolicy: Always
ports:
- containerPort: 80
Expand Down
14 changes: 9 additions & 5 deletions test/backend/backend-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,14 @@ spec:
secretKeyRef:
name: aws-secrets
key: elastic-password
- name: springdoc.api-docs.path
value: /api/v3/api-docs
- name: springdoc.swagger-ui.path
value: /api/swagger-ui.html
value: /docs/swagger-ui.html
- name: springdoc.api-docs.path
value: /docs/api-docs
- name: springdoc.swagger-ui.config-url
value: /api/docs/api-docs/swagger-config
- name: springdoc.swagger-ui.url
value: /api/docs/api-docs
- name: spring.security.oauth2.resourceserver.jwt.issuer-uri
value: https://login-demo.dissco.eu/auth/realms/dissco
- name: spring.security.oauth2.authorizationserver.endpoint.jwk-set-uri
Expand Down Expand Up @@ -99,13 +103,13 @@ spec:
httpGet:
path: /actuator/health/liveness
port: 8080
initialDelaySeconds: 60
initialDelaySeconds: 120
periodSeconds: 3
readinessProbe:
httpGet:
path: /actuator/health/readiness
port: 8080
initialDelaySeconds: 60
initialDelaySeconds: 120
failureThreshold: 2
securityContext:
runAsNonRoot: true
Expand Down
8 changes: 4 additions & 4 deletions test/handle-manager/handle-manager-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,27 +18,27 @@ spec:
automountServiceAccountToken: false
containers:
- name: dissco-handle-manager-handle
image: public.ecr.aws/dissco/handle-manager
image: public.ecr.aws/dissco/handle-manager:latest
imagePullPolicy: Always
ports:
- containerPort: 80
env:
- name: spring.profiles.active
value: handle
- name: spring.security.oauth2.resourceserver.jwt.issuer-uri
value: https://login-demo.dissco.eu/auth/realms/dissco
- name: spring.security.oauth2.authorizationserver.endpoint.jwk-set-uri
value: ${spring.security.oauth2.resourceserver.jwt.issuer-uri}/protocol/openid-connect/certs
- name: application.ui-url
value: https://dev.dissco.tech
- name: application.api-url
value: ${application.ui-url}/api/v1
value: ${application.ui-url}/api
- name: application.orchestration-api
value: https://dev-orchestration.dissco.tech/api
- name: application.orchestration-ui
value: https://dev-orchestration.dissco.tech
- name: application.maxHandles
value: '1000'
- name: spring.profiles.active
value: handle
- name: springdoc.swagger-ui.path
value: /docs/swagger-ui.html
- name: springdoc.api-docs.path
Expand Down
6 changes: 3 additions & 3 deletions test/handle-manager/handle-manager-doi-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,22 @@ spec:
ports:
- containerPort: 80
env:
- name: spring.profiles.active
value: doi
- name: spring.security.oauth2.resourceserver.jwt.issuer-uri
value: https://login-demo.dissco.eu/auth/realms/dissco
- name: spring.security.oauth2.authorizationserver.endpoint.jwk-set-uri
value: ${spring.security.oauth2.resourceserver.jwt.issuer-uri}/protocol/openid-connect/certs
- name: application.ui-url
value: https://dev.dissco.tech
- name: application.api-url
value: ${application.ui-url}/api/v1
value: ${application.ui-url}/api
- name: application.orchestration-ui
value: https://dev-orchestration.dissco.tech/api/v1
- name: application.orchestration-api
value: https://dev-orchestration.dissco.tech/api/v1
- name: application.maxHandles
value: '1000'
- name: spring.profiles.active
value: doi
- name: springdoc.swagger-ui.path
value: /docs/swagger-ui.html
- name: springdoc.api-docs.path
Expand Down
Loading