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

build: fix ci #134

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all 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
10 changes: 7 additions & 3 deletions .github/workflows/upgradeability-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,15 @@
- name: "Setup Helm"
uses: azure/setup-helm@v4
with:
version: v3.8.1
version: v3.16.1

- name: "Setup Kubectl"
uses: azure/setup-kubectl@v4
with:
version: 'v1.28.2'
version: 'v1.31.1'

- name: Create k8s Kind Cluster
uses: helm/kind-action@v1.10.0
uses: helm/kind-action@v1.12.0

Check warning on line 59 in .github/workflows/upgradeability-test.yaml

View workflow job for this annotation

GitHub Actions / Analyze

[LOW] Unpinned Actions Full Length Commit SHA

Pinning an action to a full length commit SHA is currently the only way to use an action as an immutable release. Pinning to a particular SHA helps mitigate the risk of a bad actor adding a backdoor to the action's repository, as they would need to generate a SHA-1 collision for a valid Git object payload. When selecting a SHA, you should verify it is from the action's repository and not a repository fork.

Check notice

Code scanning / KICS

Unpinned Actions Full Length Commit SHA Note

Action is not pinned to a full length commit SHA.

- name: "Update helm repo"
run: |
Expand Down Expand Up @@ -98,6 +98,10 @@
# wait for the pod to become ready
kubectl rollout status deployment bdrs-server

- if: failure()
run:
kubectl logs deployment/bdrs-server

- uses: ./.github/actions/setup-java

- name: "Build docker images"
Expand Down
2 changes: 1 addition & 1 deletion charts/bdrs-server/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ dependencies:
# PostgreSQL
- name: postgresql
alias: postgresql
version: 12.11.2
version: 15.2.1
repository: https://charts.bitnami.com/bitnami
condition: install.postgresql
# HashiCorp Vault
Expand Down
5 changes: 5 additions & 0 deletions charts/bdrs-server/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,11 @@ spec:
value: "didentry"

# note that the DB user and password must be put in the vault using the "edc.datasource.didentry.[user|password]" aliases, respectively!

- name: "EDC_DATASOURCE_DIDENTRY_USER"
value: {{ .Values.postgresql.auth.username | required ".Values.postgresql.auth.username is required" | quote }}
- name: "EDC_DATASOURCE_DIDENTRY_PASSWORD"
value: {{ .Values.postgresql.auth.password | required ".Values.postgresql.auth.password is required" | quote }}
- name: "EDC_DATASOURCE_DIDENTRY_URL"
value: {{ tpl .Values.postgresql.jdbcUrl . | quote }}

Expand Down
8 changes: 2 additions & 6 deletions system-tests/helm/values-vault-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,7 @@ server:
- |-
{
sleep 5

/bin/vault kv put secret/edc.datasource.didentry.user content=bdrs

/bin/vault kv put secret/edc.datasource.didentry.password content=password


/bin/vault kv put secret/mgmt-api-key content=password
}
hashicorp:
Expand All @@ -46,4 +42,4 @@ hashicorp:
standbyOk: true
paths:
secret: /v1/secret
health: /v1/sys/health
health: /v1/sys/health
Loading