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

refactor: deprecate azure vault distribution #1616

Merged
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
40 changes: 0 additions & 40 deletions .github/workflows/deployment-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -122,43 +122,3 @@ jobs:
kubectl rollout status deployment tx-prod-dataplane

# no helm test here, because the delegated auth won't work without an actual IdP

test-azure-vault-postgres:
runs-on: ubuntu-latest
needs: [ test-prepare, secret-presence ]
# if: |
# needs.secret-presence.outputs.AZURE_KV_CREDS

# DEACTIVATE this job for now because our Azure Credentials are expired
# TODO: reactivate once we have refreshed Azure Credentials
if: false
steps:
- name: Checkout
uses: actions/checkout@v4
- name: "Login to AZ CLI"
run: |
az login --service-principal -u="${{ secrets.AZURE_CLIENT_ID }}" --password="${{ secrets.AZURE_CLIENT_SECRET }}" --tenant="${{ secrets.AZURE_TENANT_ID }}"
- uses: ./.github/actions/run-deployment-test
name: "Run deployment test using KinD and Helm"
with:
imagename: "edc-controlplane-postgresql-azure-vault edc-dataplane-azure-vault"
rootDir: "edc-controlplane/edc-controlplane-postgresql-azure-vault edc-dataplane/edc-dataplane-azure-vault"
helm_command: |-
az keyvault secret set --vault-name ${{ secrets.AZURE_VAULT_NAME }} --name aes-keys --value "$(cat aes.key)" > /dev/null
az keyvault secret set --vault-name ${{ secrets.AZURE_VAULT_NAME }} --name client-secret --value "$(cat client.secret)" > /dev/null

helm install tx-prod charts/tractusx-connector-azure-vault \
-f edc-tests/deployment/src/main/resources/helm/tractusx-connector-azure-vault-test.yaml \
--dependency-update \
--set vault.azure.name=${{ secrets.AZURE_VAULT_NAME }} \
--set vault.azure.client=${{ secrets.AZURE_CLIENT_ID }} \
--set vault.azure.secret=${{ secrets.AZURE_CLIENT_SECRET }} \
--set vault.azure.tenant=${{ secrets.AZURE_TENANT_ID }} \
--wait-for-jobs --timeout=120s

# wait for the pod to become ready
kubectl rollout status deployment tx-prod-controlplane
kubectl rollout status deployment tx-prod-dataplane

# execute the helm test
helm test tx-prod
2 changes: 1 addition & 1 deletion .github/workflows/helm-lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
- name: python (setup)
uses: actions/setup-python@v5
with:
python-version: 3.7
python-version: 3.13
- name: chart-testing (setup)
uses: helm/[email protected]
#####################
Expand Down
9 changes: 2 additions & 7 deletions .github/workflows/verify.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- uses: addnab/docker-run-action@v3
with:
image: jnorwood/helm-docs:v1.10.0
options: -v ${{ github.workspace }}/charts:/helm-docs
run: helm-docs

- run: |
docker run -v ${{ github.workspace }}/charts:/helm-docs jnorwood/helm-docs helm-docs

if $(git diff --quiet --exit-code); then
echo "Helm chart docs up to date"
else
Expand Down
6 changes: 3 additions & 3 deletions DEPENDENCIES
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ maven/mavencentral/com.azure/azure-json/1.3.0, MIT, approved, clearlydefined
maven/mavencentral/com.azure/azure-security-keyvault-secrets/4.8.5, MIT, approved, #13690
maven/mavencentral/com.azure/azure-security-keyvault-secrets/4.8.6, MIT, approved, #13690
maven/mavencentral/com.azure/azure-storage-blob/12.28.0, MIT, approved, clearlydefined
maven/mavencentral/com.azure/azure-storage-common/12.27.0, , restricted, clearlydefined
maven/mavencentral/com.azure/azure-storage-internal-avro/12.13.0, , restricted, clearlydefined
maven/mavencentral/com.azure/azure-storage-common/12.27.0, MIT, approved, clearlydefined
maven/mavencentral/com.azure/azure-storage-internal-avro/12.13.0, MIT, approved, clearlydefined
maven/mavencentral/com.azure/azure-xml/1.1.0, MIT, approved, clearlydefined
maven/mavencentral/com.ethlo.time/itu/1.7.0, Apache-2.0, approved, clearlydefined
maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.10.3, Apache-2.0, approved, CQ21280
Expand Down Expand Up @@ -644,7 +644,7 @@ maven/mavencentral/org.slf4j/slf4j-api/2.0.6, MIT, approved, #5915
maven/mavencentral/org.slf4j/slf4j-api/2.0.9, MIT, approved, #5915
maven/mavencentral/org.testcontainers/database-commons/1.20.2, , restricted, clearlydefined
maven/mavencentral/org.testcontainers/jdbc/1.20.2, , restricted, clearlydefined
maven/mavencentral/org.testcontainers/junit-jupiter/1.20.2, , restricted, clearlydefined
maven/mavencentral/org.testcontainers/junit-jupiter/1.20.2, None, restricted, #16552
maven/mavencentral/org.testcontainers/postgresql/1.20.2, , restricted, clearlydefined
maven/mavencentral/org.testcontainers/testcontainers/1.20.2, MIT, approved, #15747
maven/mavencentral/org.xmlresolver/xmlresolver/5.2.2, Apache-2.0, approved, clearlydefined
Expand Down
3 changes: 3 additions & 0 deletions charts/tractusx-connector-azure-vault/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,10 @@
---
apiVersion: v2
name: tractusx-connector-azure-vault
deprecated: true
description: |
DEPRECATED: this chart will be no more available after version 0.8.0

A Helm chart for Tractus-X Eclipse Data Space Connector. The connector deployment consists of two runtime consists of a
Control Plane and a Data Plane. Note that _no_ external dependencies such as a PostgreSQL database and Azure KeyVault are included.

Expand Down
4 changes: 4 additions & 0 deletions charts/tractusx-connector-azure-vault/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
# tractusx-connector-azure-vault

> **:exclamation: This Helm Chart is deprecated!**

![Version: 0.8.0-rc4](https://img.shields.io/badge/Version-0.8.0--rc4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.8.0-rc4](https://img.shields.io/badge/AppVersion-0.8.0--rc4-informational?style=flat-square)

DEPRECATED: this chart will be no more available after version 0.8.0

A Helm chart for Tractus-X Eclipse Data Space Connector. The connector deployment consists of two runtime consists of a
Control Plane and a Data Plane. Note that _no_ external dependencies such as a PostgreSQL database and Azure KeyVault are included.

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# EDC Control-Plane PostgreSQL & Azure Key Vault

This verison of the EDC Control-Plane is backed by [PostgreSQL](https://www.postgresql.org/) and [Azure Key Vault](https://azure.microsoft.com/en-us/services/key-vault/#product-overview).
DEPRECATED: this module won't be available anymore after version 0.8.0

This version of the EDC Control-Plane is backed by [PostgreSQL](https://www.postgresql.org/) and [Azure Key Vault](https://azure.microsoft.com/en-us/services/key-vault/#product-overview).

## Building

Expand Down
2 changes: 2 additions & 0 deletions edc-dataplane/edc-dataplane-azure-vault/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# EDC Data-Plane with Azure Key Vault

DEPRECATED: this module won't be available anymore after version 0.8.0

This build of the EDC Data-Plane utilizes [Azure Key Vault](https://azure.microsoft.com/en-us/services/key-vault/#product-overview) for secret storage.

## Building
Expand Down
Loading