chore(helm): remove obsolete secrets (#173)

eclipse-tractusx · Jun 6, 2024 · 9df32d9 · 9df32d9
1 parent 0f0aea9
commit 9df32d9
Show file tree

Hide file tree

Showing 12 changed files with 3 additions and 94 deletions.
diff --git a/INSTALL.md b/INSTALL.md
@@ -16,12 +16,6 @@ How to install application using helm:  <br />
         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
@@ -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: <SCHEMA2210URL>
   usersDetails:
-    custodianWallet:
-    #uri: https://<example.com>/api
-    #serverUrl: https://<example.com>/auth
-    #realm: <REALM>
-    #clientId: <CLIENTID>
-    #clientSecret:
     clearingHouse:
     #uri: https://<example.com>/api/credentials
     #serverUrl: https://<example.com>/auth

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -39,12 +39,6 @@ ingress:
 sdfactory:
   secret:
     jwkSetUri: "<path:essential-services/data/custodian-beta#jwkSetUri>"
-    clientId: "<path:essential-services/data/custodian-beta#clientId>"
-    clientSecret: "<path:essential-services/data/custodian-beta#clientSecret>"
-    authServerUrl: "<path:essential-services/data/custodian-beta#auth-server-url>"
-    realm: "<path:essential-services/data/custodian-beta#realm>"
-    resource: "<path:essential-services/data/custodian-beta#resource>"
-    custodianWalletUri: "<path:essential-services/data/custodian-beta#uri>"
     clearingHouseUri: "<path:essential-services/data/custodian-beta#clearingHouse-uri>"
     clearingHouseServerUrl: "<path:essential-services/data/custodian-beta#clearingHouse-serverUrl>"
     clearingHouseRealm: "<path:essential-services/data/custodian-beta#clearingHouse-realm>"

diff --git a/charts/sdfactory/values-dev.yaml b/charts/sdfactory/values-dev.yaml
@@ -39,12 +39,6 @@ ingress:
 sdfactory:
   secret:
     jwkSetUri: "<path:essential-services/data/custodian-dev#jwkSetUri>"
-    clientId: "<path:essential-services/data/custodian-dev#clientId>"
-    clientSecret: "<path:essential-services/data/custodian-dev#clientSecret>"
-    authServerUrl: "<path:essential-services/data/custodian-dev#auth-server-url>"
-    realm: "<path:essential-services/data/custodian-dev#realm>"
-    resource: "<path:essential-services/data/custodian-dev#resource>"
-    custodianWalletUri: "<path:essential-services/data/custodian-dev#uri>"
     clearingHouseUri: "<path:essential-services/data/custodian-dev#clearingHouse-uri>"
     clearingHouseServerUrl: "<path:essential-services/data/custodian-dev#clearingHouse-serverUrl>"
     clearingHouseRealm: "<path:essential-services/data/custodian-dev#clearingHouse-realm>"

diff --git a/charts/sdfactory/values-int.yaml b/charts/sdfactory/values-int.yaml
@@ -39,12 +39,6 @@ ingress:
 sdfactory:
   secret:
     jwkSetUri: "<path:essential-services/data/custodian#jwkSetUri>"
-    clientId: "<path:essential-services/data/custodian#clientId>"
-    clientSecret: "<path:essential-services/data/custodian#clientSecret>"
-    authServerUrl: "<path:essential-services/data/custodian#auth-server-url>"
-    realm: "<path:essential-services/data/custodian#realm>"
-    resource: "<path:essential-services/data/custodian#resource>"
-    custodianWalletUri: "<path:essential-services/data/custodian#uri>"
     clearingHouseUri: "<path:essential-services/data/custodian#clearingHouse-uri>"
     clearingHouseServerUrl: "<path:essential-services/data/custodian#clearingHouse-serverUrl>"
     clearingHouseRealm: "<path:essential-services/data/custodian#clearingHouse-realm>"

diff --git a/charts/sdfactory/values-pen.yaml b/charts/sdfactory/values-pen.yaml
@@ -39,12 +39,6 @@ ingress:
 sdfactory:
   secret:
     jwkSetUri: "<path:essential-services/data/custodian-pen#jwkSetUri>"
-    clientId: "<path:essential-services/data/custodian-pen#clientId>"
-    clientSecret: "<path:essential-services/data/custodian-pen#clientSecret>"
-    authServerUrl: "<path:essential-services/data/custodian-pen#auth-server-url>"
-    realm: "<path:essential-services/data/custodian-pen#realm>"
-    resource: "<path:essential-services/data/custodian-pen#resource>"
-    custodianWalletUri: "<path:essential-services/data/custodian-pen#uri>"
     clearingHouseUri: "<path:essential-services/data/custodian-pen#clearingHouse-uri>"
     clearingHouseServerUrl: "<path:essential-services/data/custodian-pen#clearingHouse-serverUrl>"
     clearingHouseRealm: "<path:essential-services/data/custodian-pen#clearingHouse-realm>"

diff --git a/charts/sdfactory/values-test.yaml b/charts/sdfactory/values-test.yaml
@@ -44,12 +44,6 @@ service:
 sdfactory:
   secret:
     jwkSetUri: "<path:essential-services/data/custodian#jwkSetUri>"
-    clientId: "<path:essential-services/data/custodian#clientId>"
-    clientSecret: "<path:essential-services/data/custodian#clientSecret>"
-    authServerUrl: "<path:essential-services/data/custodian#auth-server-url>"
-    realm: "<path:essential-services/data/custodian#realm>"
-    resource: "<path:essential-services/data/custodian#resource>"
-    custodianWalletUri: "<path:essential-services/data/custodian#uri>"
     clearingHouseUri: "<path:essential-services/data/custodian#clearingHouse-uri>"
     clearingHouseServerUrl: "<path:essential-services/data/custodian#clearingHouse-serverUrl>"
     clearingHouseRealm: "<path:essential-services/data/custodian#clearingHouse-realm>"

diff --git 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