Merge pull request #24 from eclipse-tractusx/v0.1.0-rc.2

chore(v0.1.0-rc.2): merge release into main

.github/pull_request_template.md

@@ -14,7 +14,7 @@ Link to Github issue.
 
 Please delete options that are not relevant.
 
-- [ ] I have followed the [contributing guidelines](https://github.com/eclipse-tractusx/policy-hub/blob/main/docs/developer/Technical-Documentation/Dev-Process/How-to-contribute.md#commit-and-pr-guidelines)
+- [ ] I have followed the [contributing guidelines](https://github.com/eclipse-tractusx/policy-hub/blob/main/docs/technical-documentation/dev-process/How%20to%20contribute.md)
 - [ ] I have performed [IP checks](https://eclipse-tractusx.github.io/docs/release/trg-7/trg-7-04#checking-libraries-using-the-eclipse-dash-license-tool) for added or updated 3rd party libraries
 - [ ] I have created and linked IP issues or requested their creation by a committer
 - [ ] I have performed a self-review of my own code

.github/workflows/policy-hub-chart-test.yml

@@ -38,7 +38,7 @@ on:
       upgrade_from:
         description: 'policyhub chart version to upgrade from'
         # tbd
-        default: '0.1.0-rc.1'
+        default: '0.1.0-rc.2'
         required: false
         type: string
 

.github/workflows/release-please.yml

@@ -38,3 +38,4 @@ jobs:
           with:
             target-branch: ${{ github.ref_name }}
             release-type: simple
+            skip-github-release: true

CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## [0.1.0-rc-2](https://github.com/eclipse-tractusx/policy-hub/compare/v0.1.0-rc.1...v0.1.0-rc-2) (2024-02-02)
+
+
+### Features
+
+* make imagePullPolicy configurable, default set to IfNotPresent ([1586de5](https://github.com/eclipse-tractusx/policy-hub/commit/1586de5d6322a92db28dc2f1e3457091087b965c))
+* **trg-4.07:** enable readOnlyRootFilesystem for containers ([9fcc10e](https://github.com/eclipse-tractusx/policy-hub/commit/9fcc10ec743ea3cbeb5a3026e7161789ceee7339))
+
+
+### Miscellaneous Chores
+
+* release 0.1.0-rc.2 ([ac5cc45](https://github.com/eclipse-tractusx/policy-hub/commit/ac5cc45df8c73556d636b9a18adbf3cda2d39f27))
+
 ## 0.1.0-rc.1 (2024-01-23)
 
 

NOTICE.md

@@ -30,11 +30,6 @@ This project leverages the following third party content.
 
 See DEPENDENCIES file.
 
-This project uses the following image content:
-
-* Image: Catena-X Logo
-* Source URL: https://catena-x.net
-
 ## Cryptography
 
 Content may contain encryption software. The country in which you are currently

charts/policy-hub/Chart.yaml

@@ -20,8 +20,8 @@
 apiVersion: v2
 name: policy-hub
 type: application
-version: 0.1.0-rc.1
-appVersion: 0.1.0-rc.1
+version: 0.1.0-rc.2
+appVersion: 0.1.0-rc.2
 description: Helm chart for Catena-X Policy Hub
 home: https://github.com/eclipse-tractusx/policy-hub
 dependencies:

charts/policy-hub/README.md

@@ -27,7 +27,7 @@ To use the helm chart as a dependency:
 dependencies:
   - name: policy-hub
     repository: https://eclipse-tractusx.github.io/charts/dev
-    version: 0.1.0-rc.1
+    version: 0.1.0-rc.2
 ```
 
 ## Requirements
@@ -65,14 +65,16 @@ dependencies:
 | healthChecks.startup.path | string | `"/health/startup"` |  |
 | healthChecks.liveness.path | string | `"/healthz"` |  |
 | healthChecks.readyness.path | string | `"/ready"` |  |
-| policyhub.image | string | `"tractusx/policy-hub-service:0.1.0-rc.1"` |  |
+| policyhub.image | string | `"docker.io/tractusx/policy-hub-service:0.1.0-rc.2"` |  |
+| policyhub.imagePullPolicy | string | `"IfNotPresent"` |  |
 | policyhub.resources | object | `{"requests":{"cpu":"15m","memory":"300M"}}` | We recommend not to specify default resource limits and to leave this as a conscious choice for the user. If you do want to specify resource limits, uncomment the following lines and adjust them as necessary. |
 | policyhub.logging.businessLogic | string | `"Information"` |  |
 | policyhub.logging.default | string | `"Information"` |  |
 | policyhub.healthChecks.startup.tags[0].name | string | `"HEALTHCHECKS__0__TAGS__1"` |  |
 | policyhub.healthChecks.startup.tags[0].value | string | `"policyhubdb"` |  |
 | policyhub.swaggerEnabled | bool | `false` |  |
-| policyhubmigrations.image | string | `"tractusx/policy-hub-migrations:0.1.0-rc.1"` |  |
+| policyhubmigrations.image | string | `"docker.io/tractusx/policy-hub-migrations:0.1.0-rc.2"` |  |
+| policyhubmigrations.imagePullPolicy | string | `"IfNotPresent"` |  |
 | policyhubmigrations.resources | object | `{"requests":{"cpu":"15m","memory":"105M"}}` | We recommend not to specify default resource limits and to leave this as a conscious choice for the user. If you do want to specify resource limits, uncomment the following lines and adjust them as necessary. |
 | policyhubmigrations.seeding.testDataEnvironments | string | `""` |  |
 | policyhubmigrations.seeding.testDataPaths | string | `"Seeder/Data"` |  |

charts/policy-hub/templates/deployment-hub.yaml

@@ -43,9 +43,10 @@ spec:
           capabilities:
             drop:
             - ALL
+          readOnlyRootFilesystem: true
           runAsNonRoot: true
         image: "{{ .Values.policyhub.image }}"
-        imagePullPolicy: "Always"
+        imagePullPolicy: "{{ .Values.policyhub.imagePullPolicy }}"
         env:
         - name: DOTNET_ENVIRONMENT
           value: "{{ .Values.dotnetEnvironment }}"

charts/policy-hub/templates/job-policy-hub-migrations.yaml

@@ -39,9 +39,10 @@ spec:
           capabilities:
             drop:
             - ALL
+          readOnlyRootFilesystem: true
           runAsNonRoot: true
         image: "{{ .Values.policyhubmigrations.image }}"
-        imagePullPolicy: "Always"
+        imagePullPolicy: "{{ .Values.policyhubmigrations.imagePullPolicy }}"
         env:
           - name: DOTNET_ENVIRONMENT
             value: "{{ .Values.dotnetEnvironment }}"

charts/policy-hub/values.yaml

@@ -73,7 +73,8 @@ healthChecks:
     path: "/ready"
 
 policyhub:
-  image: "tractusx/policy-hub-service:0.1.0-rc.1"
+  image: "docker.io/tractusx/policy-hub-service:0.1.0-rc.2"
+  imagePullPolicy: "IfNotPresent"
   # -- We recommend not to specify default resource limits and to leave this as a conscious choice for the user.
   # If you do want to specify resource limits, uncomment the following lines and adjust them as necessary.
   resources:
@@ -94,7 +95,8 @@ policyhub:
   swaggerEnabled: false
 
 policyhubmigrations:
-  image: "tractusx/policy-hub-migrations:0.1.0-rc.1"
+  image: "docker.io/tractusx/policy-hub-migrations:0.1.0-rc.2"
+  imagePullPolicy: "IfNotPresent"
   # -- We recommend not to specify default resource limits and to leave this as a conscious choice for the user.
   # If you do want to specify resource limits, uncomment the following lines and adjust them as necessary.
   resources:

consortia/argocd-app-templates/appsetup-int.yaml

@@ -28,7 +28,7 @@ spec:
   source:
     path: charts/policy-hub
     repoURL: 'https://github.com/eclipse-tractusx/policy-hub.git'
-    targetRevision: policy-hub-0.1.0-rc.1
+    targetRevision: policy-hub-0.1.0-rc.2
     plugin:
       env:
         - name: AVP_SECRET

consortia/argocd-app-templates/appsetup-pen.yaml

@@ -28,7 +28,7 @@ spec:
   source:
     path: charts/policy-hub
     repoURL: 'https://github.com/eclipse-tractusx/policy-hub.git'
-    targetRevision: policy-hub-0.1.0-rc.1
+    targetRevision: policy-hub-0.1.0-rc.2
     plugin:
       env:
         - name: AVP_SECRET

consortia/argocd-app-templates/appsetup-stable.yaml

@@ -29,7 +29,7 @@ spec:
   source:
     path: ''
     repoURL: 'https://eclipse-tractusx.github.io/charts/dev'
-    targetRevision: policy-hub-0.1.0-rc.1
+    targetRevision: policy-hub-0.1.0-rc.2
     plugin:
       env:
         - name: HELM_VALUES

consortia/environments/values-dev.yaml

@@ -47,11 +47,13 @@ keycloak:
         validAudience: "Cl23-CX-Policy-Hub"
 
 policyhub:
-  image: "tractusx/policy-hub-service:dev"
+  image: "docker.io/tractusx/policy-hub-service:dev"
+  imagePullPolicy: "Always"
   swaggerEnabled: true
 
 policyhubmigrations:
-  image: "tractusx/policy-hub-migrations:dev"
+  image: "docker.io/tractusx/policy-hub-migrations:dev"
+  imagePullPolicy: "Always"
   logging:
     default: "Debug"
 

consortia/environments/values-rc.yaml

@@ -41,9 +41,13 @@ ingress:
             port: 8080
 
 policyhub:
+  image: "docker.io/tractusx/policy-hub-service:rc"
+  imagePullPolicy: "Always"
   swaggerEnabled: true
 
 policyhubmigrations:
+  image: "docker.io/tractusx/policy-hub-migrations:rc"
+  imagePullPolicy: "Always"
   logging:
     default: "Debug"
 

docker/Dockerfile-policy-hub-migrations

@@ -27,6 +27,7 @@ WORKDIR /src/database/PolicyHub.Migrations
 RUN dotnet publish "PolicyHub.Migrations.csproj" -c Release -o /migrations/publish
 
 FROM base AS final
+ENV COMPlus_EnableDiagnostics=0
 WORKDIR /migrations
 COPY --from=publish /migrations/publish .
 RUN chown -R 1000:3000 /migrations

docker/Dockerfile-policy-hub-service

@@ -27,6 +27,7 @@ WORKDIR /src/hub/PolicyHub.Service
 RUN dotnet publish "PolicyHub.Service.csproj" -c Release -o /app/publish
 
 FROM base AS final
+ENV COMPlus_EnableDiagnostics=0
 WORKDIR /app
 COPY --from=publish /app/publish .
 ENV ASPNETCORE_URLS http://+:8080

docs/technical-documentation/architecture/Development Concept.md

@@ -2,7 +2,7 @@
 
 ## Build, test, deploy
 
-Details to the build, test and deploy process can get found under the following md file: [Release Process](/docs/Release%20Process.md)
+Details to the build, test and deploy process can get found under the following md file: [Release Process](/docs/technical-documentation/release-process/Release%20Process.md)
 
 ## Development Guidelines
 

scripts/add_notice_footer.sh

@@ -38,7 +38,7 @@ add-notice() {
 This work is licensed under the [Apache-2.0](https://www.apache.org/licenses/LICENSE-2.0).
 
 - SPDX-License-Identifier: Apache-2.0
-- SPDX-FileCopyrightText: 2021-2023 Contributors to the Eclipse Foundation
+- SPDX-FileCopyrightText: 2024 Contributors to the Eclipse Foundation
 - Source URL: https://github.com/eclipse-tractusx/policy-hub'''
 
     # Find all .md files in the directory and its subdirectories, excluding directories from the search

scripts/license.sh

@@ -40,7 +40,7 @@ license-images() {
 This work is licensed under the [CC-BY-4.0](https://creativecommons.org/licenses/by/4.0/legalcode).
 
 - SPDX-License-Identifier: CC-BY-4.0
-- SPDX-FileCopyrightText: Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+- SPDX-FileCopyrightText: Copyright (c) 2024 Contributors to the Eclipse Foundation
 - Source URL: https://github.com/eclipse-tractusx/policy-hub
 
 EOF

src/.vscode/settings.json

@@ -0,0 +1,86 @@
+{
+    "fileHeaderComment.parameter": {
+        "*": {
+            "commentbegin": "/********************************************************************************",
+            "commentend": " ********************************************************************************/",
+            "commentprefix": "",
+            "commentbegin#": "###############################################################",
+            "commentend#": "###############################################################",
+            "commentprefix#": "#",
+            "commentbegin<!->": "<!--",
+            "commentend<!->": "-->",
+            "commentprefix<!->": "-",
+            "cx_header_default":[
+                "* Copyright (c) 2024 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"
+            ],
+            "cx_header_with_#":[
+                "Copyright (c) 2024 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"
+            ],
+            "cx_header_with_<!->":[
+                "Copyright (c) 2024 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"
+            ]
+        }
+    },
+    "fileHeaderComment.template": {
+        "cx_header_default":[
+            "${commentbegin}",
+            "${commentprefix} ${cx_header_default}",
+            "${commentend}"
+        ],
+        "cx_header_with_<!->":[
+            "${commentbegin<!->}",
+            "${commentprefix<!->} ${cx_header_with_<!->}",
+            "${commentend<!->}"
+        ],
+        "cx_header_with_#":[
+            "${commentbegin#}",
+            "${commentprefix#} ${cx_header_with_#}",
+            "${commentend#}"
+        ]
+    }
+}