Merge branch 'test-close' into Open-v1.5.4

.github/workflows/build.yaml

@@ -1,22 +1,23 @@
-#################################################################################
-# Copyright (c) 2022,2023 T-Systems International GmbH
-# Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
-#
-# See the NOTICE file(s) distributed with this work for additional
-# information regarding copyright ownership.
-#
-# This program and the accompanying materials are made available under the
-# terms of the Apache License, Version 2.0 which is available at
-# https://www.apache.org/licenses/LICENSE-2.0.
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-################################################################################
+#*******************************************************************************
+#* Copyright (c) 2022, 2023 T-Systems International GmbH
+#* Copyright (c) 2022, 2023 Contributors to the Eclipse Foundation
+#*
+#* See the NOTICE file(s) distributed with this work for additional
+#* information regarding copyright ownership.
+#*
+#* This program and the accompanying materials are made available under the
+#* terms of the Apache License, Version 2.0 which is available at
+#* https://www.apache.org/licenses/LICENSE-2.0.
+#*
+#* Unless required by applicable law or agreed to in writing, software
+#* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#* License for the specific language governing permissions and limitations
+#* under the License.
+#*
+#* SPDX-License-Identifier: Apache-2.0
+#********************************************************************************
+
 
 name: build
 
@@ -36,10 +37,11 @@ on:
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
-
 env:
-  IMAGE_NAMESPACE: "tractusx"
-  IMAGE_NAME: "managed-service-orchestrator"
+  REGISTRY: ghcr.io
+  IMAGE_NAME: catenax-ng/tx-managed-service-orchestrator/autosetup
+  # Allows you to run this workflow manually from the Actions tab
+
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
@@ -61,9 +63,7 @@ jobs:
         uses: docker/metadata-action@v4
         with:
           images: |
-            ${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}
-          # Automatically prepare image tags; See action docs for more examples. 
-          # semver patter will generate tags like these for example :1 :1.2 :1.2.3
+            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           tags: |
             type=ref,event=branch
             type=ref,event=pr
@@ -73,31 +73,18 @@ jobs:
           flavor: |
               latest=true
 
-      - name: DockerHub login
+      - name: Log into registry ${{ env.REGISTRY }}
         if: github.event_name != 'pull_request'
         uses: docker/login-action@v2
         with:
-          # Use existing DockerHub credentials present as secrets
-          username: ${{ secrets.DOCKER_HUB_USER }}
-          password: ${{ secrets.DOCKER_HUB_TOKEN }}
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push
         uses: docker/build-push-action@v3
         with:
           context: .
-          # Build image for verification purposes on every trigger event. Only push if event is not a PR
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-
-      # https://github.com/peter-evans/dockerhub-description
-      # Important step to push image description to DockerHub 
-      - name: Update Docker Hub description
-        if: github.event_name != 'pull_request'
-        uses: peter-evans/dockerhub-description@v3
-        with:
-        # readme-filepath defaults to toplevel README.md, Only necessary if you have a dedicated file with your 'Notice for docker images'   
-        # readme-filepath: path/to/dedicated/notice-for-docker-image.md 
-          username: ${{ secrets.DOCKER_HUB_USER }}
-          password: ${{ secrets.DOCKER_HUB_TOKEN }}
-          repository: ${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}
+          labels: ${{ steps.meta.outputs.labels }}

.github/workflows/chart-release.yml

@@ -26,7 +26,7 @@ on:
     paths:
       - 'charts/**'
     branches:
-      - main
+      - closeRelease
 jobs:
   release:
     # depending on default permission settings for your org (contents being read-only or read-write for workloads), you will have to add permissions

.github/workflows/helm-lint.yaml

@@ -24,7 +24,7 @@ on:
   push:
     paths:
       - 'charts/**'
-    branches: [main]
+    branches: [closeRelease]
   pull_request:
     paths:
       - 'charts/**'
@@ -39,7 +39,7 @@ on:
       upgrade_from:
         description: 'Managed service orchestrator service chart version to upgrade from'
         #  version from 3.1 release
-        default: '1.5.2'
+        default: '1.5.6'
 
 jobs:
   lint-test:
@@ -96,6 +96,6 @@ jobs:
         run: |
           helm repo add bitnami https://charts.bitnami.com/bitnami
           helm repo add tractusx-dev https://eclipse-tractusx.github.io/charts/dev
-          helm install orchestrator tractusx-dev/managed-service-orchestrator --version ${{ github.event.inputs.upgrade_from || '1.5.2' }}
+          helm install orchestrator tractusx-dev/managed-service-orchestrator --version ${{ github.event.inputs.upgrade_from || '1.5.6' }}
           helm upgrade orchestrator charts/orchestrator
         if: github.event_name != 'pull_request' || steps.list-changed.outputs.changed == 'true'

.github/workflows/kics.yml

@@ -22,7 +22,7 @@ name: "KICS"
 
 on:
   push:
-    branches: [main]
+    branches: [closeRelease]
   # pull_request:
   # The branches below must be a subset of the branches above
   # branches: [main, master]

.github/workflows/trivy.yml

@@ -21,6 +21,9 @@
 name: "Trivy"
 
 on:
+  push:
+    branches: 
+     - closeRelease
   schedule:
     - cron: "0 0 * * 0"
   workflow_dispatch:

CHANGELOG.md

@@ -5,35 +5,53 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
+### Changed
 - postgresql DB upgrade
 
-## [1.5.4] - 2024-03-06
+## [1.5.7] - 2024-03-13
 ### Fixed
 - Fixed CVE-2024-22234 and CVE-2024-22243
 - Fixed Trivy security issue CVE-2024-1597
+- Fix helm repo name in `INSTALL.md` (#89)
+- Fix link to temurin repository in "Notice for Docker images" (#90)
+- Remove default connection test, that prevented helm test to succeed (#92)
+- Fix Chart names in helm test step (#95)
 
 ### Changed
 - Update Spring Boot to version 3.2.3
 - Update commons-text, commons-io, commons-compres, bcprov, bcpkix, snappy-java, jakarta.activation-api
-
-## [1.5.3] - 2024-02-19
-### Fixed
 - Fixed trivy security issues CVE-2023-34053, CVE-2023-46589, CVE-2023-6378
 
+## [1.5.6] - 2023-11-21
 
-## [1.5.2] - 2023-11-24
+### Changed
+- Handle minio duplication
+- Avoid managed service orchestrator failure in case DT asset creation failed
+- Support portal autosetup changes
 
-### Fixed
+## [1.5.5] - 2023-11-02
 
-- Fix helm repo name in `INSTALL.md` (#89)
-- Fix link to temurin repository in "Notice for Docker images" (#90)
-- Remove default connection test, that prevented helm test to succeed (#92)
-- Fix Chart names in helm test step (#95)
+### Changed
+ - Handle Minio user duplication
+ 
+## [1.5.4] - 2023-11-01
 
+### Removed
+ - Removal of openssh dependency
+
+## [1.5.3] - 2023-10-30
 
-## [1.5.1] - 2023-11-17
+### Changed
+ - Refactor DT registry local use
+
+## [1.5.2] - 2023-10-27
+
+### Added
+ - Minio support working version
+ - Email send refactor
+ - Refactor s3 policy template use
 
-[App release 1.5.0](https://github.com/eclipse-tractusx/managed-service-orchestrator/releases/tag/v1.5.1)
+## [1.5.1] - 2023-10-16
 
 ### Changed
  - Update DT asset creation for oauth secret information