From 537e440ae0f836b8f9b8bbd4de2657157a3fc5fd Mon Sep 17 00:00:00 2001 From: Dennis Wendland <72455939+dwendland@users.noreply.github.com> Date: Fri, 5 Jul 2024 11:55:45 +0200 Subject: [PATCH 1/3] Remove argocd (#80) --- .github/dependabot.yml | 70 --------- .github/workflows/deploy.yaml | 81 ----------- README.md | 18 +-- .../activation-service/Chart.yaml | 12 -- .../activation-service/values.yaml | 92 ------------ .../contract-management/Chart.yaml | 12 -- .../contract-management/values.yaml | 45 ------ .../credentials-config-service/Chart.yaml | 12 -- .../credentials-config-service/values.yaml | 17 --- argocd/applications/dsba-pdp/Chart.yaml | 12 -- argocd/applications/dsba-pdp/values.yaml | 52 ------- argocd/applications/keycloak/Chart.yaml | 10 -- .../keycloak/templates/_helpers.tpl | 52 ------- .../keycloak/templates/certificate.yaml | 15 -- .../keycloak/templates/didConfigMap.yaml | 20 --- .../keycloak/templates/profilesConfigMap.yaml | 8 -- .../keycloak/templates/route.yaml | 25 ---- argocd/applications/keycloak/values.yaml | 128 ----------------- argocd/applications/keyrock/Chart.yaml | 12 -- argocd/applications/keyrock/values.yaml | 83 ----------- argocd/applications/kong/Chart.yaml | 12 -- .../applications/kong/templates/_helpers.tpl | 39 ----- .../kong/templates/proxy-certificate.yaml | 15 -- .../kong/templates/proxy-route.yaml | 33 ----- argocd/applications/kong/values.yaml | 102 -------------- argocd/applications/mongodb/Chart.yaml | 12 -- argocd/applications/mongodb/values.yaml | 21 --- argocd/applications/mysql/Chart.yaml | 12 -- argocd/applications/mysql/values.yaml | 9 -- argocd/applications/orion-ld/Chart.yaml | 12 -- argocd/applications/orion-ld/values.yaml | 14 -- argocd/applications/postgres/Chart.yaml | 12 -- argocd/applications/postgres/values.yaml | 19 --- argocd/applications/tm-forum-api/Chart.yaml | 12 -- argocd/applications/tm-forum-api/values.yaml | 77 ---------- .../trusted-issuers-list/Chart.yaml | 12 -- .../trusted-issuers-list/values.yaml | 28 ---- argocd/applications/vcwaltid/Chart.yaml | 12 -- .../vcwaltid/templates/_helpers.tpl | 52 ------- .../vcwaltid/templates/certificate.yaml | 15 -- .../vcwaltid/templates/deployment.yaml | 39 ----- .../vcwaltid/templates/ingress-certs.yaml | 32 ----- .../vcwaltid/templates/ingress.yaml | 33 ----- .../vcwaltid/templates/route-certs.yaml | 28 ---- .../vcwaltid/templates/route.yaml | 29 ---- .../vcwaltid/templates/service.yaml | 16 --- argocd/applications/vcwaltid/values.yaml | 69 --------- argocd/applications/verifier/Chart.yaml | 12 -- argocd/applications/verifier/values.yaml | 39 ----- argocd/data-space-connector/Chart.yaml | 11 -- .../templates/_helpers.tpl | 4 - .../templates/argo-application.yaml | 115 --------------- argocd/data-space-connector/values.yaml | 133 ------------------ examples/README.md | 2 + 54 files changed, 4 insertions(+), 1854 deletions(-) delete mode 100644 .github/dependabot.yml delete mode 100644 .github/workflows/deploy.yaml delete mode 100644 argocd/applications/activation-service/Chart.yaml delete mode 100644 argocd/applications/activation-service/values.yaml delete mode 100644 argocd/applications/contract-management/Chart.yaml delete mode 100644 argocd/applications/contract-management/values.yaml delete mode 100644 argocd/applications/credentials-config-service/Chart.yaml delete mode 100644 argocd/applications/credentials-config-service/values.yaml delete mode 100644 argocd/applications/dsba-pdp/Chart.yaml delete mode 100644 argocd/applications/dsba-pdp/values.yaml delete mode 100644 argocd/applications/keycloak/Chart.yaml delete mode 100644 argocd/applications/keycloak/templates/_helpers.tpl delete mode 100644 argocd/applications/keycloak/templates/certificate.yaml delete mode 100644 argocd/applications/keycloak/templates/didConfigMap.yaml delete mode 100644 argocd/applications/keycloak/templates/profilesConfigMap.yaml delete mode 100644 argocd/applications/keycloak/templates/route.yaml delete mode 100644 argocd/applications/keycloak/values.yaml delete mode 100644 argocd/applications/keyrock/Chart.yaml delete mode 100644 argocd/applications/keyrock/values.yaml delete mode 100644 argocd/applications/kong/Chart.yaml delete mode 100644 argocd/applications/kong/templates/_helpers.tpl delete mode 100644 argocd/applications/kong/templates/proxy-certificate.yaml delete mode 100644 argocd/applications/kong/templates/proxy-route.yaml delete mode 100644 argocd/applications/kong/values.yaml delete mode 100644 argocd/applications/mongodb/Chart.yaml delete mode 100644 argocd/applications/mongodb/values.yaml delete mode 100644 argocd/applications/mysql/Chart.yaml delete mode 100644 argocd/applications/mysql/values.yaml delete mode 100644 argocd/applications/orion-ld/Chart.yaml delete mode 100644 argocd/applications/orion-ld/values.yaml delete mode 100644 argocd/applications/postgres/Chart.yaml delete mode 100644 argocd/applications/postgres/values.yaml delete mode 100644 argocd/applications/tm-forum-api/Chart.yaml delete mode 100644 argocd/applications/tm-forum-api/values.yaml delete mode 100644 argocd/applications/trusted-issuers-list/Chart.yaml delete mode 100644 argocd/applications/trusted-issuers-list/values.yaml delete mode 100644 argocd/applications/vcwaltid/Chart.yaml delete mode 100644 argocd/applications/vcwaltid/templates/_helpers.tpl delete mode 100644 argocd/applications/vcwaltid/templates/certificate.yaml delete mode 100644 argocd/applications/vcwaltid/templates/deployment.yaml delete mode 100644 argocd/applications/vcwaltid/templates/ingress-certs.yaml delete mode 100644 argocd/applications/vcwaltid/templates/ingress.yaml delete mode 100644 argocd/applications/vcwaltid/templates/route-certs.yaml delete mode 100644 argocd/applications/vcwaltid/templates/route.yaml delete mode 100644 argocd/applications/vcwaltid/templates/service.yaml delete mode 100644 argocd/applications/vcwaltid/values.yaml delete mode 100644 argocd/applications/verifier/Chart.yaml delete mode 100644 argocd/applications/verifier/values.yaml delete mode 100644 argocd/data-space-connector/Chart.yaml delete mode 100644 argocd/data-space-connector/templates/_helpers.tpl delete mode 100644 argocd/data-space-connector/templates/argo-application.yaml delete mode 100644 argocd/data-space-connector/values.yaml diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index f6cd443..0000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,70 +0,0 @@ -# To get started with Dependabot version updates, you'll need to specify which -# package ecosystems to update and where the package manifests are located. -# Please see the documentation for all configuration options: -# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file - -version: 2 - -# List of directories to scan for updates -updates: - - package-ecosystem: "docker" - directory: "argocd/applications/activation-service" - schedule: - interval: "daily" - - package-ecosystem: "docker" - directory: "argocd/applications/contract-management" - schedule: - interval: "daily" - - package-ecosystem: "docker" - directory: "argocd/applications/credentials-config-service" - schedule: - interval: "daily" - - package-ecosystem: "docker" - directory: "argocd/applications/dsba-pdp" - schedule: - interval: "daily" - #- package-ecosystem: "docker" - # directory: "argocd/applications/keycloak" - # schedule: - # interval: "daily" - #- package-ecosystem: "docker" - # directory: "argocd/applications/keyrock" - # schedule: - # interval: "daily" - - package-ecosystem: "docker" - directory: "argocd/applications/kong" - schedule: - interval: "daily" - #- package-ecosystem: "docker" - # directory: "argocd/applications/mongodb" - # schedule: - # interval: "daily" - #- package-ecosystem: "docker" - # directory: "argocd/applications/mysql" - # schedule: - # interval: "daily" - - package-ecosystem: "docker" - directory: "argocd/applications/orion-ld" - schedule: - interval: "daily" - #- package-ecosystem: "docker" - # directory: "argocd/applications/postgres" - # schedule: - # interval: "daily" - - package-ecosystem: "docker" - directory: "argocd/applications/tm-forum-api" - schedule: - interval: "daily" - - package-ecosystem: "docker" - directory: "argocd/applications/trusted-issuers-list" - schedule: - interval: "daily" - - package-ecosystem: "docker" - directory: "argocd/applications/vcwaltid" - schedule: - interval: "daily" - - package-ecosystem: "docker" - directory: "argocd/applications/verifier" - schedule: - interval: "daily" - diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml deleted file mode 100644 index 516c905..0000000 --- a/.github/workflows/deploy.yaml +++ /dev/null @@ -1,81 +0,0 @@ -name: Deploy into existing namespace - -on: - push: - branches: - - 'deploy/**' - -concurrency: - group: ${{ github.ref }} - cancel-in-progress: false - -env: - # Repo containing participant connector values file in respective namespace folder - GITOPS_REPO: https://raw.githubusercontent.com/FIWARE-Ops/fiware-gitops/master/aws - - # Directory for each participant containing connector values file - VALUES_DIR: data-space-connector - -jobs: - - deploy: - - runs-on: ubuntu-latest - - # Deployment for participants, must contain folder for each participant - # Will look for values.yaml file at: ////values.yaml - strategy: - matrix: - participant: ["packet-delivery"] - - steps: - - - name: Git checkout - uses: actions/checkout@v1 - - - name: Authenticate and set context - uses: redhat-actions/oc-login@v1 - - with: - # URL to your OpenShift cluster. - # Refer to Step 2. - openshift_server_url: ${{ secrets.OPENSHIFT_SERVER }} - - # Authentication Token. Can use username and password instead. - # Refer to Step 3. - openshift_token: ${{ secrets.OPENSHIFT_TOKEN }} - - # Disables SSL cert checking. Use this if you don't have the certificate authority data. - insecure_skip_tls_verify: true - - # extract the current branch name and provide it as a var for easier integration into sed-commands - - name: Get branch name - id: branch-name - uses: tj-actions/branch-names@v5.2 - - - name: Log the branch name used as namespace - run: | - echo ${{ steps.branch-name.outputs.current_branch }} - - - name: Get namespace from branch name - run: | - echo "NAMESPACE=$(echo ${{ steps.branch-name.outputs.current_branch }} | cut -d "/" -f 2)" >> "$GITHUB_ENV" - - - name: Log the namespace - run: | - echo ${{ env.NAMESPACE }} - - - name: Log the participant - run: | - echo ${{ matrix.participant }} - - - name: Download values for participant - run: | - cd argocd/data-space-connector/ - wget -O values-participant.yaml ${{ env.GITOPS_REPO }}/${{ env.NAMESPACE }}/${{ matrix.participant }}/${{ env.VALUES_DIR }}/values.yaml - cat values-participant.yaml - - - name: Deploy applications - run: | - cd argocd/data-space-connector/ - helm template ${{ secrets.OVERWRITE_VALUES }} -f values-participant.yaml . | oc -n argocd apply -f - diff --git a/README.md b/README.md index 1fd4f52..b5be6bc 100644 --- a/README.md +++ b/README.md @@ -17,23 +17,9 @@ FIWARE [data-space-connector repository](https://github.com/FIWARE/data-space-co The FIWARE Data Space Connector provides a local deployment of a Minimal Viable Dataspace. Find a detailed documentation here: [Local Deployment](./doc/LOCAL.MD) -### Deployment with ArgoCD - -The FIWARE Data Space Connector is a [Helm](https://helm.sh) chart using a gitops-approach, following -the [app-of-apps pattern](https://argo-cd.readthedocs.io/en/stable/operator-manual/cluster-bootstrapping), with [ArgoCD](https://argo-cd.readthedocs.io/en/stable/). - -This repository already provides a [deployment Github action](.github/workflows/deploy.yaml) compatible with OpenShift clusters, performing deployments out of -a branch created in the format `deploy/` and pulling the `values.yaml` from a specified gitops repository. It also requires to set the -following ENVs for the Github action, `OPENSHIFT_SERVER` and `OPENSHIFT_TOKEN`, specifying the OpenShift target URL and access token, respectively. -For deployment, simply fork this repository, adapt the configuration of the action to your setup and set the necessary ENVs. After creating a -`deploy/` branch, it will perform the deployment to the specified namespace. - -For a different cluster flavor, the GitHub action needs to be modified before to be compatible. - - ### Deployment with Helm -Even though a gitops-approach, following the app-of-apps pattern, with ArgoCD, is the preferred way to deploy the Data-Space-Connector, not everyone has it available. Therefore, the Data-Space-Connector is also provided as an [Umbrella-Chart](https://helm.sh/docs/howto/charts_tips_and_tricks/#complex-charts-with-many-dependencies), containing all the sub-charts and their dependencies. +The Data-Space-Connector is a [Helm Umbrella-Chart](https://helm.sh/docs/howto/charts_tips_and_tricks/#complex-charts-with-many-dependencies), containing all the sub-charts of the different components and their dependencies. The chart is available at the repository ```https://fiware-ops.github.io/data-space-connector/```. You can install it via: @@ -48,7 +34,7 @@ The chart is available at the repository ```https://fiware-ops.github.io/data-sp structure and type of the required VCs, internal hostnames of the different connector components and providing the configuration of the DID and keys/certs. Also have a look at the [examples](#examples). -Configurations for all sub-charts (and sub-dependencies) can be managed through the top-level [values.yaml](./charts/data-space-connector/values.yaml) of the chart. It contains the default values of each [application](./argocd/applications/) and additional parameter shared between the components. The configuration of the applications can be changed under the key ``````, please see the individual applications and there sub-charts for the available options. +Configurations for all sub-charts (and sub-dependencies) can be managed through the top-level [values.yaml](./charts/data-space-connector/values.yaml) of the chart. It contains the default values of each component and additional parameter shared between the components. The configuration of the applications can be changed under the key ``````, please see the individual applications and there sub-charts for the available options. Example: In order to change the image-tag of [Keycloak](./argocd/applications/keycloak/), the values.yaml looks as following: ```yaml diff --git a/argocd/applications/activation-service/Chart.yaml b/argocd/applications/activation-service/Chart.yaml deleted file mode 100644 index b407a1a..0000000 --- a/argocd/applications/activation-service/Chart.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: v2 -name: activation-service -description: Chart holder for argo-cd - -type: application -version: 2.3.1 -appVersion: "2.2.1" - -dependencies: - - name: activation-service - version: 2.3.1 - repository: https://i4trust.github.io/helm-charts diff --git a/argocd/applications/activation-service/values.yaml b/argocd/applications/activation-service/values.yaml deleted file mode 100644 index b1c40f6..0000000 --- a/argocd/applications/activation-service/values.yaml +++ /dev/null @@ -1,92 +0,0 @@ -activation-service: - deployment: - image: - repository: quay.io/i4trust/activation-service - tag: 2.2.1 - pullPolicy: IfNotPresent - - ## Configuration of activation service execution - activationService: - # -- Listen port - port: 8080 - # -- Number of (gunicorn) workers that should be created - workers: 1 - # -- Maximum header size in bytes - maxHeaderSize: 32768 - # -- Log Level - logLevel: "debug" - - ## CCS config - ccs: - endpoint: "http://ccs-credentials-config-service:8080/" - id: "my-activation-service" - defaultOidcScope: "default" - oidcScopes: - default: - - type: "VerifiableCredential" - trustedParticipantsLists: [ - "https://tir.dataspace.com" - ] - trustedIssuersLists: [ - "http://til-trusted-issuers-list:8080" - ] - - type: "ActivationService" - trustedParticipantsLists: [ - "https://tir.dataspace.com" - ] - trustedIssuersLists: [ - "http://til-trusted-issuers-list:8080" - ] - - ## AS config - config: - - # DB - db: - # -- Use sqlite in-memory database - useMemory: true - # -- Enable tracking of modifications - modTracking: false - # -- Enable SQL logging to stderr - echo: true - - # Configuration for additional API keys to protect certain endpoints - apikeys: - # Config for iSHARE flow - ishare: - # Enable for /token endpoint (API key will be required) - enabledToken: false - # Enable for /createpolicy endpoint (API key will be required) - enabledCreatePolicy: false - # Config for Trusted-Issuers-List flow - issuer: - # Header name - headerName: "AS-API-KEY" - # API key (auto-generated if left empty) - apiKey: "" - # Enable for /issuer endpoint (API key will be required) - enabledIssuer: true - - ar: - # Endpoint for token request - token: "https://ar.isharetest.net/connect/token" - # Endpoint for create policy requests - policy: "https://ar.isharetest.net/policy" - # Endpoint for delegation requests - delegation: "https://ar.isharetest.net/delegation" - # EORI of AR - id: "EU.EORI.DEPROVIDER" - - issuer: - clientId: "my-activation-service" - providerId: "did:web:my-did:did" - tilUri: "http://til-trusted-issuers-list:8080" - verifierUri: "https://verifier.provider.com" - samedevicePath: "/api/v1/samedevice" - jwksPath: "/.well-known/jwks" - algorithms: - - "ES256" - roles: - createRole: "CREATE_ISSUER" - updateRole: "UPDATE_ISSUER" - deleteRole: "DELETE_ISSUER" diff --git a/argocd/applications/contract-management/Chart.yaml b/argocd/applications/contract-management/Chart.yaml deleted file mode 100644 index 84b3142..0000000 --- a/argocd/applications/contract-management/Chart.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: v2 -name: contract-management -description: Chart holder for argo-cd - -type: application -version: 0.5.0 -appVersion: "0.5.0" - -dependencies: - - name: contract-management - version: 0.5.0 - repository: https://fiware.github.io/helm-charts diff --git a/argocd/applications/contract-management/values.yaml b/argocd/applications/contract-management/values.yaml deleted file mode 100644 index cc29ae8..0000000 --- a/argocd/applications/contract-management/values.yaml +++ /dev/null @@ -1,45 +0,0 @@ -contract-management: - deployment: - image: - repository: quay.io/fiware/contract-management - # -- tag of the image to be used - tag: 1.0.0 - pullPolicy: IfNotPresent - ## Config parameters to be used when adding issuers to TIL - til: {} - ## Type of Verifiable Credential necessary for accessing the service - ##credentialType: MyCredential - ## Claims with permissions granted to given Verifiable Credential - ##claims: - ## DID of the target service that is requiring the permissions - ## - target: "did:some:service" - ## ## Roles that are added/allowed for the given service - ## roles: - ## - Consumer - ## - Admin - services: - ## Config for Trusted Issuers List - til: - ## Path to be used - path: "" - ## URL of the Trusted Issuers List Service - url: http://${til-service}:8080 - ## Read timeout in sec - read-timeout: 30 - ## Config for the TM Forum Service hosting the Product Ordering API - product: - ## Path to be used - path: "/tmf-api/productOrderingManagement/v4" - ## URL of the TM Forum Service hosting the Product Ordering API - url: http://${tm_forum_proxy}:8080 - ## Read timeout in sec - read-timeout: 30 - ## Config for the TM Forum Service hosting the Party API - party: - ## Path to be used - path: "/tmf-api/party/v4" - ## URL of the TM Forum Service hosting the Party API - url: http://${tm_forum_proxy}:8080 - ## Read timeout in sec - read-timeout: 30 - diff --git a/argocd/applications/credentials-config-service/Chart.yaml b/argocd/applications/credentials-config-service/Chart.yaml deleted file mode 100644 index abc2b9c..0000000 --- a/argocd/applications/credentials-config-service/Chart.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: v2 -name: credentials-config-service -description: Chart holder for argo-cd - -type: application -version: 0.0.4 -appVersion: "1.0.1" - -dependencies: - - name: credentials-config-service - version: 0.0.4 - repository: https://fiware.github.io/helm-charts diff --git a/argocd/applications/credentials-config-service/values.yaml b/argocd/applications/credentials-config-service/values.yaml deleted file mode 100644 index f9c661d..0000000 --- a/argocd/applications/credentials-config-service/values.yaml +++ /dev/null @@ -1,17 +0,0 @@ -credentials-config-service: - - # Image - deployment: - image: - repository: quay.io/fiware/credentials-config-service - tag: 1.0.1 - - # Database config - database: - persistence: true - host: mysql-dsc - name: ccs - - # Should use Secret in production environment - username: root - password: "" diff --git a/argocd/applications/dsba-pdp/Chart.yaml b/argocd/applications/dsba-pdp/Chart.yaml deleted file mode 100644 index e4cca55..0000000 --- a/argocd/applications/dsba-pdp/Chart.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: v2 -name: dsba-pdp -description: Chart holder for argo-cd - -type: application -version: 0.0.16 -appVersion: "1.0.0" - -dependencies: - - name: dsba-pdp - version: 0.0.16 - repository: https://fiware.github.io/helm-charts diff --git a/argocd/applications/dsba-pdp/values.yaml b/argocd/applications/dsba-pdp/values.yaml deleted file mode 100644 index 0675eef..0000000 --- a/argocd/applications/dsba-pdp/values.yaml +++ /dev/null @@ -1,52 +0,0 @@ -dsba-pdp: - - # DB - db: - enabled: false - migrate: - enabled: false - - deployment: - # Image - image: - pullPolicy: Always - repository: quay.io/fiware/dsba-pdp - # includes the http policy support - tag: 1.2.0 - - # Log level - logLevel: TRACE - - # iSHARE config - ishare: - existingSecret: vcwaltid-tls-sec - - clientId: did:web:my-did:did - trustedFingerprints: - - MYFINGERPRINT - - ar: - id: "did:web:my-did:did" - delegationPath: "/ar/delegation" - tokenPath: "/oauth2/token" - url: "https://ar.provider.com" - - trustAnchor: - id: "EU.EORI.FIWARESATELLITE" - tokenPath: "/token" - trustedListPath: "/trusted_list" - url: "https://tir.dataspace.com" - - # Verifier - trustedVerifiers: - - https://verifier.provider.com/.well-known/jwks - - # Provider DID - providerId: "did:web:my-did:did" - - # ENVs - additionalEnvVars: - - name: ISHARE_CERTIFICATE_PATH - value: /iShare/tls.crt - - name: ISHARE_KEY_PATH - value: /iShare/tls.key diff --git a/argocd/applications/keycloak/Chart.yaml b/argocd/applications/keycloak/Chart.yaml deleted file mode 100644 index 425e506..0000000 --- a/argocd/applications/keycloak/Chart.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: v2 -name: keycloak -description: A Helm chart for Kubernetes to deploy Keycloak -type: application -version: 13.0.4 -appVersion: "17.0.1" -dependencies: -- name: keycloak - version: 13.0.3 - repository: https://charts.bitnami.com/bitnami diff --git a/argocd/applications/keycloak/templates/_helpers.tpl b/argocd/applications/keycloak/templates/_helpers.tpl deleted file mode 100644 index 578f439..0000000 --- a/argocd/applications/keycloak/templates/_helpers.tpl +++ /dev/null @@ -1,52 +0,0 @@ -{{/* -Expand the name of the chart. -*/}} -{{- define "keycloak.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -If release name contains chart name it will be used as a full name. -*/}} -{{- define "keycloak.fullname" -}} -{{- if .Values.fullnameOverride }} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- $name := default .Chart.Name .Values.nameOverride }} -{{- if contains $name .Release.Name }} -{{- .Release.Name | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} -{{- end }} -{{- end }} -{{- end }} - -{{/* -Create chart name and version as used by the chart label. -*/}} -{{- define "keycloak.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Common labels -*/}} -{{- define "keycloak.labels" -}} -helm.sh/chart: {{ include "keycloak.chart" . }} -{{ include "keycloak.selectorLabels" . }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -app: {{ include "keycloak.name" . }} -{{- end }} - -{{/* -Selector labels -*/}} -{{- define "keycloak.selectorLabels" -}} -app.kubernetes.io/name: {{ include "keycloak.name" . }} -app.kubernetes.io/instance: {{ .Release.Name }} -{{- end }} diff --git a/argocd/applications/keycloak/templates/certificate.yaml b/argocd/applications/keycloak/templates/certificate.yaml deleted file mode 100644 index 37b327d..0000000 --- a/argocd/applications/keycloak/templates/certificate.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if .Values.route.certificate -}} -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: {{ include "keycloak.fullname" . }} - labels: - {{ include "keycloak.labels" . | nindent 4 }} -spec: - secretName: {{ include "keycloak.fullname" . }}-tls-sec - issuerRef: - {{- toYaml .Values.route.certificate.issuer | nindent 4 }} - commonName: {{ .Values.route.host }} - dnsNames: - - {{ .Values.route.host }} -{{- end -}} diff --git a/argocd/applications/keycloak/templates/didConfigMap.yaml b/argocd/applications/keycloak/templates/didConfigMap.yaml deleted file mode 100644 index 2a5fe8f..0000000 --- a/argocd/applications/keycloak/templates/didConfigMap.yaml +++ /dev/null @@ -1,20 +0,0 @@ -{{- if .Values.didConfig.loadDidWebEnabled -}} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "keycloak.fullname" . }}-did-config -data: - import.sh: |- - export KEY=$(cat /opt/did/secret/tls.key) - export KEY_ID=$(curl --location "${WALTID_CORE_ADDRESS}/v1/key/import" --header 'Content-Type: text/plain' --data "${KEY}" | jq -r '.id') - echo The key id: ${KEY_ID} - curl --location "${WALTID_CORE_ADDRESS}/v1/did/create" \ - --header 'Content-Type: application/json' \ - --data "{ - \"method\": \"web\", - \"keyAlias\":\"${KEY_ID}\", - \"domain\": \"{{ .Values.didConfig.domain }}\", - \"path\": \"did\", - \"x5u\": \"{{ .Values.didConfig.x5u }}\" - }" -{{- end }} diff --git a/argocd/applications/keycloak/templates/profilesConfigMap.yaml b/argocd/applications/keycloak/templates/profilesConfigMap.yaml deleted file mode 100644 index e67efda..0000000 --- a/argocd/applications/keycloak/templates/profilesConfigMap.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "keycloak.fullname" . }}-profile -data: - profile.properties: |- - feature.scripts=enabled - feature.upload_scripts=enabled diff --git a/argocd/applications/keycloak/templates/route.yaml b/argocd/applications/keycloak/templates/route.yaml deleted file mode 100644 index bce3813..0000000 --- a/argocd/applications/keycloak/templates/route.yaml +++ /dev/null @@ -1,25 +0,0 @@ -{{- if .Values.route.enabled -}} -{{- $fullName := include "keycloak.fullname" . -}} -apiVersion: route.openshift.io/v1 -kind: Route -metadata: - name: {{ include "keycloak.fullname" . }} - labels: - {{ include "keycloak.labels" . | nindent 4 }} - annotations: - cert-utils-operator.redhat-cop.io/certs-from-secret: {{ include "keycloak.fullname" . }}-tls-sec - {{- with .Values.route.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - host: {{ .Values.route.host}} - to: - kind: Service - name: {{ $fullName }} - {{- if .Values.route.tls }} - tls: - {{- with .Values.route.tls }} - {{- toYaml . | nindent 4 }} - {{- end }} - {{- end }} -{{- end }} diff --git a/argocd/applications/keycloak/values.yaml b/argocd/applications/keycloak/values.yaml deleted file mode 100644 index fe2e6d8..0000000 --- a/argocd/applications/keycloak/values.yaml +++ /dev/null @@ -1,128 +0,0 @@ -keycloak: - - # Image - image: - tag: 21.1.2-debian-11-r1 - - # Logging - logging: - level: INFO - - # Replica - replicaCount: 1 - - # Admin account - auth: - adminUser: fiwareAdmin - adminPassword: fiwareAdmin - - # CLI config - keycloakConfigCli: - enabled: true - # current image does not contain 20.0.3., thus we need this fix - command: - - java - - -jar - - /opt/bitnami/keycloak-config-cli/keycloak-config-cli-20.0.1.jar - - extraEnvVars: - - name: IMPORT_FILES_LOCATIONS - value: "/config/*" - containerSecurityContext: - enabled: false - podSecurityContext: - enabled: false - - # Realm config - either provide configuration or existing ConfigMap - configuration: {} - existingConfigmap: "" - - # ENVs - extraEnvVars: - - name: KEYCLOAK_PROXY_ADDRESS_FORWARDING - value: "true" - - name: KEYCLOAK_LOG_LEVEL - value: INFO - - name: VCISSUER_ISSUER_DID - value: "did:web:my-did:did" - - name: VCISSUER_WALTID_ADDRESS - value: "http://vcwaltid" - - # Volume mounts - extraVolumeMounts: - - name: profiles - mountPath: /opt/bitnami/keycloak/conf/profile.properties - subPath: profile.properties - - name: providers - mountPath: /opt/bitnami/keycloak/providers/ - - name: data - mountPath: /data - - # Volumes - extraVolumes: - - name: data - emptyDir: {} - - name: profiles - configMap: - name: keycloak-profile - - name: providers - emptyDir: {} - - name: did-config - configMap: - name: keycloak-did-config - - name: did-secret - secret: - secretName: vcwaltid-tls-sec - - # Init containers for VC issuer and loading of DID - initContainers: - - name: add-vc-issuer - image: quay.io/fiware/keycloak-vc-issuer:1.0.1 - imagePullPolicy: Always - volumeMounts: - - name: providers - mountPath: /target - - name: load-did - image: quay.io/opencloudio/curl:4.2.0-build.8 - imagePullPolicy: Always - command: - - /bin/sh - - /opt/did/script/import.sh - env: - - name: WALTID_CORE_ADDRESS - value: "vcwaltid:7000" - volumeMounts: - - name: did-config - mountPath: /opt/did/script - - name: did-secret - mountPath: /opt/did/secret - - # Disable internal DB - postgresql: - enabled: false - - # Config for external DB - externalDatabase: - host: postgresql - user: keycloak - password: "" - database: keycloak - -# Config to create DID -didConfig: - # Enable creation of ConfigMap for loading the DID into walt-id - # When disabling, also remove the load-did initContainer from the list above - loadDidWebEnabled: true - - # Domain for DID web - domain: "provider.com" - - # x5u for DID web - x5u: "https://provider.com/certs/tls.crt" - -# OpenShift Route config -route: - enabled: false - host: my-host.org - tls: {} - certificate: {} diff --git a/argocd/applications/keyrock/Chart.yaml b/argocd/applications/keyrock/Chart.yaml deleted file mode 100644 index e95f0a5..0000000 --- a/argocd/applications/keyrock/Chart.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: v2 -name: keyrock -description: Chart holder for argo-cd - -type: application -version: 0.7.4 -appVersion: "8.3.3" - -dependencies: - - name: keyrock - version: 0.7.5 - repository: https://fiware.github.io/helm-charts diff --git a/argocd/applications/keyrock/values.yaml b/argocd/applications/keyrock/values.yaml deleted file mode 100644 index a0313b9..0000000 --- a/argocd/applications/keyrock/values.yaml +++ /dev/null @@ -1,83 +0,0 @@ -keyrock: - fullnameOverride: keyrock-dsc - - # Image - statefulset: - image: - repository: quay.io/wi_stefan/keyrock - tag: sn-fix-2 - pullPolicy: Always - - # DB config - db: - user: root - password: "" - host: mysql-dsc - - # Admin user to be created - admin: - user: admin - password: "" - email: admin@fiware.org - - # External hostname of Keyrock - host: https://keyrock.provider.com - - ## Theme configuration for Keyrock - theme: - ## -- Enable theme - enabled: false - - ## Configuration of Authorisation Registry (AR) - authorisationRegistry: - # -- Enable usage of authorisation registry - enabled: true - # -- Identifier (EORI) of AR - identifier: "did:web:my-did:did" - # -- URL of AR - url: "internal" - - ## Configuration of iSHARE Satellite - satellite: - # -- Enable usage of satellite - enabled: true - # -- Identifier (EORI) of satellite - identifier: "EU.EORI.FIWARESATELLITE" - # -- URL of satellite - url: "https://tir.dataspace.com" - # -- Token endpoint of satellite - tokenEndpoint: "https://https://tir.dataspace.com/token" - # -- Parties endpoint of satellite - partiesEndpoint: "https://https://tir.dataspace.com/parties" - - ## -- Configuration of local key and certificate for validation and generation of tokens - token: - # -- Enable storage of local key and certificate - enabled: false - - # ENV variables for Keyrock - additionalEnvVars: - - name: IDM_TITLE - value: "dsba AR" - - name: IDM_DEBUG - value: "true" - - name: DEBUG - value: "*" - - name: IDM_DB_NAME - value: ar_idm - - name: IDM_DB_SEED - value: "true" - - name: IDM_SERVER_MAX_HEADER_SIZE - value: "32768" - - name: IDM_PR_CLIENT_ID - value: "did:web:my-did:did" - - name: IDM_PR_CLIENT_KEY - valueFrom: - secretKeyRef: - name: vcwaltid-tls-sec - key: tls.key - - name: IDM_PR_CLIENT_CRT - valueFrom: - secretKeyRef: - name: vcwaltid-tls-sec - key: tls.crt diff --git a/argocd/applications/kong/Chart.yaml b/argocd/applications/kong/Chart.yaml deleted file mode 100644 index 41fb8a3..0000000 --- a/argocd/applications/kong/Chart.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: v2 -name: kong -description: Chart holder for argo-cd - -type: application -version: 2.8.0 -appVersion: "2.8.1" - -dependencies: -- name: kong - version: 2.8.0 - repository: https://charts.konghq.com diff --git a/argocd/applications/kong/templates/_helpers.tpl b/argocd/applications/kong/templates/_helpers.tpl deleted file mode 100644 index bdd60bc..0000000 --- a/argocd/applications/kong/templates/_helpers.tpl +++ /dev/null @@ -1,39 +0,0 @@ -{{/* vim: set filetype=mustache: */}} -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -*/}} - -{{- define "kong.namespace" -}} -{{- default .Release.Namespace .Values.namespace -}} -{{- end -}} - -{{- define "kong.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{- define "kong.fullname" -}} -{{- $name := default .Chart.Name .Values.nameOverride -}} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{- define "kong.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{- define "kong.metaLabels" -}} -app.kubernetes.io/name: {{ template "kong.name" . }} -helm.sh/chart: {{ template "kong.chart" . }} -app.kubernetes.io/instance: "{{ .Release.Name }}" -app.kubernetes.io/managed-by: "{{ .Release.Service }}" -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- range $key, $value := .Values.extraLabels }} -{{ $key }}: {{ $value | quote }} -{{- end }} -{{- end -}} - -{{- define "kong.selectorLabels" -}} -app.kubernetes.io/name: {{ template "kong.name" . }} -app.kubernetes.io/component: app -app.kubernetes.io/instance: "{{ .Release.Name }}" -{{- end -}} diff --git a/argocd/applications/kong/templates/proxy-certificate.yaml b/argocd/applications/kong/templates/proxy-certificate.yaml deleted file mode 100644 index 8e9c34d..0000000 --- a/argocd/applications/kong/templates/proxy-certificate.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if .Values.kong.proxy.route.certificate -}} -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: {{ include "kong.fullname" . }} - labels: - {{ include "kong.metaLabels" . | nindent 4 }} -spec: - secretName: {{ include "kong.fullname" . }}-tls-sec - issuerRef: - {{- toYaml .Values.kong.proxy.route.certificate.issuer | nindent 4 }} - commonName: {{ .Values.kong.proxy.route.host }} - dnsNames: - - {{ .Values.kong.proxy.route.host }} -{{- end -}} diff --git a/argocd/applications/kong/templates/proxy-route.yaml b/argocd/applications/kong/templates/proxy-route.yaml deleted file mode 100644 index 15ab42c..0000000 --- a/argocd/applications/kong/templates/proxy-route.yaml +++ /dev/null @@ -1,33 +0,0 @@ -{{- if .Values.kong.proxy.route.enabled -}} -apiVersion: route.openshift.io/v1 -kind: Route -metadata: - name: {{ include "kong.fullname" . }} - labels: - {{ include "kong.metaLabels" . | nindent 4 }} - {{- if or .Values.kong.proxy.route.annotations .Values.kong.proxy.route.certificate }} - annotations: - {{- if .Values.kong.proxy.route.certificate }} - cert-utils-operator.redhat-cop.io/certs-from-secret: {{ include "kong.fullname" . }}-tls-sec - {{- end }} - {{- with .Values.kong.proxy.route.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} - {{- end }} -spec: - {{- if .Values.kong.proxy.route.host }} - host: {{ .Values.kong.proxy.route.host }} - {{- end }} - port: - targetPort: kong-proxy - path: "/" - to: - kind: Service - name: {{ include "kong.fullname" . }}-proxy - {{- if .Values.kong.proxy.route.tls }} - tls: - {{- with .Values.kong.proxy.route.tls }} - {{- toYaml . | nindent 4 }} - {{- end }} - {{- end }} -{{- end }} diff --git a/argocd/applications/kong/values.yaml b/argocd/applications/kong/values.yaml deleted file mode 100644 index 25f57dc..0000000 --- a/argocd/applications/kong/values.yaml +++ /dev/null @@ -1,102 +0,0 @@ -kong: - image: - repository: quay.io/fiware/kong - tag: "0.5.7" - pullPolicy: IfNotPresent - - replicaCount: 1 - - autoscaling: - enabled: false - - env: - database: "off" - nginx_worker_processes: "2" - proxy_access_log: /dev/stdout - admin_access_log: /dev/stdout - admin_gui_access_log: /dev/stdout - portal_api_access_log: /dev/stdout - proxy_error_log: /dev/stderr - admin_error_log: /dev/stderr - admin_gui_error_log: /dev/stderr - portal_api_error_log: /dev/stderr - prefix: /kong_prefix/ - log_level: debug - nginx_proxy_large_client_header_buffers: "16 128k" - nginx_proxy_http2_max_field_size: "32k" - nginx_proxy_http2_max_header_size: "32k" - plugins: bundled,pep-plugin,ngsi-ishare-policies - pluginserver_names: pep-plugin - pluginserver_pep_plugin_start_cmd: "/go-plugins/pep-plugin" - pluginserver_pep_plugin_query_cmd: "/go-plugins/pep-plugin -dump" - - ingressController: - enabled: false - installCRDs: false - - proxy: - type: ClusterIP - enabled: true - tls: - enabled: false - - # Provide Ingress or Route config here - ingress: - enabled: false - route: - enabled: false - - admin: - enabled: true - type: ClusterIP - http: - enabled: true - servicePort: 8001 - containerPort: 8001 - - status: - enabled: true - http: - enabled: true - containerPort: 9102 - - # Provide the kong.yml configuration (either as existing CM, secret or directly in the values.yaml) - dblessConfig: - configMap: "" - secret: "" - config: | - _format_version: "2.1" - _transform: true - - consumers: - - username: token-consumer - keyauth_credentials: - - tags: - - token-key - - tir-key - - services: - - host: "orion" - name: "provider" - port: 1026 - protocol: http - - routes: - - name: my-path - paths: - - /my-path - strip_path: true - - plugins: - - name: pep-plugin - config: - pathprefix: "/pdc" - authorizationendpointtype: ExtAuthz - authorizationendpointaddress: http://pdp-dsba-pdp:8080/authz - - - name: request-transformer - config: - remove: - headers: - - Authorization - - authorization diff --git a/argocd/applications/mongodb/Chart.yaml b/argocd/applications/mongodb/Chart.yaml deleted file mode 100644 index 92ae1cb..0000000 --- a/argocd/applications/mongodb/Chart.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: v2 -name: mongodb -description: Chart holder for argo-cd - -type: application -version: 0.1.0 -appVersion: "4.4.12" - -dependencies: -- name: mongodb - version: 11.0.4 - repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami diff --git a/argocd/applications/mongodb/values.yaml b/argocd/applications/mongodb/values.yaml deleted file mode 100644 index b8dc673..0000000 --- a/argocd/applications/mongodb/values.yaml +++ /dev/null @@ -1,21 +0,0 @@ -mongodb: - - auth: - enabled: true - rootPassword: "" - - architecture: standalone - - podSecurityContext: - enabled: false - containerSecurityContext: - enabled: false - - resources: - limits: - cpu: 200m - memory: 512Mi - - persistence: - enabled: true - size: 8Gi diff --git a/argocd/applications/mysql/Chart.yaml b/argocd/applications/mysql/Chart.yaml deleted file mode 100644 index 035a77b..0000000 --- a/argocd/applications/mysql/Chart.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: v2 -name: mysql -description: Chart holder for argo-cd - -type: application -version: 9.4.4 -appVersion: "8.0.31" - -dependencies: -- name: mysql - version: 9.4.4 - repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami \ No newline at end of file diff --git a/argocd/applications/mysql/values.yaml b/argocd/applications/mysql/values.yaml deleted file mode 100644 index e6382ef..0000000 --- a/argocd/applications/mysql/values.yaml +++ /dev/null @@ -1,9 +0,0 @@ -mysql: - fullnameOverride: mysql-dsc - auth: - # Should use a Secret on production deployments - rootPassword: "" - initdbScripts: - create.sql: | - CREATE DATABASE til; - CREATE DATABASE ccs; diff --git a/argocd/applications/orion-ld/Chart.yaml b/argocd/applications/orion-ld/Chart.yaml deleted file mode 100644 index cb2d52f..0000000 --- a/argocd/applications/orion-ld/Chart.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: v2 -name: orion-ld -description: Chart holder for argo-cd - -type: application -version: 1.2.6 -appVersion: "1.0.1" - -dependencies: -- name: orion - version: 1.2.6 - repository: https://fiware.github.io/helm-charts diff --git a/argocd/applications/orion-ld/values.yaml b/argocd/applications/orion-ld/values.yaml deleted file mode 100644 index d2bcce0..0000000 --- a/argocd/applications/orion-ld/values.yaml +++ /dev/null @@ -1,14 +0,0 @@ -orion: - - broker: - db: - auth: - user: root - password: "" - mech: "SCRAM-SHA-1" - hosts: - - mongodb - - mongo: - # we want to use the individually deployed mongodb - enabled: false diff --git a/argocd/applications/postgres/Chart.yaml b/argocd/applications/postgres/Chart.yaml deleted file mode 100644 index 568959a..0000000 --- a/argocd/applications/postgres/Chart.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: v2 -name: postgres -description: Chart holder for argo-cd - -type: application -version: 12.1.13 -appVersion: "15.1.0" - -dependencies: -- name: postgresql - version: 12.1.13 - repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami diff --git a/argocd/applications/postgres/values.yaml b/argocd/applications/postgres/values.yaml deleted file mode 100644 index 8144052..0000000 --- a/argocd/applications/postgres/values.yaml +++ /dev/null @@ -1,19 +0,0 @@ -postgresql: - - fullnameOverride: postgresql-dsc - - auth: - # Credentials for Keycloak DB - username: keycloak - password: "" - enablePostgresUser: true - - # Credentials for postgres admin user - postgresPassword: "" - - # Init DB - primary: - initdb: - scripts: - create.sh: | - psql postgresql://postgres:${POSTGRES_PASSWORD}@localhost:5432 -c "CREATE DATABASE keycloak;" diff --git a/argocd/applications/tm-forum-api/Chart.yaml b/argocd/applications/tm-forum-api/Chart.yaml deleted file mode 100644 index 50760fb..0000000 --- a/argocd/applications/tm-forum-api/Chart.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: v2 -name: tm-forum-api -description: Chart holder for argo-cd - -type: application -version: 0.5.3 -appVersion: "0.13.2" - -dependencies: -- name: tm-forum-api - version: 0.5.3 - repository: https://fiware.github.io/helm-charts diff --git a/argocd/applications/tm-forum-api/values.yaml b/argocd/applications/tm-forum-api/values.yaml deleted file mode 100644 index 16c5cca..0000000 --- a/argocd/applications/tm-forum-api/values.yaml +++ /dev/null @@ -1,77 +0,0 @@ -tm-forum-api: - ## configuration to be used by every api-deployment if nothing specific is provided. - defaultConfig: - - # -- configuration to be used for the image of the container - image: - # -- repository to get the container from - #repository: quay.io/fiware - repository: quay.io/fiware - # -- tag to be used, most of the time the apis will use the same version - #tag: 0.8.1 - tag: 0.8.1 - # -- pull policy to be used - pullPolicy: IfNotPresent - - # -- ngsi-ld broker connection information - ngsiLd: - # -- timeout for requests ot the broker - readTimeout: 30s - # -- base path for the ngsi-ld api - path: ngsi-ld/v1 - # -- address of the broker - url: http://orion:1026 - - # enable the api proxy - apiProxy: - image: - tag: distroless-v1.27-latest - enabled: true - - # -- list of apis to be deployed - # -- every api needs to define a name and image. Basepath is required when routes or ingress will be enabled. Beside that, they can overwrite the default-config by using the same keys. - # -- be aware: when you change the image repositrory or the tag for an api, you have to provide both values for the changes to take effect - apis: - - name: party-catalog - image: tmforum-party-catalog - basePath: /tmf-api/party/v4 - - - name: customer-bill-management - image: tmforum-customer-bill-management - basePath: /tmf-api/customerBillManagement/v4 - - - name: customer-management - image: tmforum-customer-management - basePath: /tmf-api/customerManagement/v4 - - - name: product-catalog - image: tmforum-product-catalog - basePath: /tmf-api/productCatalogManagement/v4 - - - name: product-inventory - image: tmforum-product-inventory - basePath: /tmf-api/productInventory/v4 - - - name: product-ordering-management - image: tmforum-product-ordering-management - basePath: /tmf-api/productOrderingManagement/v4 - - - name: resource-catalog - image: tmforum-resource-catalog - basePath: /tmf-api/resourceCatalog/v4 - - - name: resource-function-activation - image: tmforum-resource-function-activation - basePath: /tmf-api/resourceFunctionActivation/v4 - - - name: resource-inventory - image: tmforum-resource-inventory - basePath: /tmf-api/resourceInventoryManagement/v4 - - - name: service-catalog - image: tmforum-service-catalog - basePath: /tmf-api/serviceCatalogManagement/v4 - - # redis caching - redis: - enabled: false diff --git a/argocd/applications/trusted-issuers-list/Chart.yaml b/argocd/applications/trusted-issuers-list/Chart.yaml deleted file mode 100644 index 7d992f0..0000000 --- a/argocd/applications/trusted-issuers-list/Chart.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: v2 -name: trusted-issuers-list -description: Chart holder for argo-cd - -type: application -version: 0.5.3 -appVersion: "0.0.3" - -dependencies: - - name: trusted-issuers-list - version: 0.5.3 - repository: https://fiware.github.io/helm-charts diff --git a/argocd/applications/trusted-issuers-list/values.yaml b/argocd/applications/trusted-issuers-list/values.yaml deleted file mode 100644 index b43751e..0000000 --- a/argocd/applications/trusted-issuers-list/values.yaml +++ /dev/null @@ -1,28 +0,0 @@ -trusted-issuers-list: - - # Image - deployment: - image: - tag: 0.0.3 - - # Configure an Ingress or OpenShift Route - ingress: - til: - enabled: false - tir: - enabled: false - route: - til: - enabled: false - tir: - enabled: false - - # Database config - database: - persistence: true - host: mysql-dsc - name: til - - # Should use Secret in production environment - username: root - password: "" diff --git a/argocd/applications/vcwaltid/Chart.yaml b/argocd/applications/vcwaltid/Chart.yaml deleted file mode 100644 index 8bcad5e..0000000 --- a/argocd/applications/vcwaltid/Chart.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: v2 -name: vcwaltid -description: Chart holder for argo-cd - -type: application -version: 0.0.17 -appVersion: "0.0.1" - -dependencies: - - name: vcwaltid - version: 0.0.17 - repository: https://i4trust.github.io/helm-charts diff --git a/argocd/applications/vcwaltid/templates/_helpers.tpl b/argocd/applications/vcwaltid/templates/_helpers.tpl deleted file mode 100644 index 47c22ae..0000000 --- a/argocd/applications/vcwaltid/templates/_helpers.tpl +++ /dev/null @@ -1,52 +0,0 @@ -{{/* -Expand the name of the chart. -*/}} -{{- define "waltid.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -If release name contains chart name it will be used as a full name. -*/}} -{{- define "waltid.fullname" -}} -{{- if .Values.fullnameOverride }} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- $name := default .Chart.Name .Values.nameOverride }} -{{- if contains $name .Release.Name }} -{{- .Release.Name | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} -{{- end }} -{{- end }} -{{- end }} - -{{/* -Create chart name and version as used by the chart label. -*/}} -{{- define "waltid.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Common labels -*/}} -{{- define "waltid.labels" -}} -helm.sh/chart: {{ include "waltid.chart" . }} -{{ include "waltid.selectorLabels" . }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -app: {{ include "waltid.name" . }} -{{- end }} - -{{/* -Selector labels -*/}} -{{- define "waltid.selectorLabels" -}} -app.kubernetes.io/name: {{ include "waltid.name" . }} -app.kubernetes.io/instance: {{ .Release.Name }} -{{- end }} diff --git a/argocd/applications/vcwaltid/templates/certificate.yaml b/argocd/applications/vcwaltid/templates/certificate.yaml deleted file mode 100644 index 6d9b131..0000000 --- a/argocd/applications/vcwaltid/templates/certificate.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if .Values.route.certificate -}} -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: {{ include "waltid.fullname" . }} - labels: - {{ include "waltid.labels" . | nindent 4 }} -spec: - secretName: {{ include "waltid.fullname" . }}-tls-sec - issuerRef: - {{- toYaml .Values.route.certificate.issuer | nindent 4 }} - commonName: {{ .Values.route.host }} - dnsNames: - - {{ .Values.route.host }} -{{- end -}} diff --git a/argocd/applications/vcwaltid/templates/deployment.yaml b/argocd/applications/vcwaltid/templates/deployment.yaml deleted file mode 100644 index 6cac782..0000000 --- a/argocd/applications/vcwaltid/templates/deployment.yaml +++ /dev/null @@ -1,39 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ include "waltid.fullname" . }}-certs - labels: - app.kubernetes.io/name: {{ include "waltid.name" . }}-certs - app.kubernetes.io/instance: {{ .Release.Name }} -spec: - replicas: 1 - revisionHistoryLimit: 3 - selector: - matchLabels: - app.kubernetes.io/name: {{ include "waltid.name" . }}-certs - app.kubernetes.io/instance: {{ .Release.Name }} - template: - metadata: - labels: - app.kubernetes.io/name: {{ include "waltid.name" . }}-certs - app.kubernetes.io/instance: {{ .Release.Name }} - spec: - serviceAccountName: default - containers: - - name: {{ .Chart.Name }} - imagePullPolicy: Always - image: "lipanski/docker-static-website:2.1.0" - ports: - - name: http - containerPort: 3000 - protocol: TCP - volumeMounts: - - name: certs - mountPath: /home/static/certs - volumes: - - name: certs - secret: - secretName: {{ include "waltid.fullname" . }}-tls-sec - items: - - key: tls.crt - path: tls.crt diff --git a/argocd/applications/vcwaltid/templates/ingress-certs.yaml b/argocd/applications/vcwaltid/templates/ingress-certs.yaml deleted file mode 100644 index 2eb4638..0000000 --- a/argocd/applications/vcwaltid/templates/ingress-certs.yaml +++ /dev/null @@ -1,32 +0,0 @@ -{{- if .Values.ingress.enabled -}} -{{- $fullName := include "waltid.fullname" . -}} -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: {{ include "waltid.fullname" . }}-certs - labels: - {{ include "waltid.labels" . | nindent 4 }} - annotations: - {{- with .Values.ingress.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - ingressClassName: {{ .Values.ingress.class}} - rules: - - host: {{ .Values.ingress.host}} - http: - paths: - - pathType: Prefix - path: "/certs" - backend: - service: - name: {{ include "waltid.fullname" . }}-certs - port: - number: 3000 - {{- if .Values.ingress.tls.enabled }} - tls: - - hosts: - - {{ .Values.ingress.host}} - secretName: {{ include "waltid.fullname" . }}-tls-sec - {{- end }} -{{- end }} diff --git a/argocd/applications/vcwaltid/templates/ingress.yaml b/argocd/applications/vcwaltid/templates/ingress.yaml deleted file mode 100644 index 8a67803..0000000 --- a/argocd/applications/vcwaltid/templates/ingress.yaml +++ /dev/null @@ -1,33 +0,0 @@ -{{- if .Values.ingress.enabled -}} -{{- $fullName := include "waltid.fullname" . -}} -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: {{ include "waltid.fullname" . }} - labels: - {{ include "waltid.labels" . | nindent 4 }} - annotations: - nginx.ingress.kubernetes.io/rewrite-target: /v1/did/{{ .Values.did }} - {{- with .Values.ingress.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - ingressClassName: {{ .Values.ingress.class}} - rules: - - host: {{ .Values.ingress.host}} - http: - paths: - - pathType: Prefix - path: "/did/did.json" - backend: - service: - name: {{ $fullName }} - port: - number: 7000 - {{- if .Values.ingress.tls.enabled }} - tls: - - hosts: - - {{ .Values.ingress.host}} - secretName: {{ include "waltid.fullname" . }}-tls-sec - {{- end }} -{{- end }} diff --git a/argocd/applications/vcwaltid/templates/route-certs.yaml b/argocd/applications/vcwaltid/templates/route-certs.yaml deleted file mode 100644 index 6c3947f..0000000 --- a/argocd/applications/vcwaltid/templates/route-certs.yaml +++ /dev/null @@ -1,28 +0,0 @@ -{{- if .Values.route.enabled -}} -{{- $fullName := include "waltid.fullname" . -}} -apiVersion: route.openshift.io/v1 -kind: Route -metadata: - name: {{ include "waltid.fullname" . }}-certs - labels: - {{ include "waltid.labels" . | nindent 4 }} - annotations: - cert-utils-operator.redhat-cop.io/certs-from-secret: {{ include "waltid.fullname" . }}-tls-sec - {{- with .Values.route.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - host: {{ .Values.route.host}} - path: /certs - port: - targetPort: 3000 - to: - kind: Service - name: {{ include "waltid.fullname" . }}-certs - {{- if .Values.route.tls }} - tls: - {{- with .Values.route.tls }} - {{- toYaml . | nindent 4 }} - {{- end }} - {{- end }} -{{- end }} diff --git a/argocd/applications/vcwaltid/templates/route.yaml b/argocd/applications/vcwaltid/templates/route.yaml deleted file mode 100644 index 1772379..0000000 --- a/argocd/applications/vcwaltid/templates/route.yaml +++ /dev/null @@ -1,29 +0,0 @@ -{{- if .Values.route.enabled -}} -{{- $fullName := include "waltid.fullname" . -}} -apiVersion: route.openshift.io/v1 -kind: Route -metadata: - name: {{ include "waltid.fullname" . }} - labels: - {{ include "waltid.labels" . | nindent 4 }} - annotations: - haproxy.router.openshift.io/rewrite-target: /v1/did/{{ .Values.did }} - cert-utils-operator.redhat-cop.io/certs-from-secret: {{ include "waltid.fullname" . }}-tls-sec - {{- with .Values.route.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - host: {{ .Values.route.host}} - path: /did/did.json - port: - targetPort: 7000 - to: - kind: Service - name: {{ $fullName }} - {{- if .Values.route.tls }} - tls: - {{- with .Values.route.tls }} - {{- toYaml . | nindent 4 }} - {{- end }} - {{- end }} -{{- end }} diff --git a/argocd/applications/vcwaltid/templates/service.yaml b/argocd/applications/vcwaltid/templates/service.yaml deleted file mode 100644 index a50ca54..0000000 --- a/argocd/applications/vcwaltid/templates/service.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{ include "waltid.fullname" . }}-certs - labels: - {{ include "waltid.labels" . | nindent 4 }} -spec: - type: ClusterIP - ports: - - port: 3000 - targetPort: 3000 - protocol: TCP - name: http - selector: - app.kubernetes.io/name: {{ include "waltid.name" . }}-certs - app.kubernetes.io/instance: {{ .Release.Name }} diff --git a/argocd/applications/vcwaltid/values.yaml b/argocd/applications/vcwaltid/values.yaml deleted file mode 100644 index 5bd498b..0000000 --- a/argocd/applications/vcwaltid/values.yaml +++ /dev/null @@ -1,69 +0,0 @@ -# Organisation DID -did: did:web:my-did:did - -# Networking -route: - enabled: false -ingress: - enabled: false - class: nginx - -# Walt-id config -vcwaltid: - - # Image - deployment: - image: - repository: quay.io/fiware/waltid - tag: 1.14.1-SNAPSHOT - pullPolicy: Always - - # API config - api: - core: - enabled: true - auditor: - enabled: true - signatory: - enabled: true - custodian: - enabled: true - essif: - enabled: true - - # Persistence - persistence: - enabled: true - pvc: - size: 1Gi - - # List of templates to be created - templates: - GaiaXParticipantCredential.json: | - { - "@context": [ - "https://www.w3.org/2018/credentials/v1", - "https://registry.lab.dsba.eu/development/api/trusted-shape-registry/v1/shapes/jsonld/trustframework#" - ], - "type": [ - "VerifiableCredential" - ], - "id": "did:web:raw.githubusercontent.com:egavard:payload-sign:master", - "issuer": "did:web:raw.githubusercontent.com:egavard:payload-sign:master", - "issuanceDate": "2023-03-21T12:00:00.148Z", - "credentialSubject": { - "id": "did:web:raw.githubusercontent.com:egavard:payload-sign:master", - "type": "gx:LegalParticipant", - "gx:legalName": "dsba compliant participant", - "gx:legalRegistrationNumber": { - "gx:vatID": "MYVATID" - }, - "gx:headquarterAddress": { - "gx:countrySubdivisionCode": "BE-BRU" - }, - "gx:legalAddress": { - "gx:countrySubdivisionCode": "BE-BRU" - }, - "gx-terms-and-conditions:gaiaxTermsAndConditions": "70c1d713215f95191a11d38fe2341faed27d19e083917bc8732ca4fea4976700" - } - } diff --git a/argocd/applications/verifier/Chart.yaml b/argocd/applications/verifier/Chart.yaml deleted file mode 100644 index c60f575..0000000 --- a/argocd/applications/verifier/Chart.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: v2 -name: verifier -description: Chart holder for argo-cd - -type: application -version: 1.0.22 -appVersion: "4.0.0" - -dependencies: - - name: vcverifier - version: 1.0.22 - repository: https://i4trust.github.io/helm-charts diff --git a/argocd/applications/verifier/values.yaml b/argocd/applications/verifier/values.yaml deleted file mode 100644 index 96f68d6..0000000 --- a/argocd/applications/verifier/values.yaml +++ /dev/null @@ -1,39 +0,0 @@ -vcverifier: - - deployment: - - # Image - image: - repository: quay.io/fiware/vcverifier - tag: 4.0.1 - pullPolicy: Always - - # Logging - logging: - level: DEBUG - pathsToSkip: - - "/health" - - # Server config - #server: - # # Place external host here when publishing verifier with public URL - # host: https://verifier.my-url.com - - # Walt-id config - ssikit: - auditorUrl: http://vcwaltid:7003 - - # Verifier config - verifier: - # URL endpoint of data space trusted issuers registry - tirAddress: https://tir.dataspace.com/v3/issuers - # DID of organisation - did: did:web:my-did:did - - # M2M config - m2m: - authEnabled: false - - # Config service - configRepo: - configEndpoint: http://ccs-credentials-config-service:8080/ diff --git a/argocd/data-space-connector/Chart.yaml b/argocd/data-space-connector/Chart.yaml deleted file mode 100644 index 616910f..0000000 --- a/argocd/data-space-connector/Chart.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: v2 -name: data-space-connector -description: Helm chart to deploy the FIWARE Data Space Connector -type: application -version: 1.0.0 -maintainers: - - name: Dennis Wendland - email: dennis.wendland@fiware.org - - name: Stefan Wiedemann - email: stefan.wiedemann@fiware.org -dependencies: [] \ No newline at end of file diff --git a/argocd/data-space-connector/templates/_helpers.tpl b/argocd/data-space-connector/templates/_helpers.tpl deleted file mode 100644 index c115ec6..0000000 --- a/argocd/data-space-connector/templates/_helpers.tpl +++ /dev/null @@ -1,4 +0,0 @@ -{{/* vim: set filetype=mustache: */}} - -{{- define "platform" -}} -{{- end -}} diff --git a/argocd/data-space-connector/templates/argo-application.yaml b/argocd/data-space-connector/templates/argo-application.yaml deleted file mode 100644 index 0150df8..0000000 --- a/argocd/data-space-connector/templates/argo-application.yaml +++ /dev/null @@ -1,115 +0,0 @@ -{{- if .Values.argoApplications }} -{{- if .Values.applications }} -{{- $secrets := .Values.secretsEnabled }} -{{- $release := .Values.release }} -{{- $source := .Values.source }} -{{- $team := .Values.team }} -{{- $participant := .Values.participant }} -{{- $host := .Values.host }} -{{- $tlsSecret := .Values.tlsSecret }} -{{- $argoNamespace := .Values.argoNamespace -}} -{{- range $app := .Values.applications }} -{{- if $app.source }} -{{- $source = $app.source }} -{{- end }} -{{- if $app.enabled }} ---- -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - finalizers: - - resources-finalizer.argocd.argoproj.io -{{- if or (eq $release "ci-cd") (eq $release "cluster-ops") (eq $release "pm") }} - name: {{ .name }} -{{- else }} - name: {{ $release }}-{{ .name }} -{{- end }} -{{- if $argoNamespace }} - namespace: {{ $argoNamespace }} -{{- end }} - labels: - destination-namespace: {{ .destination }} - purpose: {{ .purpose }} - participant: {{ $participant }} -{{- if .values }} -{{- if .values.fullnameOverride }} -{{- if contains .values.fullnameOverride .name }} - app.kubernetes.io/instance: {{ .values.fullnameOverride }} -{{- end }} -{{- else }} - app.kubernetes.io/instance: {{ .name }} -{{- end }} -{{- end }} -spec: - destination: - namespace: {{ .destination | default (printf "%s-%s" $team $release) }} - server: {{ .cluster_api | default "https://kubernetes.default.svc" }} - project: {{ .project | default "default" }} - source: -{{- if or .helm_values .values }} - helm: -{{- if .helm_values }} - valueFiles: -{{- toYaml .helm_values | nindent 8 }} -{{- if $app.secretsReady }} -{{- if $secrets }} - - values-secured.yaml -{{- else }} - - values-unsecured.yaml -{{- end }} -{{- end }} -{{- end }} -{{- if or (.values) ($host) ($tlsSecret) (.overwriteHost) (.overwriteSecret) }} - values: | -{{- if or ($host) ($tlsSecret) (.overwriteHost) (.overwriteSecret) }} - route: -{{- if .overwriteSecret }} - annotations: - cert-utils-operator.redhat-cop.io/certs-from-secret: {{ .overwriteSecret }} -{{- else if ($tlsSecret) }} - annotations: - cert-utils-operator.redhat-cop.io/certs-from-secret: {{ $tlsSecret }} -{{- end }} -{{- if .overwriteHost }} - host: {{ .overwriteHost }} -{{- else if ($host) }} - host: {{ .name }}.{{ $host }} -{{- end }} -{{- end }} -{{- if (.values) }} -{{- toYaml .values | nindent 8 }} -{{- end }} -{{- end }} -{{- if or .releaseName .name }} - releaseName: {{ .releaseName | default .name }} -{{- end }} -{{- end }} - {{- if .source_path }} - path: {{ .source_path | default "." }} - {{- end }} - repoURL: {{ $source }} - targetRevision: {{ .source_ref | default "main" | quote }} - {{- if not .source_path }} - chart: {{ .chart_name | default .name }} - {{- end }} - syncPolicy: - automated: - prune: true - selfHeal: true - syncOptions: - - Validate=true - ignoreDifferences: - - group: apps - kind: Deployment - jsonPointers: - - /spec/replicas - - /spec/template/spec/containers/0/image - - /spec/template/spec/containers/1/image - - group: integreatly.org - kind: GrafanaDataSource - jsonPointers: - - /spec/datasources/0/secureJsonData/httpHeaderValue1 -{{- end }} -{{- end }} -{{- end }} -{{- end }} diff --git a/argocd/data-space-connector/values.yaml b/argocd/data-space-connector/values.yaml deleted file mode 100644 index 764cc3c..0000000 --- a/argocd/data-space-connector/values.yaml +++ /dev/null @@ -1,133 +0,0 @@ -# should argo-cd applications be created? -argoApplications: true -source: https://github.com/FIWARE-Ops/data-space-connector -release: demo -destination_namespace: &destination dsc-demo -purpose: &purpose dsc-env -branch: &branch main -secretsEnabled: &secretsEnabled false -host: &host -tlsSecret: &tlsSecret -participant: my-provider - -applications: - - - name: mysql - enabled: true - source_path: argocd/applications/mysql - source_ref: *branch - destination: *destination - helm_values: - - values.yaml - - - name: mongodb - enabled: true - source_path: argocd/applications/mongodb - source_ref: *branch - destination: *destination - helm_values: - - values.yaml - - - name: postgres - enabled: true - source_path: argocd/applications/postgres - source_ref: *branch - destination: *destination - helm_values: - - values.yaml - - - name: orion - enabled: true - source_path: argocd/applications/orion-ld - source_ref: *branch - destination: *destination - helm_values: - - values.yaml - - - name: credentials-config-service - enabled: true - source_path: argocd/applications/credentials-config-service - source_ref: *branch - destination: *destination - helm_values: - - values.yaml - - - name: trusted-issuers-list - enabled: true - source_path: argocd/applications/trusted-issuers-list - source_ref: *branch - destination: *destination - helm_values: - - values.yaml - - - name: vcwaltid - enabled: true - source_path: argocd/applications/vcwaltid - source_ref: *branch - destination: *destination - helm_values: - - values.yaml - - - name: verifier - enabled: true - source_path: argocd/applications/verifier - source_ref: *branch - destination: *destination - helm_values: - - values.yaml - - - name: keycloak - enabled: true - source_path: argocd/applications/keycloak - source_ref: *branch - destination: *destination - helm_values: - - values.yaml - - - name: keyrock - enabled: true - source_path: argocd/applications/keyrock - source_ref: *branch - destination: *destination - helm_values: - - values.yaml - - - name: dsba-pdp - enabled: true - source_path: argocd/applications/dsba-pdp - source_ref: *branch - destination: *destination - helm_values: - - values.yaml - - - name: kong - enabled: true - source_path: argocd/applications/kong - source_ref: *branch - destination: *destination - helm_values: - - values.yaml - - - name: activation-service - enabled: true - source_path: argocd/applications/activation-service - source_ref: *branch - destination: *destination - helm_values: - - values.yaml - - - name: tm-forum-api - enabled: true - source_path: argocd/applications/tm-forum-api - source_ref: *branch - destination: *destination - helm_values: - - values.yaml - - - name: contract-management - enabled: true - source_path: argocd/applications/contract-management - source_ref: *branch - destination: *destination - helm_values: - - values.yaml diff --git a/examples/README.md b/examples/README.md index 745fec8..df5eb16 100644 --- a/examples/README.md +++ b/examples/README.md @@ -44,6 +44,8 @@ The deployment is performed via The configuration can be found at the [fiware-gitops repository](https://github.com/FIWARE-Ops/fiware-gitops/tree/master/aws/dsba/packet-delivery/data-space-connector). +**Note,** that this is currently being reworked and above repository does not contain the latest configuration. + From 92ad0c56108fd2614a4d6d0b0f502a32f7fc84b7 Mon Sep 17 00:00:00 2001 From: Dennis Wendland Date: Fri, 5 Jul 2024 12:30:35 +0200 Subject: [PATCH 2/3] Fix file name --- charts/data-space-connector/templates/dsconfig-cm.yaml | 2 +- k3s/provider.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/data-space-connector/templates/dsconfig-cm.yaml b/charts/data-space-connector/templates/dsconfig-cm.yaml index 3593403..8e85e20 100644 --- a/charts/data-space-connector/templates/dsconfig-cm.yaml +++ b/charts/data-space-connector/templates/dsconfig-cm.yaml @@ -7,7 +7,7 @@ metadata: labels: {{ include "dsc.labels" . | nindent 4 }} data: - data-space-configuration.yaml: |- + data-space-configuration.json: |- { "supported_models": {{ .Values.dataSpaceConfig.supportedModels | toJson }}, "supported_protocols": {{ .Values.dataSpaceConfig.supportedProtocols | toJson }}, diff --git a/k3s/provider.yaml b/k3s/provider.yaml index f256136..285716b 100644 --- a/k3s/provider.yaml +++ b/k3s/provider.yaml @@ -26,7 +26,7 @@ apisix: type: roundrobin plugins: proxy-rewrite: - uri: /.well-known/data-space-configuration/data-space-configuration.yaml + uri: /.well-known/data-space-configuration/data-space-configuration.json - uri: /* upstream: nodes: From dfcc36ff879aee66c90d4d2ffbfb590284442a70 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 5 Jul 2024 10:33:13 +0000 Subject: [PATCH 3/3] Update helm chart versions --- charts/data-space-connector/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/data-space-connector/Chart.yaml b/charts/data-space-connector/Chart.yaml index 3d7672e..ea2993a 100644 --- a/charts/data-space-connector/Chart.yaml +++ b/charts/data-space-connector/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: data-space-connector description: Umbrella Chart for the FIWARE Data Space Connector, combining all essential parts to be used by a participant. type: application -version: 5.3.0 +version: 5.4.0 dependencies: - name: postgresql condition: postgresql.enabled