diff --git a/INSTALL.md b/INSTALL.md index 16df571f..d17e9902 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -16,12 +16,6 @@ How to install application using helm:
These secrets should be defined in Hashicorp vault to keep them secure. secret: jwkSetUri: -> JWK Set URL - clientId: -> Custodian wallet client id - clientSecret: -> Custodian wallet client secret - authServerUrl: -> Keycloak URL - realm: -> Keycloak Realm - resource: -> Keycloak Resource - custodianWalletUri: -> Custodian wallet URI clearingHouseUri: -> Clearing House URI clearingHouseServerUrl: -> Clearing House server URL clearingHouseRealm: -> Realm for Clearing House diff --git a/README.md b/README.md index 36056415..b2f8bc93 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ further processing. ```shell Software version: 2.1.12 -Helm Chart version: 2.1.18 +Helm Chart version: 2.1.20 ``` @@ -173,12 +173,6 @@ app: durationDays: 90 schema2210Url: usersDetails: - custodianWallet: - #uri: https:///api - #serverUrl: https:///auth - #realm: - #clientId: - #clientSecret: clearingHouse: #uri: https:///api/credentials #serverUrl: https:///auth diff --git a/charts/sdfactory/Chart.yaml b/charts/sdfactory/Chart.yaml index 77333492..c66f6c6f 100644 --- a/charts/sdfactory/Chart.yaml +++ b/charts/sdfactory/Chart.yaml @@ -38,7 +38,7 @@ sources: # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: "2.1.19" +version: "2.1.20" # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/charts/sdfactory/README.md b/charts/sdfactory/README.md index 98ceba9c..22f30c82 100644 --- a/charts/sdfactory/README.md +++ b/charts/sdfactory/README.md @@ -1,6 +1,6 @@ # sdfactory -![Version: 2.1.19](https://img.shields.io/badge/Version-2.1.19-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.1.12](https://img.shields.io/badge/AppVersion-2.1.12-informational?style=flat-square) +![Version: 2.1.20](https://img.shields.io/badge/Version-2.1.20-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.1.12](https://img.shields.io/badge/AppVersion-2.1.12-informational?style=flat-square) Helm Charts for SD Factory application. Self-Description Factory component is responsible for the creation of Self Descriptions. @@ -42,18 +42,12 @@ Helm Charts for SD Factory application. Self-Description Factory component is re | resources.limits.memory | string | `"700Mi"` | set a maximum amount of allows memory utilization by specifying a limit on the container. | | resources.requests.cpu | string | `"300m"` | sets the minimum amount of CPU required for the container | | resources.requests.memory | string | `"700Mi"` | set a minimum amount of allows memory utilization by specifying a limit on the container. | -| sdfactory.secret.authServerUrl | string | `""` | Keycloak URL | | sdfactory.secret.clearingHouseClientId | string | `""` | Details for Clearing House Client ID | | sdfactory.secret.clearingHouseClientSecret | string | `""` | Details for Clearing House Client Secret | | sdfactory.secret.clearingHouseRealm | string | `""` | Details for Clearing House Realm | | sdfactory.secret.clearingHouseServerUrl | string | `""` | Details for Clearing House URL | | sdfactory.secret.clearingHouseUri | string | `""` | Details for Clearing House URI | -| sdfactory.secret.clientId | string | `""` | Custodian wallet client id | -| sdfactory.secret.clientSecret | string | `""` | Custodian wallet client secret | -| sdfactory.secret.custodianWalletUri | string | `""` | Details for Custodian wallet URI | | sdfactory.secret.jwkSetUri | string | `""` | JWK Set URI | -| sdfactory.secret.realm | string | `""` | Keycloak Realm detail | -| sdfactory.secret.resource | string | `""` | Keycloak Resource detail | | sdfactory.secret.verifycredentialsUri | string | `""` | Details for Verifying Client uri | | securityContext.allowPrivilegeEscalation | bool | `false` | | | securityContext.capabilities.drop[0] | string | `"ALL"` | | diff --git a/charts/sdfactory/templates/deployment.yaml b/charts/sdfactory/templates/deployment.yaml index 0593c835..fe16945d 100644 --- a/charts/sdfactory/templates/deployment.yaml +++ b/charts/sdfactory/templates/deployment.yaml @@ -63,31 +63,6 @@ spec: secretKeyRef: name: {{ include "sdfactory.applicationSecret.name" . }} key: jwk-set-uri - - name: APP_USERSDETAILS_CUSTODIANWALLET_CLIENTID - valueFrom: - secretKeyRef: - name: {{ include "sdfactory.applicationSecret.name" . }} - key: ClientID - - name: APP_USERSDETAILS_CUSTODIANWALLET_CLIENTSECRET - valueFrom: - secretKeyRef: - name: {{ include "sdfactory.applicationSecret.name" . }} - key: ClientSecret - - name: APP_USERSDETAILS_CUSTODIANWALLET_SERVERURL - valueFrom: - secretKeyRef: - name: {{ include "sdfactory.applicationSecret.name" . }} - key: auth-server-url - - name: APP_USERSDETAILS_CUSTODIANWALLET_URI - valueFrom: - secretKeyRef: - name: {{ include "sdfactory.applicationSecret.name" . }} - key: custodianWalletUri - - name: APP_USERSDETAILS_CUSTODIANWALLET_REALM - valueFrom: - secretKeyRef: - name: {{ include "sdfactory.applicationSecret.name" . }} - key: realm - name: APP_USERSDETAILS_CLEARINGHOUSE_URI valueFrom: secretKeyRef: diff --git a/charts/sdfactory/templates/secret.yaml b/charts/sdfactory/templates/secret.yaml index 0b930609..330ffacd 100644 --- a/charts/sdfactory/templates/secret.yaml +++ b/charts/sdfactory/templates/secret.yaml @@ -25,12 +25,6 @@ metadata: type: Opaque stringData: jwk-set-uri: {{ .Values.sdfactory.secret.jwkSetUri | default "https://jwk-set-uri" }} - ClientID: {{ .Values.sdfactory.secret.clientId | default (randAlphaNum 16) }} - ClientSecret: {{ .Values.sdfactory.secret.clientSecret | default (randAlphaNum 16) }} - auth-server-url: {{ .Values.sdfactory.secret.authServerUrl | default "https://auth" }} - realm: {{ .Values.sdfactory.secret.realm | default (printf "%s-%s" "realm" (randAlpha 6)) }} - resource: {{ .Values.sdfactory.secret.resource | default (printf "%s-%s" "resource" (randAlpha 5)) }} - custodianWalletUri: {{ .Values.sdfactory.secret.custodianWalletUri | default "https://custodianWalletUri" }} clearingHouse-uri: {{ .Values.sdfactory.secret.clearingHouseUri | default "https://clearingHouse-uri" }} clearingHouse-serverUrl: {{ .Values.sdfactory.secret.clearingHouseServerUrl | default "https://clearingHouse-serverUrl" }} clearingHouse-realm: {{ .Values.sdfactory.secret.clearingHouseRealm | default (printf "%s-%s" "realm" (randAlpha 6)) }} diff --git a/charts/sdfactory/values-beta.yaml b/charts/sdfactory/values-beta.yaml index 44a3f51e..078d085c 100644 --- a/charts/sdfactory/values-beta.yaml +++ b/charts/sdfactory/values-beta.yaml @@ -39,12 +39,6 @@ ingress: sdfactory: secret: jwkSetUri: "" - clientId: "" - clientSecret: "" - authServerUrl: "" - realm: "" - resource: "" - custodianWalletUri: "" clearingHouseUri: "" clearingHouseServerUrl: "" clearingHouseRealm: "" diff --git a/charts/sdfactory/values-dev.yaml b/charts/sdfactory/values-dev.yaml index 06b792a9..0d6812d0 100644 --- a/charts/sdfactory/values-dev.yaml +++ b/charts/sdfactory/values-dev.yaml @@ -39,12 +39,6 @@ ingress: sdfactory: secret: jwkSetUri: "" - clientId: "" - clientSecret: "" - authServerUrl: "" - realm: "" - resource: "" - custodianWalletUri: "" clearingHouseUri: "" clearingHouseServerUrl: "" clearingHouseRealm: "" diff --git a/charts/sdfactory/values-int.yaml b/charts/sdfactory/values-int.yaml index 5a764b54..6176059a 100644 --- a/charts/sdfactory/values-int.yaml +++ b/charts/sdfactory/values-int.yaml @@ -39,12 +39,6 @@ ingress: sdfactory: secret: jwkSetUri: "" - clientId: "" - clientSecret: "" - authServerUrl: "" - realm: "" - resource: "" - custodianWalletUri: "" clearingHouseUri: "" clearingHouseServerUrl: "" clearingHouseRealm: "" diff --git a/charts/sdfactory/values-pen.yaml b/charts/sdfactory/values-pen.yaml index 91ad0602..1349b9fe 100644 --- a/charts/sdfactory/values-pen.yaml +++ b/charts/sdfactory/values-pen.yaml @@ -39,12 +39,6 @@ ingress: sdfactory: secret: jwkSetUri: "" - clientId: "" - clientSecret: "" - authServerUrl: "" - realm: "" - resource: "" - custodianWalletUri: "" clearingHouseUri: "" clearingHouseServerUrl: "" clearingHouseRealm: "" diff --git a/charts/sdfactory/values-test.yaml b/charts/sdfactory/values-test.yaml index 9f177675..8590e47e 100644 --- a/charts/sdfactory/values-test.yaml +++ b/charts/sdfactory/values-test.yaml @@ -44,12 +44,6 @@ service: sdfactory: secret: jwkSetUri: "" - clientId: "" - clientSecret: "" - authServerUrl: "" - realm: "" - resource: "" - custodianWalletUri: "" clearingHouseUri: "" clearingHouseServerUrl: "" clearingHouseRealm: "" diff --git a/charts/sdfactory/values.yaml b/charts/sdfactory/values.yaml index 6f0e2688..33683019 100644 --- a/charts/sdfactory/values.yaml +++ b/charts/sdfactory/values.yaml @@ -65,18 +65,6 @@ sdfactory: secret: # -- JWK Set URI jwkSetUri: "" - # -- Custodian wallet client id - clientId: "" - # -- Custodian wallet client secret - clientSecret: "" - # -- Keycloak URL - authServerUrl: "" - # -- Keycloak Realm detail - realm: "" - # -- Keycloak Resource detail - resource: "" - # -- Details for Custodian wallet URI - custodianWalletUri: "" # -- Details for Clearing House URI clearingHouseUri: "" # -- Details for Clearing House URL