feat(charts):[#375] Improve name templating and cleanup

charts/connector/test-provider/values.yaml

@@ -4,172 +4,31 @@ configuration:
   authorityBPN: &authorityBPN BPNL000000000000
   edcKey: &edcKey TEST
 
-edc-provider:
-  tractusx-connector:
-    participant:
-      id:
-    controlplane:
-      ssi:
-        miw:
-          url:
-          authorityId:
-        oauth:
-          tokenurl:
-          client:
-            id:
-            secretAlias:
-      ingresses:
-        - enabled: true
-          hostname: "controlplane.test"
-          annotations:
-            nginx.ingress.kubernetes.io/ssl-passthrough: "false"
-            nginx.ingress.kubernetes.io/backend-protocol: "HTTP"
-            nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
-          endpoints:
-            - protocol
-            - management
-          tls:
-            enabled: true
-            secretName: tls-secret
-      endpoints:
-        management:
-          authKey: *edcKey
+# TODO DTR: add possibility to template hostname for dataSource.url SPRING_DATASOURCE_URL
+# TODO DTR: add possibility to configure external database
 
-    dataplane:
-      ingresses:
-        - enabled: true
-          hostname: "dataplane.test"
-          annotations:
-            nginx.ingress.kubernetes.io/ssl-passthrough: "false"
-            nginx.ingress.kubernetes.io/backend-protocol: "HTTP"
-            nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
-          endpoints:
-            - public
-          className: "nginx"
-          tls:
-            enabled: true
-            secretName: tls-secret
-
-    backendService:
-      httpProxyTokenReceiverUrl: "https://submodelserver.test/data/endpoint-data-reference-provider1"
-
-    vault:
-      hashicorp:
-        url:
-        token:
-        timeout: 30
-        healthCheck:
-          enabled: true
-          standbyOk: true
-        paths:
-          secret:
-          health:
-      secretNames:
-        transferProxyTokenSignerPrivateKey:
-        transferProxyTokenSignerPublicKey:
-        transferProxyTokenEncryptionAesKey:
-
-    postgresql:
-      jdbcUrl: "jdbc:postgresql://{{ .Release.Name }}-edc-postgresql-hl:5432/edc"
-      auth:
-        username: *postgresuser
-        password: *postgrespass
-      username: *postgresuser
-      password: *postgrespass
-  edc-postgresql:
-    primary:
-      persistence:
-        enabled: false
-      resources:
-        requests:
-          memory: 1Gi
-          cpu: 250m
-        limits:
-          memory: 1Gi
-          cpu: 1
-    auth:
-      database: edc
-      username: *postgresuser
-      postgresPassword: *postgrespass
-      password: *postgrespass
-
-digital-twin-registry:
-  nameOverride: digital-twin-registry
-  enablePostgres: true
-  registry:
-    host: digital-twin-registry.test
-    ingress:
-      enabled: true
-      urlPrefix: /semantics/registry
-      className: nginx
-      annotations:
-        cert-manager.io/cluster-issuer: selfsigned-cluster-issuer
-        nginx.ingress.kubernetes.io/rewrite-target: /$2
-        nginx.ingress.kubernetes.io/use-regex: "true"
-        nginx.ingress.kubernetes.io/enable-cors: "true"
-        nginx.ingress.kubernetes.io/cors-allow-credentials: "true"
-        nginx.ingress.kubernetes.io/x-forwarded-prefix: /semantics/registry
-    authentication: false
-    livenessProbe:
-      failureThreshold: 6
-      initialDelaySeconds: 30
-      periodSeconds: 10
-    readinessProbe:
-      failureThreshold: 6
-      initialDelaySeconds: 30
-      periodSeconds: 10
-
-  postgresql:
-    primary:
-      persistence:
-        enabled: false
-        size: 1Gi
-    auth:
-      username: *postgresuser
-      password: *postgrespass
-
-  enableKeycloak: false
-
-submodelservers:
-  ingress:
-    enabled: true
-    className: "nginx"
-    annotations:
-      nginx.ingress.kubernetes.io/ssl-passthrough: "false"
-      nginx.ingress.kubernetes.io/backend-protocol: "HTTP"
-      nginx.ingress.kubernetes.io/force-ssl-redirect: "false"
-    hosts:
-      - host: submodelserver.test
-        paths:
-          - path: /
-            pathType: ImplementationSpecific
-    tls:
-      - hosts:
-          - submodelserver.test
-        secretName: tls-secret
+nameOverride: ""
+fullnameOverride: ""
 
 tractusx-connector:
-  fullnameOverride: edc-provider
   install:
     postgresql: false
-    vault: true
+    vault: false
   participant:
-    id: DATAPROVIDER_1
-
+    id:
   controlplane:
-    # SSI configuration
     ssi:
       miw:
-        url: http://provider-managed-identity-wallet:8080
-        authorityId: *authorityBPN
+        url:
+        authorityId:
       oauth:
-        tokenurl: <path:traceability-irs/data/dev/controlplane#ssi.oauth.tokenurl>
+        tokenurl:
         client:
-          id: admin
-          secretAlias: edc-test-miw-keycloak-secret
+          id:
+          secretAlias:
     ingresses:
       - enabled: true
-        hostname: "edc-control.test"
+        hostname: "controlplane.test"
         annotations:
           nginx.ingress.kubernetes.io/ssl-passthrough: "false"
           nginx.ingress.kubernetes.io/backend-protocol: "HTTP"
@@ -180,79 +39,158 @@ tractusx-connector:
         tls:
           enabled: true
           secretName: tls-secret
-
     endpoints:
       management:
-        # -- authentication key, must be attached to each 'X-Api-Key' request header
-        authKey: TEST
+        authKey: *edcKey
+    securityContext:
+      readOnlyRootFilesystem: false
+    resources:
+      limits:
+        cpu: 500m
+        memory: 750Mi
+      requests:
+        cpu: 300m
+        memory: 750Mi
+
   dataplane:
     ingresses:
       - enabled: true
-        hostname: "edc-data.test"
+        hostname: "dataplane.test"
         annotations:
           nginx.ingress.kubernetes.io/ssl-passthrough: "false"
           nginx.ingress.kubernetes.io/backend-protocol: "HTTP"
           nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
         endpoints:
           - public
+        className: "nginx"
         tls:
           enabled: true
           secretName: tls-secret
+    resources:
+      limits:
+        cpu: 500m
+        memory: 512Mi
+      requests:
+        cpu: 200m
+        memory: 512Mi
 
   backendService:
-    httpProxyTokenReceiverUrl: "http://test"
-
-    # Files system has to be set to writeable for now since controlplane relies on temporary files to write SSI related things to
-    securityContext:
-      readOnlyRootFilesystem: false
+    httpProxyTokenReceiverUrl: "https://submodelserver.test/data/endpoint-data-reference-provider1"
   vault:
-    server:
-      ingress:
-        enabled: true
-        annotations:
-          kubernetes.io/ingress.class: nginx
-          kubernetes.io/tls-acme: "true"
-        ingressClassName: nginx
-        hosts:
-          - host: edc.vault.test
     hashicorp:
-      token: "root"
+      url:
+      token:
+      timeout: 30
+      healthCheck:
+        enabled: true
+        standbyOk: true
+      paths:
+        secret:
+        health:
     secretNames:
       transferProxyTokenSignerPrivateKey:
       transferProxyTokenSignerPublicKey:
       transferProxyTokenEncryptionAesKey:
 
   postgresql:
-    enabled: false
+    enabled: true
     auth:
+      database: "edc"
       username: *postgresuser
       password: *postgrespass
     username: *postgresuser
     password: *postgrespass
-    jdbcUrl: "jdbc:postgresql://{{ .Release.Name }}-edc-postgresql:5432/edc"
+    jdbcUrl: "jdbc:postgresql://{{ .Release.Name }}-edc-postgresql-hl:5432/edc"
 
 edc-postgresql:
-  auth:
-    database: "edc"
-    username: *postgresuser
-    password: *postgrespass
-  username: *postgresuser
-  password: *postgrespass
   primary:
     persistence:
       enabled: false
+      size: 1Gi
+  readReplicas:
+    persistence:
+      enabled: false
+    resources:
+      limits:
+        cpu: 500m
+        memory: 750Mi
+      requests:
+        cpu: 250m
+        memory: 750Mi
+  auth:
+    database: edc
+    username: *postgresuser
+    postgresPassword: *postgrespass
+    password: *postgrespass
+
+digital-twin-registry:
+  enableKeycloak: false
 
-managed-identity-wallet:
-  miw:
-    authorityWallet:
-      name: "AuthorityWallet"
-      bpn: *authorityBPN
-  keycloak:
-    enabled: false
-    auth:
-      adminUser: admin
-      adminPassword: admin
   postgresql:
-    auth:
-      password: ""
-      database: "miw_app"
+    primary:
+      persistence:
+        enabled: false
+        size: 1Gi
+      resources:
+        limits:
+          cpu: 500m
+          memory: 750Mi
+        requests:
+          cpu: 200m
+          memory: 750Mi
+
+  registry:
+    host: digital-twin-registry.test
+    ingress:
+      enabled: true
+      urlPrefix: /semantics/registry
+      className: nginx
+      tls: true
+      annotations:
+        cert-manager.io/cluster-issuer: selfsigned-cluster-issuer
+        nginx.ingress.kubernetes.io/rewrite-target: /$2
+        nginx.ingress.kubernetes.io/use-regex: "true"
+        nginx.ingress.kubernetes.io/enable-cors: "true"
+        nginx.ingress.kubernetes.io/cors-allow-credentials: "true"
+        nginx.ingress.kubernetes.io/x-forwarded-prefix: /semantics/registry
+    authentication: false
+    livenessProbe:
+      failureThreshold: 6
+      initialDelaySeconds: 30
+      periodSeconds: 10
+    readinessProbe:
+      failureThreshold: 6
+      initialDelaySeconds: 30
+      periodSeconds: 10
+    resources:
+      limits:
+        cpu: 500m
+        memory: 750Mi
+      requests:
+        cpu: 250m
+        memory: 750Mi
+
+submodelservers:
+  ingress:
+    enabled: true
+    className: "nginx"
+    annotations:
+      nginx.ingress.kubernetes.io/ssl-passthrough: "false"
+      nginx.ingress.kubernetes.io/backend-protocol: "HTTP"
+      nginx.ingress.kubernetes.io/force-ssl-redirect: "false"
+    hosts:
+      - host: submodelserver.test
+        paths:
+          - path: /
+            pathType: ImplementationSpecific
+    tls:
+      - hosts:
+          - submodelserver.test
+        secretName: tls-secret
+  resources:
+    limits:
+      cpu: 250m
+      memory: 512Mi
+    requests:
+      cpu: 50m
+      memory: 512Mi