Skip to content

Commit 6e5abcf

Browse files
authored
Merge pull request eclipse-tractusx#182 from eclipse-tractusx/merge/latest-changes-v1.1.0-RC1
ci: merge latest changes from release candidate for 1.1.0
2 parents 2073269 + aa378a8 commit 6e5abcf

File tree

53 files changed

+3875
-240
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+3875
-240
lines changed

.github/workflows/chart-test.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ jobs:
121121
run: ct lint --validate-maintainers=false --check-version-increment=false --target-branch ${{ github.event.repository.default_branch }}
122122

123123
- name: Run chart-testing (install)
124-
run: ct install --charts charts/ssi-credential-issuer --config charts/chart-testing-config.yaml --helm-extra-set-args "--set issuer.image.name=kind-registry:5000/credential-issuer-service --set issuer.image.tag=testing --set issuermigrations.image.name=kind-registry:5000/credential-issuer-migrations --set issuermigrations.image.tag=testing --set processesworker.image.name=kind-registry:5000/credential-issuer-processes-worker --set processesworker.image.tag=testing --set credentialExpiry.image.name=kind-registry:5000/credential-expiry-app --set credentialExpiry.image.tag=testing"
124+
run: ct install --charts charts/ssi-credential-issuer --config charts/chart-testing-config.yaml --helm-extra-set-args "--set service.image.name=kind-registry:5000/credential-issuer-service --set service.image.tag=testing --set migrations.image.name=kind-registry:5000/credential-issuer-migrations --set migrations.image.tag=testing --set processesworker.image.name=kind-registry:5000/credential-issuer-processes-worker --set processesworker.image.tag=testing --set credentialExpiry.image.name=kind-registry:5000/credential-expiry-app --set credentialExpiry.image.tag=testing"
125125
if: github.event_name != 'pull_request' || steps.list-changed.outputs.changed == 'true'
126126

127127
# Upgrade the released chart version with the locally available chart
@@ -132,5 +132,5 @@ jobs:
132132
helm repo add tractusx-dev https://eclipse-tractusx.github.io/charts/dev
133133
helm install ssi-credential-issuer tractusx-dev/ssi-credential-issuer --version ${{ github.event.inputs.upgrade_from || '1.0.0' }} --namespace upgrade --create-namespace
134134
helm dependency update charts/ssi-credential-issuer
135-
helm upgrade ssi-credential-issuer charts/ssi-credential-issuer --set issuer.image.name=kind-registry:5000/credential-issuer-service --set issuer.image.tag=testing --set issuermigrations.image.name=kind-registry:5000/credential-issuer-migrations --set issuermigrations.image.tag=testing --set processesworker.image.name=kind-registry:5000/credential-issuer-processes-worker --set processesworker.image.tag=testing --set credentialExpiry.image.name=kind-registry:5000/credential-expiry-app --set credentialExpiry.image.tag=testing --namespace upgrade
135+
helm upgrade ssi-credential-issuer charts/ssi-credential-issuer --set service.image.name=kind-registry:5000/credential-issuer-service --set service.image.tag=testing --set migrations.image.name=kind-registry:5000/credential-issuer-migrations --set migrations.image.tag=testing --set processesworker.image.name=kind-registry:5000/credential-issuer-processes-worker --set processesworker.image.tag=testing --set credentialExpiry.image.name=kind-registry:5000/credential-expiry-app --set credentialExpiry.image.tag=testing --namespace upgrade
136136
if: github.event_name != 'pull_request' || steps.list-changed.outputs.changed == 'true'

.github/workflows/credential-expiry-app-docker.yml

-3
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,6 @@ jobs:
5757
- name: Set up Docker Buildx
5858
uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0
5959

60-
- name: Set up QEMU
61-
uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0
62-
6360
- name: Docker meta
6461
id: meta
6562
uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 # v5.5.1

.github/workflows/migrations-docker.yml

-3
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,6 @@ jobs:
5858
- name: Set up Docker Buildx
5959
uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0
6060

61-
- name: Set up QEMU
62-
uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0
63-
6461
- name: Docker meta
6562
id: meta
6663
uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 # v5.5.1

.github/workflows/owasp-zap.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ jobs:
107107
helm dependency build
108108
109109
- name: Install the chart on KinD cluster
110-
run: helm install testing -n apps --create-namespace --wait --set issuer.image.name=kind-registry:5000/credential-issuer-service --set issuer.image.tag=testing --set issuermigrations.image.name=kind-registry:5000/credential-issuer-migrations --set issuermigrations.image.tag=testing --set processesworker.image.name=kind-registry:5000/credential-issuer-processes-worker --set processesworker.image.tag=testing --set credentialExpiry.image.name=kind-registry:5000/credential-expiry-app --set credentialExpiry.image.tag=testing --set issuer.swaggerEnabled=true charts/ssi-credential-issuer
110+
run: helm install testing -n apps --create-namespace --wait --set service.image.name=kind-registry:5000/credential-issuer-service --set service.image.tag=testing --set migrations.image.name=kind-registry:5000/credential-issuer-migrations --set migrations.image.tag=testing --set processesworker.image.name=kind-registry:5000/credential-issuer-processes-worker --set processesworker.image.tag=testing --set credentialExpiry.image.name=kind-registry:5000/credential-expiry-app --set credentialExpiry.image.tag=testing --set service.swaggerEnabled=true charts/ssi-credential-issuer
111111

