Merge pull request #413 from eclipse-tractusx/hotfix/catenax-ng-ref

Hotfix/catenax-ng-ref: Removed Catena-X NG repository references

Author: matbmoser

CHANGELOG.md

@@ -27,6 +27,13 @@ The changelog format is based on [Keep a Changelog](https://keepachangelog.com/e
 
 ## [Unreleased]
 
+## Added
+- Substituted the old data-service that was pointing to the Catena-X NG at Home repo to the new tx umbrella simple data service
+
+## Deleted
+- Removed all the catena-x ng references from the documentation
+
+
 ## [released]
 ## [v4.0.1] - 24-07-2024
 

INSTALL.md

@@ -210,7 +210,7 @@ The following environment variables must be set in [build and deploy](./dpp-fron
 ../buildAndDeploy.sh consumer-frontend
 ```
 
-You can run the application in docker container with existing image `ghcr.io/catenax-ng/tx-digital-product-pass/digital-product-pass-frontend:latest` from GitHub packages. You need to update the [build and deploy](./buildAndDeploy.sh) script.
+You can run the application in docker container with existing image `docker.io/tractusx/digital-product-pass-frontend:latest` from GitHub packages. You need to update the [build and deploy](./buildAndDeploy.sh) script.
 
 The consumer frontend is available in browser at [http://localhost:8080](http://localhost:8080)
 

charts/digital-product-pass/Chart.yaml

@@ -43,7 +43,7 @@ type: application
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
 
-version: 4.0.1
+version: 4.0.2
 
 # 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

charts/digital-product-pass/values.yaml

@@ -388,7 +388,6 @@ oauth:
     header: "X-Api-Key"
     secret: "<api-key>"
 
-# Following Catena-X Helm Best Practices @url: https://catenax-ng.github.io/docs/kubernetes-basics/helm
 # @url: https://cloud.google.com/blog/products/containers-kubernetes/kubernetes-best-practices-resource-requests-and-limits
 resources:
   limits:

deployment/infrastructure/data-provider/data-service/Chart.yaml

@@ -24,9 +24,8 @@
 #################################################################################
 ---
 apiVersion: v2
-name: data-service
-description: >-
-  The Eclipse Dataspace Connector requires the Backend Application to transfer data using the HTTP-TransferMethod.
+name: simple-data-backend
+description: A Helm chart for Kubernetes
 
 # A chart can be either an 'application' or a 'library' chart.
 #
@@ -41,10 +40,18 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.0.1
+version: 0.1.0
 
 # 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
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
 appVersion: "0.0.1"
+
+
+dependencies:
+  - name: "simple-data-backend"
+    repository: https://eclipse-tractusx.github.io/charts/dev
+    alias: simple-data-backend
+    version: 0.1.0
+    condition: enabled

deployment/infrastructure/data-provider/data-service/README.md

@@ -1,74 +1,58 @@
-<!--
-#######################################################################
+# simple-data-backend
 
-Tractus-X - Digital Product Pass Application 
+![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.0.1](https://img.shields.io/badge/AppVersion-0.0.1-informational?style=flat-square)
 
-Copyright (c) 2022, 2024 BMW AG
-Copyright (c) 2022, 2024 Henkel AG & Co. KGaA
-Copyright (c) 2023, 2024 CGI Deutschland B.V. & Co. KG
-Copyright (c) 2023, 2024 Contributors to the Eclipse Foundation
+A Helm chart for Kubernetes
 
-See the NOTICE file(s) distributed with this work for additional
-information regarding copyright ownership.
+## Requirements
 
-This work is made available under the terms of the
-Creative Commons Attribution 4.0 International (CC-BY-4.0) license,
-which is available at
-https://creativecommons.org/licenses/by/4.0/legalcode.
-
-SPDX-License-Identifier: CC-BY-4.0
-
-#######################################################################
--->
-
-# data-service
-
-![Version: 0.0.1](https://img.shields.io/badge/Version-0.0.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.0.1](https://img.shields.io/badge/AppVersion-0.0.1-informational?style=flat-square)
-
-The Eclipse Dataspace Connector requires the Backend Application to transfer data using the HTTP-TransferMethod.
+| Repository | Name | Version |
+|------------|------|---------|
+| https://eclipse-tractusx.github.io/charts/dev | simple-data-backend(simple-data-backend) | 0.1.0 |
 
 ## Values
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| affinity | object | `{}` |  |
-| container.port | int | `80` |  |
-| fullnameOverride | string | `"data-service"` | Overrides the releases full name |
-| image.command | string | `""` |  |
-| image.pullPolicy | string | `"IfNotPresent"` | [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) to use |
-| image.repository | string | `"ghcr.io/catenax-ng/catenax-at-home/provider-backend-service"` | Which container image to use |
-| image.tag | string | `"0.0.1"` | Overrides the image tag whose default is the chart appVersion |
-| imagePullSecrets | list | `[]` |  |
-| ingress.annotations."nginx.ingress.kubernetes.io/backend-protocol" | string | `"HTTP"` |  |
-| ingress.annotations."nginx.ingress.kubernetes.io/force-ssl-redirect" | string | `"true"` |  |
-| ingress.annotations."nginx.ingress.kubernetes.io/rewrite-target" | string | `"/$2"` |  |
-| ingress.annotations."nginx.ingress.kubernetes.io/ssl-passthrough" | string | `"false"` |  |
-| ingress.className | string | `"nginx"` |  |
-| ingress.enabled | bool | `true` |  |
-| ingress.hosts[0].host | string | `"materialpass.int.demo.catena-x.net"` |  |
-| ingress.hosts[0].paths[0].path | string | `"/provider_backend(/|$)(.*)"` |  |
-| ingress.hosts[0].paths[0].pathType | string | `"Prefix"` |  |
-| ingress.tls[0].hosts[0] | string | `"materialpass.int.demo.catena-x.net"` |  |
-| ingress.tls[0].secretName | string | `"tls-secret"` |  |
-| livenessProbe | object | `{}` |  |
-| nameOverride | string | `""` | Overrides the charts name |
-| nodeSelector | object | `{}` |  |
-| podAnnotations | object | `{}` | additional annotations for the pod |
-| podSecurityContext.fsGroup | int | `10001` | The owner for volumes and any files created within volumes will belong to this guid |
-| podSecurityContext.runAsGroup | int | `10001` | Processes within a pod will belong to this guid |
-| podSecurityContext.runAsUser | int | `10001` | Runs all processes within a pod with a special uid |
-| podSecurityContext.seccompProfile.type | string | `"RuntimeDefault"` | Restrict a Container's Syscalls with seccomp |
-| readinessProbe | object | `{}` |  |
-| replicaCount | int | `1` |  |
-| securityContext.allowPrivilegeEscalation | bool | `false` | Controls [Privilege Escalation](https://kubernetes.io/docs/concepts/security/pod-security-policy/#privilege-escalation) enabling setuid binaries changing the effective user ID |
-| securityContext.capabilities.add | list | `[]` | Specifies which capabilities to add to issue specialized syscalls |
-| securityContext.capabilities.drop | list | `["ALL"]` | Specifies which capabilities to drop to reduce syscall attack surface |
-| securityContext.readOnlyRootFilesystem | bool | `true` | Whether the root filesystem is mounted in read-only mode |
-| securityContext.runAsNonRoot | bool | `true` | Requires the container to run without root privileges |
-| securityContext.runAsUser | int | `10001` | The container's process will run with the specified uid |
-| service.port | int | `8080` | [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#defining-a-service) to expose the running application on a set of Pods as a network service. |
-| service.type | string | `"ClusterIP"` | [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service. |
-| tolerations | list | `[]` |  |
+| simple-data-backend.affinity | object | `{}` |  |
+| simple-data-backend.autoscaling.enabled | bool | `false` |  |
+| simple-data-backend.autoscaling.maxReplicas | int | `100` |  |
+| simple-data-backend.autoscaling.minReplicas | int | `1` |  |
+| simple-data-backend.autoscaling.targetCPUUtilizationPercentage | int | `80` |  |
+| simple-data-backend.fullnameOverride | string | `"simple-data-backend"` |  |
+| simple-data-backend.image.pullPolicy | string | `"IfNotPresent"` |  |
+| simple-data-backend.image.repository | string | `"tractusx/simple-data-backend"` |  |
+| simple-data-backend.image.tag | string | `"latest"` |  |
+| simple-data-backend.imagePullSecrets | list | `[]` |  |
+| simple-data-backend.ingress.annotations."nginx.ingress.kubernetes.io/backend-protocol" | string | `"HTTP"` |  |
+| simple-data-backend.ingress.annotations."nginx.ingress.kubernetes.io/force-ssl-redirect" | string | `"true"` |  |
+| simple-data-backend.ingress.annotations."nginx.ingress.kubernetes.io/rewrite-target" | string | `"/$2"` |  |
+| simple-data-backend.ingress.annotations."nginx.ingress.kubernetes.io/ssl-passthrough" | string | `"false"` |  |
+| simple-data-backend.ingress.className | string | `"nginx"` |  |
+| simple-data-backend.ingress.enabled | bool | `true` |  |
+| simple-data-backend.ingress.hosts[0].host | string | `"tx-dpp.int.catena-x.net"` |  |
+| simple-data-backend.ingress.hosts[0].paths[0].path | string | `"/data-service(/|$)(.*)"` |  |
+| simple-data-backend.ingress.hosts[0].paths[0].pathType | string | `"Prefix"` |  |
+| simple-data-backend.ingress.tls[0].hosts[0] | string | `"tx-dpp.int.catena-x.net"` |  |
+| simple-data-backend.ingress.tls[0].secretName | string | `"tls-secret"` |  |
+| simple-data-backend.livenessProbe | object | `{}` |  |
+| simple-data-backend.nameOverride | string | `"simple-data-backend"` |  |
+| simple-data-backend.nodeSelector | object | `{}` |  |
+| simple-data-backend.podAnnotations | object | `{}` |  |
+| simple-data-backend.podSecurityContext | object | `{}` |  |
+| simple-data-backend.readinessProbe | object | `{}` |  |
+| simple-data-backend.replicaCount | int | `1` |  |
+| simple-data-backend.resources.limits.cpu | string | `"250m"` |  |
+| simple-data-backend.resources.limits.memory | string | `"512Mi"` |  |
+| simple-data-backend.resources.requests.cpu | string | `"50m"` |  |
+| simple-data-backend.resources.requests.memory | string | `"512Mi"` |  |
+| simple-data-backend.securityContext.allowPrivilegeEscalation | bool | `false` |  |
+| simple-data-backend.securityContext.runAsGroup | int | `3000` |  |
+| simple-data-backend.securityContext.runAsNonRoot | bool | `true` |  |
+| simple-data-backend.securityContext.runAsUser | int | `1000` |  |
+| simple-data-backend.service.port | int | `8080` |  |
+| simple-data-backend.service.type | string | `"ClusterIP"` |  |
+| simple-data-backend.tolerations | list | `[]` |  |
 
 ----------------------------------------------
 Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0)

deployment/infrastructure/data-provider/data-service/templates/_helpers.tpl

@@ -26,26 +26,31 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "data-service.fullname" . }}
+  name: {{ include "simple-data-backend.fullname" . }}
   labels:
-    {{- include "data-service.labels" . | nindent 4 }}
+    {{- include "simple-data-backend.labels" . | nindent 4 }}
 spec:
+  {{- if not .Values.autoscaling.enabled }}
+  replicas: {{ .Values.replicaCount }}
+  {{- end }}
   selector:
     matchLabels:
-      {{- include "data-service.selectorLabels" . | nindent 6 }}
+      {{- include "simple-data-backend.selectorLabels" . | nindent 6 }}
   template:
     metadata:
       {{- with .Values.podAnnotations }}
       annotations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
-        {{- include "data-service.selectorLabels" . | nindent 8 }}
+        {{- include "simple-data-backend.selectorLabels" . | nindent 8 }}
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      # @url: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/#use-the-default-service-account-to-access-the-api-server
+      automountServiceAccountToken: false
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       containers:
@@ -54,28 +59,15 @@ spec:
             {{- toYaml .Values.securityContext | nindent 12 }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
-          {{ if .Values.image.command -}}
-          command:
-            {{ toYaml .Values.image.command | nindent 12 }}
-          {{ end -}}
-          {{ if .Values.livenessProbe -}}
-          livenessProbe:
-            {{ toYaml .Values.livenessProbe | nindent 12 }}
-          {{ end -}}
-          {{ if .Values.readinessProbe -}}
-          readinessProbe:
-            {{ toYaml .Values.readinessProbe | nindent 12 }}
-          {{ end -}}
           ports:
-            - containerPort: {{ .Values.container.port }}
+            - name: default
+              containerPort: {{ .Values.service.port }}
               protocol: TCP
-              name: http
-          volumeMounts:
-          - mountPath: /tmp
-            name: tmp
-      volumes:
-        - emptyDir: {}
-          name: tmp
+          # @url: https://cloud.google.com/blog/products/containers-kubernetes/kubernetes-best-practices-setting-up-health-checks-with-readiness-and-liveness-probes
+          livenessProbe: {}
+          readinessProbe: {}
+          resources:
+            {{- toYaml .Values.resources | nindent 12 }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
@@ -87,4 +79,4 @@ spec:
       {{- with .Values.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}
-      {{- end }}
+      {{- end }}