Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: improve helm chart and chores for 0.1.0 #21

Merged
merged 7 commits into from
Feb 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 0 additions & 5 deletions NOTICE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions charts/policy-hub/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 2 additions & 1 deletion charts/policy-hub/templates/deployment-hub.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand Down
3 changes: 2 additions & 1 deletion charts/policy-hub/templates/job-policy-hub-migrations.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand Down
6 changes: 4 additions & 2 deletions charts/policy-hub/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.1"
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:
Expand All @@ -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.1"
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:
Expand Down
6 changes: 4 additions & 2 deletions consortia/environments/values-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
4 changes: 4 additions & 0 deletions consortia/environments/values-rc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
1 change: 1 addition & 0 deletions docker/Dockerfile-policy-hub-migrations
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions docker/Dockerfile-policy-hub-service
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion scripts/add_notice_footer.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion scripts/license.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
86 changes: 86 additions & 0 deletions src/.vscode/settings.json
Original file line number Diff line number Diff line change
@@ -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#}"
]
}
}
Loading