112112
- name: Configure port forward to app in KinD
113113
run: |

.github/workflows/processes-worker-docker.yml

-3
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,6 @@ jobs:
5757
- name: Set up Docker Buildx
5858
uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0
5959

60-
- name: Set up QEMU
61-
uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0
62-
6360
- name: Docker meta
6461
id: meta
6562
uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 # v5.5.1

.github/workflows/release.yml

-3
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,6 @@ jobs:
121121
- name: Set up Docker Buildx
122122
uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0
123123

124-
- name: Set up QEMU
125-
uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0
126-
127124
# Create SemVer or ref tags dependent of trigger event
128125
- name: Docker meta
129126
id: meta

.github/workflows/release_candidate.yml

-3
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,6 @@ jobs:
6161
- name: Set up Docker Buildx
6262
uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0
6363

64-
- name: Set up QEMU
65-
uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0
66-
6764
- name: Docker meta
6865
id: meta
6966
uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 # v5.5.1

.github/workflows/service-docker.yml

-3
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,6 @@ jobs:
5757
- name: Set up Docker Buildx
5858
uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0
5959

60-
- name: Set up QEMU
61-
uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0
62-
6360
- name: Docker meta
6461
id: meta
6562
uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 # v5.5.1

charts/ssi-credential-issuer/README.md

+33-33
Original file line numberDiff line numberDiff line change
@@ -43,39 +43,39 @@ dependencies:
4343
| portalBackendAddress | string | `"https://portal-backend.example.org"` | Provide portal-backend base address. |
4444
| walletAddress | string | `"https://wallet.example.org"` | |
4545
| walletTokenAddress | string | `"https://wallet.example.org/oauth/token"` | |
46-
| issuer.image.name | string | `"docker.io/tractusx/ssi-credential-issuer-service"` | |
47-
| issuer.image.tag | string | `""` | |
48-
| issuer.imagePullPolicy | string | `"IfNotPresent"` | |
49-
| issuer.resources | object | `{"limits":{"cpu":"45m","memory":"400M"},"requests":{"cpu":"15m","memory":"400M"}}` | We recommend to review the default resource limits as this should a conscious choice. |
50-
| issuer.logging.businessLogic | string | `"Information"` | |
51-
| issuer.logging.default | string | `"Information"` | |
52-
| issuer.healthChecks.startup.path | string | `"/health/startup"` | |
53-
| issuer.healthChecks.startup.tags[0].name | string | `"HEALTHCHECKS__0__TAGS__1"` | |
54-
| issuer.healthChecks.startup.tags[0].value | string | `"issuerdb"` | |
55-
| issuer.healthChecks.liveness.path | string | `"/healthz"` | |
56-
| issuer.healthChecks.readyness.path | string | `"/ready"` | |
57-
| issuer.swaggerEnabled | bool | `false` | |
58-
| issuer.portal.scope | string | `"openid"` | |
59-
| issuer.portal.grantType | string | `"client_credentials"` | |
60-
| issuer.portal.clientId | string | `"portal-client-id"` | Provide portal client-id from CX IAM centralidp. |
61-
| issuer.portal.clientSecret | string | `""` | Client-secret for portal client-id. Secret-key 'portal-client-secret'. |
62-
| issuer.credential.issuerDid | string | `"did:web:example"` | |
63-
| issuer.credential.issuerBpn | string | `"BPNL00000001TEST"` | |
64-
| issuer.credential.statusListUrl | string | `"https://example.org/statuslist"` | |
65-
| issuer.credential.encryptionConfigIndex | int | `0` | |
66-
| issuer.credential.encryptionConfigs.index0.index | int | `0` | |
67-
| issuer.credential.encryptionConfigs.index0.cipherMode | string | `"CBC"` | |
68-
| issuer.credential.encryptionConfigs.index0.paddingMode | string | `"PKCS7"` | |
69-
| issuer.credential.encryptionConfigs.index0.encryptionKey | string | `""` | EncryptionKey for wallet. Secret-key 'credential-encryption-key0'. Expected format is 256 bit (64 digits) hex. |
70-
| issuermigrations.name | string | `"migrations"` | |
71-
| issuermigrations.image.name | string | `"docker.io/tractusx/ssi-credential-issuer-migrations"` | |
72-
| issuermigrations.image.tag | string | `""` | |
73-
| issuermigrations.imagePullPolicy | string | `"IfNotPresent"` | |
74-
| issuermigrations.resources | object | `{"limits":{"cpu":"45m","memory":"200M"},"requests":{"cpu":"15m","memory":"200M"}}` | We recommend to review the default resource limits as this should a conscious choice. |
75-
| issuermigrations.seeding.testDataEnvironments | string | `""` | |
76-
| issuermigrations.seeding.testDataPaths | string | `"Seeder/Data"` | |
77-
| issuermigrations.logging.default | string | `"Information"` | |
78-
| issuermigrations.processIdentity.identityId | string | `"ac1cf001-7fbc-1f2f-817f-bce058020006"` | |
46+
| service.image.name | string | `"docker.io/tractusx/ssi-credential-issuer-service"` | |
47+
| service.image.tag | string | `""` | |
48+
| service.imagePullPolicy | string | `"IfNotPresent"` | |
49+
| service.resources | object | `{"limits":{"cpu":"45m","memory":"400M"},"requests":{"cpu":"15m","memory":"400M"}}` | We recommend to review the default resource limits as this should a conscious choice. |
50+
| service.logging.businessLogic | string | `"Information"` | |
51+
| service.logging.default | string | `"Information"` | |
52+
| service.healthChecks.startup.path | string | `"/health/startup"` | |
53+
| service.healthChecks.startup.tags[0].name | string | `"HEALTHCHECKS__0__TAGS__1"` | |
54+
| service.healthChecks.startup.tags[0].value | string | `"issuerdb"` | |
55+
| service.healthChecks.liveness.path | string | `"/healthz"` | |
56+
| service.healthChecks.readyness.path | string | `"/ready"` | |
57+
| service.swaggerEnabled | bool | `false` | |
58+
| service.portal.scope | string | `"openid"` | |
59+
| service.portal.grantType | string | `"client_credentials"` | |
60+
| service.portal.clientId | string | `"portal-client-id"` | Provide portal client-id from CX IAM centralidp. |
61+
| service.portal.clientSecret | string | `""` | Client-secret for portal client-id. Secret-key 'portal-client-secret'. |
62+
| service.credential.issuerDid | string | `"did:web:example"` | |
63+
| service.credential.issuerBpn | string | `"BPNL00000001TEST"` | |
64+
| service.credential.statusListUrl | string | `"https://example.org/statuslist"` | |
65+
| service.credential.encryptionConfigIndex | int | `0` | |
66+
| service.credential.encryptionConfigs.index0.index | int | `0` | |
67+
| service.credential.encryptionConfigs.index0.cipherMode | string | `"CBC"` | |
68+
| service.credential.encryptionConfigs.index0.paddingMode | string | `"PKCS7"` | |
69+
| service.credential.encryptionConfigs.index0.encryptionKey | string | `""` | EncryptionKey for wallet. Secret-key 'credential-encryption-key0'. Expected format is 256 bit (64 digits) hex. |
70+
| migrations.name | string | `"migrations"` | |
71+
| migrations.image.name | string | `"docker.io/tractusx/ssi-credential-issuer-migrations"` | |
72+
| migrations.image.tag | string | `""` | |
73+
| migrations.imagePullPolicy | string | `"IfNotPresent"` | |
74+
| migrations.resources | object | `{"limits":{"cpu":"45m","memory":"200M"},"requests":{"cpu":"15m","memory":"200M"}}` | We recommend to review the default resource limits as this should a conscious choice. |
75+
| migrations.seeding.testDataEnvironments | string | `""` | |
76+
| migrations.seeding.testDataPaths | string | `"Seeder/Data"` | |
77+
| migrations.logging.default | string | `"Information"` | |
78+
| migrations.processIdentity.identityId | string | `"ac1cf001-7fbc-1f2f-817f-bce058020006"` | |
7979
| processesworker.name | string | `"processesworker"` | |
8080
| processesworker.image.name | string | `"docker.io/tractusx/ssi-credential-issuer-processes-worker"` | |
8181
| processesworker.image.tag | string | `""` | |

charts/ssi-credential-issuer/templates/cronjob-issuer-processes.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ spec:
6767
value: "Server={{ .Values.externalDatabase.host }};Database={{ .Values.externalDatabase.database }};Port={{ .Values.externalDatabase.port }};User Id={{ .Values.externalDatabase.username }};Password=$(ISSUER_PASSWORD);Ssl Mode={{ .Values.dbConnection.sslMode }};"
6868
{{- end }}
6969
- name: "PORTAL__CLIENTID"
70-
value: "{{ .Values.issuer.portal.clientId }}"
70+
value: "{{ .Values.service.portal.clientId }}"
7171
- name: "PORTAL__CLIENTSECRET"
7272
valueFrom:
7373
secretKeyRef:
@@ -86,7 +86,7 @@ spec:
8686
- name: "PORTAL__USERNAME"
8787
value: "empty"
8888
- name: "CALLBACK__CLIENTID"
89-
value: "{{ .Values.issuer.portal.clientId }}"
89+
value: "{{ .Values.service.portal.clientId }}"
9090
- name: "CALLBACK__CLIENTSECRET"
9191
valueFrom:
9292
secretKeyRef:

0 commit comments

Comments
 (0)