From 38a0d8ad5636a66d872b4cb6c71a7aa6b8c4f803 Mon Sep 17 00:00:00 2001 From: "fabio.d.mota" Date: Thu, 18 May 2023 15:27:07 +0100 Subject: [PATCH 1/4] fix(Gate-Pool): test create dockerfile image --- .github/workflows/build-docker-all.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-docker-all.yaml b/.github/workflows/build-docker-all.yaml index 7bc9ac707..b36af42b7 100644 --- a/.github/workflows/build-docker-all.yaml +++ b/.github/workflows/build-docker-all.yaml @@ -15,6 +15,7 @@ on: branches: - main - rc/** + - feat/Dockerfile_for_dummy_bridge pull_request: branches: - main From e27605c9c20b19563924b04b52d75314ed744ddf Mon Sep 17 00:00:00 2001 From: "fabio.d.mota" Date: Thu, 18 May 2023 15:27:54 +0100 Subject: [PATCH 2/4] feat(Gate-Pool): Deploy all helm charts with umbrella structure and dummy bridge fix(Gate-Pool): test create dockerfile image --- .github/workflows/build-docker-all.yaml | 2 +- .github/workflows/helm-chart-lint.yaml | 2 +- charts/bpdm/Chart.yaml | 8 +- .../bpdm/charts/bpdm-dummy-bridge/.helmignore | 26 +++ .../charts/bpdm-dummy-bridge/CHANGELOG.md | 79 +++++++ .../bpdm/charts/bpdm-dummy-bridge/Chart.yaml | 37 ++++ charts/bpdm/charts/bpdm-dummy-bridge/LICENSE | 201 ++++++++++++++++++ .../bpdm/charts/bpdm-dummy-bridge/README.md | 117 ++++++++++ .../bpdm-dummy-bridge/templates/NOTES.txt | 16 ++ .../bpdm-dummy-bridge/templates/_helpers.tpl | 135 ++++++++++++ .../templates/configMap.yaml | 42 ++++ .../templates/deployment.yaml | 102 +++++++++ .../bpdm-dummy-bridge/templates/ingress.yaml | 82 +++++++ .../bpdm-dummy-bridge/templates/secret.yaml | 30 +++ .../bpdm-dummy-bridge/templates/service.yaml | 32 +++ .../bpdm/charts/bpdm-dummy-bridge/values.yaml | 134 ++++++++++++ charts/bpdm/values.yaml | 17 ++ 17 files changed, 1058 insertions(+), 4 deletions(-) create mode 100644 charts/bpdm/charts/bpdm-dummy-bridge/.helmignore create mode 100644 charts/bpdm/charts/bpdm-dummy-bridge/CHANGELOG.md create mode 100644 charts/bpdm/charts/bpdm-dummy-bridge/Chart.yaml create mode 100644 charts/bpdm/charts/bpdm-dummy-bridge/LICENSE create mode 100644 charts/bpdm/charts/bpdm-dummy-bridge/README.md create mode 100644 charts/bpdm/charts/bpdm-dummy-bridge/templates/NOTES.txt create mode 100644 charts/bpdm/charts/bpdm-dummy-bridge/templates/_helpers.tpl create mode 100644 charts/bpdm/charts/bpdm-dummy-bridge/templates/configMap.yaml create mode 100644 charts/bpdm/charts/bpdm-dummy-bridge/templates/deployment.yaml create mode 100644 charts/bpdm/charts/bpdm-dummy-bridge/templates/ingress.yaml create mode 100644 charts/bpdm/charts/bpdm-dummy-bridge/templates/secret.yaml create mode 100644 charts/bpdm/charts/bpdm-dummy-bridge/templates/service.yaml create mode 100644 charts/bpdm/charts/bpdm-dummy-bridge/values.yaml diff --git a/.github/workflows/build-docker-all.yaml b/.github/workflows/build-docker-all.yaml index b36af42b7..b94d7a1f2 100644 --- a/.github/workflows/build-docker-all.yaml +++ b/.github/workflows/build-docker-all.yaml @@ -15,7 +15,7 @@ on: branches: - main - rc/** - - feat/Dockerfile_for_dummy_bridge + - feat/Dockfile_for_dummy_bridge pull_request: branches: - main diff --git a/.github/workflows/helm-chart-lint.yaml b/.github/workflows/helm-chart-lint.yaml index 11267aa8f..0edb2b50e 100644 --- a/.github/workflows/helm-chart-lint.yaml +++ b/.github/workflows/helm-chart-lint.yaml @@ -56,5 +56,5 @@ jobs: # install the chart to the kind cluster and run helm test # define charts to test with the --charts parameter - name: Run chart-testing (install) - run: ct install --charts charts/bpdm,charts/bpdm/charts/bpdm-pool,charts/bpdm/charts/bpdm-gate --config charts/config/chart-testing-config.yaml + run: ct install --charts charts/bpdm,charts/bpdm/charts/bpdm-pool,charts/bpdm/charts/bpdm-gate,charts/bpdm/charts/bpdm-bridge-dummy --config charts/config/chart-testing-config.yaml if: ${{ env.CHART_CHANGED == 'true' }} diff --git a/charts/bpdm/Chart.yaml b/charts/bpdm/Chart.yaml index 732befebb..eea95ee7e 100644 --- a/charts/bpdm/Chart.yaml +++ b/charts/bpdm/Chart.yaml @@ -19,10 +19,10 @@ ################################################################################ apiVersion: v2 -name: bpdm umbrella-chart +name: bpdm type: application description: A Helm chart for Kubernetes that deploys the gate and pool applications -version: 0.2.0 +version: 3.0.0 appVersion: 1.0.0 home: https://github.com/eclipse-tractusx/bpdm sources: @@ -37,6 +37,10 @@ dependencies: version: 5.0.0-alpha.4 alias: bpdm-pool condition: bpdm-pool.enabled + - name: bpdm-dummy-bridge + version: 1.0.0 + alias: bpdm-dummy-bridge + condition: bpdm-dummy-bridge.enabled - name: opensearch version: 2.*.* repository: https://opensearch-project.github.io/helm-charts/ diff --git a/charts/bpdm/charts/bpdm-dummy-bridge/.helmignore b/charts/bpdm/charts/bpdm-dummy-bridge/.helmignore new file mode 100644 index 000000000..aa931b8f0 --- /dev/null +++ b/charts/bpdm/charts/bpdm-dummy-bridge/.helmignore @@ -0,0 +1,26 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*.orig +*~ +# Various IDEs +.project +.idea/ +*.tmproj +.vscode/ +# Accept only values.yaml +values-*.yaml +values-*.yml diff --git a/charts/bpdm/charts/bpdm-dummy-bridge/CHANGELOG.md b/charts/bpdm/charts/bpdm-dummy-bridge/CHANGELOG.md new file mode 100644 index 000000000..526352c7d --- /dev/null +++ b/charts/bpdm/charts/bpdm-dummy-bridge/CHANGELOG.md @@ -0,0 +1,79 @@ +# Changelog + +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/), + +## [4.0.0] - tbd + +### Changed + +- increase to app version 4.0.0 +- add missing license headers to ingress templates + +### Added + +- postgres chart dependency for persistence + +## [3.3.0] - 2023-03-17 + +### Changed + +- increase to app version 3.2.0 + +## [3.2.0] - 2023-03-16 + +### Changed + +- Startup, Readiness and Liveness probes can now be fully configured over the values + +## [3.1.0] - 2023-03-08 + +### Changed + +- increase to app version 3.1.0 + +## [3.0.6] - 2023-02-24 + +### Changed + +- increase to app version 3.0.3 + +## [3.0.5] - 2023-02-16 + +### Changed + +- support app version 3.0.2 + +### Fixed + +- fixed bug causing missing apiVersion on Ingress resource +- fixed port of startup probe +- fixed liveness probe endpoint + +## [3.0.4] - 2022-01-27 + +### Added + +- LICENSE file +- README file +- Copyright headers +- CHANGELOG file + +## [3.0.3] - 2022-01-25 + +### Changed + +- AppVersion to 3.0.1 + +## [3.0.2] - 2022-01-23 + +## Changed + +- Image now being pulled from catenax-ng/tx-bpdm by default. + +## [3.0.1] - 2022-01-20 + +## Changed + +- AppVersion to 3.0.0 \ No newline at end of file diff --git a/charts/bpdm/charts/bpdm-dummy-bridge/Chart.yaml b/charts/bpdm/charts/bpdm-dummy-bridge/Chart.yaml new file mode 100644 index 000000000..7bd76e97b --- /dev/null +++ b/charts/bpdm/charts/bpdm-dummy-bridge/Chart.yaml @@ -0,0 +1,37 @@ +--- +################################################################################ +# Copyright (c) 2021,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 +################################################################################ + +apiVersion: v2 +type: application +name: bpdm-dummy-bridge +appVersion: "4.0.0-alpha.2" +version: 1.0.0 +description: A Helm chart for deploying the BPDM dummy bridge service +home: https://eclipse-tractusx.github.io/docs/kits/Business%20Partner%20Kit/Adoption%20View +sources: + - https://github.com/eclipse-tractusx/bpdm +dependencies: + - name: postgresql + version: 11.9.1 + repository: https://charts.bitnami.com/bitnami + alias: postgres + condition: postgres.enabled +maintainers: + - name: Nico Koprowski diff --git a/charts/bpdm/charts/bpdm-dummy-bridge/LICENSE b/charts/bpdm/charts/bpdm-dummy-bridge/LICENSE new file mode 100644 index 000000000..62aa1e821 --- /dev/null +++ b/charts/bpdm/charts/bpdm-dummy-bridge/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2021 Catena-X + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://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. \ No newline at end of file diff --git a/charts/bpdm/charts/bpdm-dummy-bridge/README.md b/charts/bpdm/charts/bpdm-dummy-bridge/README.md new file mode 100644 index 000000000..79502e509 --- /dev/null +++ b/charts/bpdm/charts/bpdm-dummy-bridge/README.md @@ -0,0 +1,117 @@ +# BPDM Gate Helm Chart + +This Helm Chart deploys the BPDM Gate service to a Kubernetes environment. + +## Prerequisites + +* [Kubernetes Cluster](https://kubernetes.io) +* [Helm](https://helm.sh/docs/) +* SaaS storage and datasource +* Running BPDM Pool instance + +For the default deployment you need to specify a valid SaaS hostname, storage, datasource and API key for the application to connect with. +The easiest way to provide this information is by creating your own values files and overwrite the default `applicationConfig` and `applicationSecrets` values. + +my_release-values.yaml: + +```yaml +applicationConfig: + bpdm: + saas: + host: https://saas + storage: your_storage_id + datasource: your_datasource_id +applicationSecrets: + bpdm: + saas: + api-key: your_api_key +``` + +Given such a values file you can deploy the application via the following command: + +```bash +helm install release_name ./charts/gate --namespace your_namespace -f /path/to/my_release-values.yaml +``` + +This will install a new release of the BPDM Gate in the given namespace. +On default values this release deploys the latest image tagged as `main` from the repository's GitHub Container Registry. +The application is run on default profile (without authorization for its own endpoints or BPDM Pool endpoints). +This deployment requires a BPDM Pool deployment to be reachable under host name `bpdm-pool` on port `8080`. + +By giving your own values file you can configure the Helm deployment of the BPDM Gate freely. +In the following sections you can have a look at the most important configuration options. + +## Image Tag + +Per default, the Helm deployment references the latest BPDM gate release tagged as `main`. +This tag follows the latest version of the Gate and contains the newest features and bug fixes. +You might want to switch to a more stable release tag instead for your deployment. +In your values file you can overwrite the default tag: + +```yaml +image: + tag: "v2.0.2" +``` + +## Profiles + +You can also activate Spring profiles in which the BPDM Gate should be run. +In case you want to run the Gate with authorization and oAuth Pool client enabled you can write the following: + +```yaml +springProfiles: + - auth + - pool-auth +``` + +## Ingress + +You can specify your own ingress configuration for the Helm deployment to make the BPDM Gate available over Ingress. +Note that you need to have the appropriate Ingress controller installed in your cluster first. +For example, consider a Kubernetes cluster with an [Ingress-Nginx](https://kubernetes.github.io/ingress-nginx/) installed. +An Ingress configuration for the Gate deployment could look like this: + +```yaml +ingress: + enabled: true + annotations: + kubernetes.io/ingress.class: nginx + nginx.ingress.kubernetes.io/backend-protocol: "HTTP" + hosts: + - host: partners-gate.your-domain.net + paths: + - path: / + pathType: Prefix +``` + +## Gate Configuration + +For the default deployment you already need to overwrite the configuration properties of the application. +The Helm deployment comes with the ability to configure the BPDM Gate application directly over the values file. +This way you are able to overwrite any configuration property of the `application.properties`, `application-auth.properties` +and `application-pool-auth.properties` files. +Consider that you would need to turn on `auth` and `pool-auth` profile first before overwriting any property in the corresponding properties file could take +effect. +Overwriting configuration properties can be useful for connecting to a remotely hosted BPDM Pool instance: + +```yaml +applicationConfig: + bpdm: + pool: + base-url: http://remote.domain.net/api/catena +``` + +Entries in the "applicationConfig" value are written directly to a configMap that is part of the Helm deployment. +This can be a problem if you want to overwrite configuration properties with secrets. +Therefore, you can specify secret configuration values in a different Helm value `applicationSecrets`. +Content of this value is written in a Kubernetes secret instead. +If you want to specify a keycloak client secret for example: + +```yaml +applicationSecrets: + bpdm: + security: + credentials: + secret: your_client_secret +``` + diff --git a/charts/bpdm/charts/bpdm-dummy-bridge/templates/NOTES.txt b/charts/bpdm/charts/bpdm-dummy-bridge/templates/NOTES.txt new file mode 100644 index 000000000..64c52e5c1 --- /dev/null +++ b/charts/bpdm/charts/bpdm-dummy-bridge/templates/NOTES.txt @@ -0,0 +1,16 @@ +1. Get the application URL by running these commands: +{{- if contains "NodePort" .Values.service.type }} + export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "bpdm.fullname" . }}) + export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") + echo http://$NODE_IP:$NODE_PORT +{{- else if contains "LoadBalancer" .Values.service.type }} + NOTE: It may take a few minutes for the LoadBalancer IP to be available. + You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "bpdm.fullname" . }}' + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "bpdm.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") + echo http://$SERVICE_IP:{{ .Values.service.port }} +{{- else if contains "ClusterIP" .Values.service.type }} + export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "bpdm.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") + export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}") + echo "Visit http://127.0.0.1:8080 to use your application" + kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT +{{- end }} diff --git a/charts/bpdm/charts/bpdm-dummy-bridge/templates/_helpers.tpl b/charts/bpdm/charts/bpdm-dummy-bridge/templates/_helpers.tpl new file mode 100644 index 000000000..66577c475 --- /dev/null +++ b/charts/bpdm/charts/bpdm-dummy-bridge/templates/_helpers.tpl @@ -0,0 +1,135 @@ +{{/* +Copyright (c) 2021,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 +*/}} + +{{/* +Expand the name of the chart. +*/}} +{{- define "bpdm.name" -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Create a default fully qualified app name. +We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +If release name contains chart name it will be used as a full name. +*/}} +{{- define "bpdm.fullname" -}} +{{- if .Values.fullnameOverride }} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- $name := default .Chart.Name .Values.nameOverride }} +{{- if contains $name .Release.Name }} +{{- .Release.Name | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} +{{- end }} +{{- end }} +{{- end }} + +{{/* +Create chart name and version as used by the chart label. +*/}} +{{- define "bpdm.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Common labels +*/}} +{{- define "bpdm.labels" -}} +helm.sh/chart: {{ include "bpdm.chart" . }} +{{ include "bpdm.selectorLabels" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end }} + +{{- define "bpdm-bridge.poolServiceName" -}} +{{- $config := .Values.applicationConfig -}} +{{- if and $config (not (empty $config.bpdm)) -}} + {{- $bpdm := $config.bpdm -}} + {{- if and $bpdm (not (empty $bpdm.pool)) -}} + {{- $pool := $bpdm.pool -}} + {{- if and $pool (not (empty (index $pool "base-url"))) -}} + {{- index $pool "base-url" -}} + {{- else -}} + {{- printf "%s-bpdm-pool" .Release.Name -}} + {{- end -}} + {{- else -}} + {{- printf "%s-bpdm-pool" .Release.Name -}} + {{- end -}} +{{- else -}} + {{- printf "%s-bpdm-pool" .Release.Name -}} +{{- end -}} +{{- end }} + +{{- define "bpdm-bridge.gateServiceName" -}} +{{- $config := .Values.applicationConfig -}} +{{- if and $config (not (empty $config.bpdm)) -}} + {{- $bpdm := $config.bpdm -}} + {{- if and $bpdm (not (empty $bpdm.gate)) -}} + {{- $gate := $bpdm.gate -}} + {{- if and $gate (not (empty (index $gate "base-url"))) -}} + {{- index $gate "base-url" -}} + {{- else -}} + {{- printf "%s-bpdm-gate" .Release.Name -}} + {{- end -}} + {{- else -}} + {{- printf "%s-bpdm-gate" .Release.Name -}} + {{- end -}} +{{- else -}} + {{- printf "%s-bpdm-gate" .Release.Name -}} +{{- end -}} +{{- end }} + + + +{{/* +Selector labels +*/}} +{{- define "bpdm.selectorLabels" -}} +app.kubernetes.io/name: {{ include "bpdm.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +{{- end }} + +{{/* +Create name of application secret +*/}} +{{- define "bpdm.applicationSecret.name" -}} +{{- printf "%s-application" (include "bpdm.fullname" .) }} +{{- end }} + +{/* +Determine postgres service/host name to connect to +*/}} +{{- define "bpdm.postgresDependency" -}} + {{- include "includeWithPostgresContext" (list $ "postgresql.primary.fullname") }} +{{- end }}} + + +{{/* +Invoke include on given definition with postgresql dependency context +Usage: include "includeWithPostgresContext" (list $ "your_include_function_here") +*/}} +{{- define "includeWithPostgresContext" -}} +{{- $ := index . 0 }} +{{- $function := index . 1 }} +{{- include $function (dict "Values" $.Values.postgres "Chart" (dict "Name" "postgres") "Release" $.Release) }} +{{- end }} \ No newline at end of file diff --git a/charts/bpdm/charts/bpdm-dummy-bridge/templates/configMap.yaml b/charts/bpdm/charts/bpdm-dummy-bridge/templates/configMap.yaml new file mode 100644 index 000000000..8c3107699 --- /dev/null +++ b/charts/bpdm/charts/bpdm-dummy-bridge/templates/configMap.yaml @@ -0,0 +1,42 @@ +--- +################################################################################ +# Copyright (c) 2021,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 +################################################################################ + +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{include "bpdm.fullname" .}} + labels: + {{- include "bpdm.labels" . | nindent 4 }} +data: + deployment.yml: |- + # Place for putting standard deployment configuration + # which can be overwritten by external.yml + bpdm: + datasource: + host: {{ include "bpdm.postgresDependency" . }} + pool: + base-url: {{include "bpdm-bridge.poolServiceName" .}} + gate: + base-url: {{include "bpdm-bridge.gateServiceName" .}} + external.yml: |- + # External properties for overwriting application config + {{- if .Values.applicationConfig }} + {{- .Values.applicationConfig | toYaml | nindent 4 }} + {{- end }} diff --git a/charts/bpdm/charts/bpdm-dummy-bridge/templates/deployment.yaml b/charts/bpdm/charts/bpdm-dummy-bridge/templates/deployment.yaml new file mode 100644 index 000000000..08480b902 --- /dev/null +++ b/charts/bpdm/charts/bpdm-dummy-bridge/templates/deployment.yaml @@ -0,0 +1,102 @@ +################################################################################ +# Copyright (c) 2021,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 +################################################################################ + +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ include "bpdm.fullname" . }} + labels: + {{- include "bpdm.labels" . | nindent 4 }} +spec: + {{- if not .Values.autoscaling.enabled }} + replicas: {{ .Values.replicaCount }} + {{- end }} + selector: + matchLabels: + {{- include "bpdm.selectorLabels" . | nindent 6 }} + template: + metadata: + {{- with .Values.podAnnotations }} + annotations: + {{- toYaml . | nindent 8 }} + {{- end }} + labels: + {{- include "bpdm.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: + - name: {{ .Chart.Name }} + securityContext: + {{- toYaml .Values.securityContext | nindent 12 }} + image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" + imagePullPolicy: {{ .Values.image.pullPolicy }} + env: + - name: SPRING_PROFILES_ACTIVE + value: {{ .Values.springProfiles | join "," }} + - name: SPRING_CONFIG_IMPORT + value: "/etc/conf/deployment.yml,/etc/conf/external.yml,/etc/conf/secrets.yml" + - name: SPRING_DATASOURCE_PASSWORD + valueFrom: + secretKeyRef: + name: {{ include "bpdm.postgresDependency" . }} + key: password + ports: + - name: http + containerPort: 8081 + protocol: TCP + # @url: https://cloud.google.com/blog/products/containers-kubernetes/kubernetes-best-practices-setting-up-health-checks-with-readiness-and-liveness-probes + livenessProbe: + {{- toYaml .Values.livenessProbe | nindent 12 }} + readinessProbe: + {{- toYaml .Values.readinessProbe | nindent 12 }} + startupProbe: + {{- toYaml .Values.startupProbe | nindent 12 }} + resources: + {{- toYaml .Values.resources | nindent 12 }} + volumeMounts: + - mountPath: /etc/conf + name: config + readOnly: true + {{- with .Values.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.affinity }} + affinity: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} + volumes: + - name: config + projected: + sources: + - configMap: + name: {{ include "bpdm.fullname" . }} + - secret: + name: {{ include "bpdm.fullname" . }} \ No newline at end of file diff --git a/charts/bpdm/charts/bpdm-dummy-bridge/templates/ingress.yaml b/charts/bpdm/charts/bpdm-dummy-bridge/templates/ingress.yaml new file mode 100644 index 000000000..aba12cd58 --- /dev/null +++ b/charts/bpdm/charts/bpdm-dummy-bridge/templates/ingress.yaml @@ -0,0 +1,82 @@ +################################################################################ +# Copyright (c) 2021,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 +################################################################################ + +{{ if .Values.ingress.enabled }} + + +{{- $fullName := include "bpdm.fullname" . -}} +{{- $svcPort := .Values.service.port -}} +{{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }} + {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }} + {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}} + {{- end }} +{{- end }} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1beta1 +{{- else -}} +apiVersion: extensions/v1beta1 +{{- end }} +kind: Ingress +metadata: + name: {{ $fullName }} + labels: + {{- include "bpdm.labels" . | nindent 4 }} + {{- with .Values.ingress.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }} + ingressClassName: {{ .Values.ingress.className }} + {{- end }} + {{- if .Values.ingress.tls }} + tls: + {{- range .Values.ingress.tls }} + - hosts: + {{- range .hosts }} + - {{ . | quote }} + {{- end }} + secretName: {{ .secretName }} + {{- end }} + {{- end }} + rules: + {{- range .Values.ingress.hosts }} + - host: {{ .host | quote }} + http: + paths: + {{- range .paths }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} + backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} + serviceName: {{ $fullName }} + servicePort: {{ $svcPort }} + {{- end }} + {{- end }} + {{- end }} +{{- end }} \ No newline at end of file diff --git a/charts/bpdm/charts/bpdm-dummy-bridge/templates/secret.yaml b/charts/bpdm/charts/bpdm-dummy-bridge/templates/secret.yaml new file mode 100644 index 000000000..5917f9b57 --- /dev/null +++ b/charts/bpdm/charts/bpdm-dummy-bridge/templates/secret.yaml @@ -0,0 +1,30 @@ +################################################################################ +# Copyright (c) 2021,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 +################################################################################ + +apiVersion: v1 +kind: Secret +metadata: + name: {{ include "bpdm.fullname" . }} +type: Opaque +stringData: + secrets.yml: |- + # Secret properties for overwriting application config + {{- if .Values.applicationSecrets }} + {{- .Values.applicationSecrets | toYaml | nindent 4 }} + {{- end }} \ No newline at end of file diff --git a/charts/bpdm/charts/bpdm-dummy-bridge/templates/service.yaml b/charts/bpdm/charts/bpdm-dummy-bridge/templates/service.yaml new file mode 100644 index 000000000..71950d5f7 --- /dev/null +++ b/charts/bpdm/charts/bpdm-dummy-bridge/templates/service.yaml @@ -0,0 +1,32 @@ +################################################################################ +# Copyright (c) 2021,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 +################################################################################ + +apiVersion: v1 +kind: Service +metadata: + name: {{ include "bpdm.fullname" . }} + labels: + {{- include "bpdm.labels" . | nindent 4 }} +spec: + type: {{ .Values.service.type }} + ports: + - port: {{ .Values.service.port }} + targetPort: {{ .Values.service.targetPort }} + selector: + {{- include "bpdm.selectorLabels" . | nindent 4 }} \ No newline at end of file diff --git a/charts/bpdm/charts/bpdm-dummy-bridge/values.yaml b/charts/bpdm/charts/bpdm-dummy-bridge/values.yaml new file mode 100644 index 000000000..d95180c4b --- /dev/null +++ b/charts/bpdm/charts/bpdm-dummy-bridge/values.yaml @@ -0,0 +1,134 @@ +--- +################################################################################ +# Copyright (c) 2021,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 +################################################################################ + +nameOverride: +fullnameOverride: + +replicaCount: 1 + +image: + registry: ghcr.io + repository: catenax-ng/tx-bpdm/dummy-bridge + pullPolicy: Always + # Overrides the image tag whose default is the chart appVersion. + tag: "" + +imagePullSecrets: [] + +podAnnotations: {} + +# Spring profiles under which the application should run +springProfiles: [] + +securityContext: + allowPrivilegeEscalation: false + runAsNonRoot: true + runAsUser: 10001 + runAsGroup: 3000 + capabilities: + drop: + - ALL + +service: + type: ClusterIP + port: 8080 + targetPort: 8083 + +autoscaling: + enabled: false + +ingress: + enabled: false + annotations: {} + hosts: [] + tls: [] + +resources: + limits: + cpu: 800m + memory: 2Gi + requests: + cpu: 300m + memory: 2Gi + +nodeSelector: {} + +tolerations: [] + +affinity: + podAntiAffinity: + preferredDuringSchedulingIgnoredDuringExecution: + - weight: 100 + podAffinityTerm: + labelSelector: + matchExpressions: + - key: app.kubernetes.io/name + operator: DoesNotExist + topologyKey: kubernetes.io/hostname + +livenessProbe: + httpGet: + path: "/actuator/health/liveness" + port: 8083 + scheme: HTTP + failureThreshold: 3 + initialDelaySeconds: 5 + periodSeconds: 5 + successThreshold: 1 + timeoutSeconds: 1 +readinessProbe: + httpGet: + path: "/actuator/health/readiness" + port: 8083 + scheme: HTTP + failureThreshold: 3 + initialDelaySeconds: 5 + periodSeconds: 5 + successThreshold: 1 + timeoutSeconds: 1 +startupProbe: + httpGet: + path: "/actuator/health/readiness" + port: 8083 + scheme: HTTP + initialDelaySeconds: 10 + failureThreshold: 20 + periodSeconds: 10 + + +# Used to overwrite the default property values of the application configuration +applicationConfig: +# bpdm: +# pool: +# base-url: ... +# gate: +# base-url: ... + +# Used to overwrite the secret property values of the application configuration +applicationSecrets: +# bpdm: +# saas: +# api-key: ... + +postgres: + enabled: true + auth: + database: bpdm + username: bpdm diff --git a/charts/bpdm/values.yaml b/charts/bpdm/values.yaml index a4afcc766..e46d9a01a 100644 --- a/charts/bpdm/values.yaml +++ b/charts/bpdm/values.yaml @@ -29,6 +29,23 @@ bpdm-pool: postgres: enabled: false +bpdm-dummy-bridge: + enabled: true + replicaCount: 1 + image: + registry: ghcr.io + repository: catenax-ng/tx-bpdm/dummy-bridge + pullPolicy: Always + tag: "" + applicationConfig: + bpdm: + pool: + base-url: "" + gate: + base-url: "" + postgres: + enabled: false + opensearch: masterService: "" fullnameOverride: "bpdm-pool-opensearch" From f67c25ae9b250c8e42cd8bae07238fc16338c475 Mon Sep 17 00:00:00 2001 From: "fabio.d.mota" Date: Wed, 24 May 2023 15:30:13 +0100 Subject: [PATCH 3/4] fix(Gate-Pool): Up version for all bpdm images --- .github/workflows/build-docker-all.yaml | 1 - charts/bpdm/Chart.yaml | 6 +++--- .../{bpdm-dummy-bridge => bpdm-bridge-dummy}/.helmignore | 0 .../{bpdm-dummy-bridge => bpdm-bridge-dummy}/CHANGELOG.md | 0 .../{bpdm-dummy-bridge => bpdm-bridge-dummy}/Chart.yaml | 6 +++--- .../charts/{bpdm-dummy-bridge => bpdm-bridge-dummy}/LICENSE | 0 .../{bpdm-dummy-bridge => bpdm-bridge-dummy}/README.md | 0 .../templates/NOTES.txt | 0 .../templates/_helpers.tpl | 0 .../templates/configMap.yaml | 0 .../templates/deployment.yaml | 2 +- .../templates/ingress.yaml | 0 .../templates/secret.yaml | 0 .../templates/service.yaml | 0 .../{bpdm-dummy-bridge => bpdm-bridge-dummy}/values.yaml | 2 +- charts/bpdm/charts/bpdm-gate/Chart.yaml | 2 +- charts/bpdm/charts/bpdm-pool/Chart.yaml | 2 +- charts/bpdm/values.yaml | 4 ++-- 18 files changed, 12 insertions(+), 13 deletions(-) rename charts/bpdm/charts/{bpdm-dummy-bridge => bpdm-bridge-dummy}/.helmignore (100%) rename charts/bpdm/charts/{bpdm-dummy-bridge => bpdm-bridge-dummy}/CHANGELOG.md (100%) rename charts/bpdm/charts/{bpdm-dummy-bridge => bpdm-bridge-dummy}/Chart.yaml (91%) rename charts/bpdm/charts/{bpdm-dummy-bridge => bpdm-bridge-dummy}/LICENSE (100%) rename charts/bpdm/charts/{bpdm-dummy-bridge => bpdm-bridge-dummy}/README.md (100%) rename charts/bpdm/charts/{bpdm-dummy-bridge => bpdm-bridge-dummy}/templates/NOTES.txt (100%) rename charts/bpdm/charts/{bpdm-dummy-bridge => bpdm-bridge-dummy}/templates/_helpers.tpl (100%) rename charts/bpdm/charts/{bpdm-dummy-bridge => bpdm-bridge-dummy}/templates/configMap.yaml (100%) rename charts/bpdm/charts/{bpdm-dummy-bridge => bpdm-bridge-dummy}/templates/deployment.yaml (99%) rename charts/bpdm/charts/{bpdm-dummy-bridge => bpdm-bridge-dummy}/templates/ingress.yaml (100%) rename charts/bpdm/charts/{bpdm-dummy-bridge => bpdm-bridge-dummy}/templates/secret.yaml (100%) rename charts/bpdm/charts/{bpdm-dummy-bridge => bpdm-bridge-dummy}/templates/service.yaml (100%) rename charts/bpdm/charts/{bpdm-dummy-bridge => bpdm-bridge-dummy}/values.yaml (98%) diff --git a/.github/workflows/build-docker-all.yaml b/.github/workflows/build-docker-all.yaml index b94d7a1f2..7bc9ac707 100644 --- a/.github/workflows/build-docker-all.yaml +++ b/.github/workflows/build-docker-all.yaml @@ -15,7 +15,6 @@ on: branches: - main - rc/** - - feat/Dockfile_for_dummy_bridge pull_request: branches: - main diff --git a/charts/bpdm/Chart.yaml b/charts/bpdm/Chart.yaml index eea95ee7e..9869ca317 100644 --- a/charts/bpdm/Chart.yaml +++ b/charts/bpdm/Chart.yaml @@ -37,10 +37,10 @@ dependencies: version: 5.0.0-alpha.4 alias: bpdm-pool condition: bpdm-pool.enabled - - name: bpdm-dummy-bridge + - name: bpdm-bridge-dummy version: 1.0.0 - alias: bpdm-dummy-bridge - condition: bpdm-dummy-bridge.enabled + alias: bpdm-bridge-dummy + condition: bpdm-bridge-dummy.enabled - name: opensearch version: 2.*.* repository: https://opensearch-project.github.io/helm-charts/ diff --git a/charts/bpdm/charts/bpdm-dummy-bridge/.helmignore b/charts/bpdm/charts/bpdm-bridge-dummy/.helmignore similarity index 100% rename from charts/bpdm/charts/bpdm-dummy-bridge/.helmignore rename to charts/bpdm/charts/bpdm-bridge-dummy/.helmignore diff --git a/charts/bpdm/charts/bpdm-dummy-bridge/CHANGELOG.md b/charts/bpdm/charts/bpdm-bridge-dummy/CHANGELOG.md similarity index 100% rename from charts/bpdm/charts/bpdm-dummy-bridge/CHANGELOG.md rename to charts/bpdm/charts/bpdm-bridge-dummy/CHANGELOG.md diff --git a/charts/bpdm/charts/bpdm-dummy-bridge/Chart.yaml b/charts/bpdm/charts/bpdm-bridge-dummy/Chart.yaml similarity index 91% rename from charts/bpdm/charts/bpdm-dummy-bridge/Chart.yaml rename to charts/bpdm/charts/bpdm-bridge-dummy/Chart.yaml index 7bd76e97b..3589840db 100644 --- a/charts/bpdm/charts/bpdm-dummy-bridge/Chart.yaml +++ b/charts/bpdm/charts/bpdm-bridge-dummy/Chart.yaml @@ -20,10 +20,10 @@ apiVersion: v2 type: application -name: bpdm-dummy-bridge -appVersion: "4.0.0-alpha.2" +name: bpdm-bridge-dummy +appVersion: "4.0.0-alpha.4" version: 1.0.0 -description: A Helm chart for deploying the BPDM dummy bridge service +description: A Helm chart for deploying the BPDM bridge dummy service home: https://eclipse-tractusx.github.io/docs/kits/Business%20Partner%20Kit/Adoption%20View sources: - https://github.com/eclipse-tractusx/bpdm diff --git a/charts/bpdm/charts/bpdm-dummy-bridge/LICENSE b/charts/bpdm/charts/bpdm-bridge-dummy/LICENSE similarity index 100% rename from charts/bpdm/charts/bpdm-dummy-bridge/LICENSE rename to charts/bpdm/charts/bpdm-bridge-dummy/LICENSE diff --git a/charts/bpdm/charts/bpdm-dummy-bridge/README.md b/charts/bpdm/charts/bpdm-bridge-dummy/README.md similarity index 100% rename from charts/bpdm/charts/bpdm-dummy-bridge/README.md rename to charts/bpdm/charts/bpdm-bridge-dummy/README.md diff --git a/charts/bpdm/charts/bpdm-dummy-bridge/templates/NOTES.txt b/charts/bpdm/charts/bpdm-bridge-dummy/templates/NOTES.txt similarity index 100% rename from charts/bpdm/charts/bpdm-dummy-bridge/templates/NOTES.txt rename to charts/bpdm/charts/bpdm-bridge-dummy/templates/NOTES.txt diff --git a/charts/bpdm/charts/bpdm-dummy-bridge/templates/_helpers.tpl b/charts/bpdm/charts/bpdm-bridge-dummy/templates/_helpers.tpl similarity index 100% rename from charts/bpdm/charts/bpdm-dummy-bridge/templates/_helpers.tpl rename to charts/bpdm/charts/bpdm-bridge-dummy/templates/_helpers.tpl diff --git a/charts/bpdm/charts/bpdm-dummy-bridge/templates/configMap.yaml b/charts/bpdm/charts/bpdm-bridge-dummy/templates/configMap.yaml similarity index 100% rename from charts/bpdm/charts/bpdm-dummy-bridge/templates/configMap.yaml rename to charts/bpdm/charts/bpdm-bridge-dummy/templates/configMap.yaml diff --git a/charts/bpdm/charts/bpdm-dummy-bridge/templates/deployment.yaml b/charts/bpdm/charts/bpdm-bridge-dummy/templates/deployment.yaml similarity index 99% rename from charts/bpdm/charts/bpdm-dummy-bridge/templates/deployment.yaml rename to charts/bpdm/charts/bpdm-bridge-dummy/templates/deployment.yaml index 08480b902..c6e5f393e 100644 --- a/charts/bpdm/charts/bpdm-dummy-bridge/templates/deployment.yaml +++ b/charts/bpdm/charts/bpdm-bridge-dummy/templates/deployment.yaml @@ -65,7 +65,7 @@ spec: key: password ports: - name: http - containerPort: 8081 + containerPort: 8083 protocol: TCP # @url: https://cloud.google.com/blog/products/containers-kubernetes/kubernetes-best-practices-setting-up-health-checks-with-readiness-and-liveness-probes livenessProbe: diff --git a/charts/bpdm/charts/bpdm-dummy-bridge/templates/ingress.yaml b/charts/bpdm/charts/bpdm-bridge-dummy/templates/ingress.yaml similarity index 100% rename from charts/bpdm/charts/bpdm-dummy-bridge/templates/ingress.yaml rename to charts/bpdm/charts/bpdm-bridge-dummy/templates/ingress.yaml diff --git a/charts/bpdm/charts/bpdm-dummy-bridge/templates/secret.yaml b/charts/bpdm/charts/bpdm-bridge-dummy/templates/secret.yaml similarity index 100% rename from charts/bpdm/charts/bpdm-dummy-bridge/templates/secret.yaml rename to charts/bpdm/charts/bpdm-bridge-dummy/templates/secret.yaml diff --git a/charts/bpdm/charts/bpdm-dummy-bridge/templates/service.yaml b/charts/bpdm/charts/bpdm-bridge-dummy/templates/service.yaml similarity index 100% rename from charts/bpdm/charts/bpdm-dummy-bridge/templates/service.yaml rename to charts/bpdm/charts/bpdm-bridge-dummy/templates/service.yaml diff --git a/charts/bpdm/charts/bpdm-dummy-bridge/values.yaml b/charts/bpdm/charts/bpdm-bridge-dummy/values.yaml similarity index 98% rename from charts/bpdm/charts/bpdm-dummy-bridge/values.yaml rename to charts/bpdm/charts/bpdm-bridge-dummy/values.yaml index d95180c4b..7b36bb8a6 100644 --- a/charts/bpdm/charts/bpdm-dummy-bridge/values.yaml +++ b/charts/bpdm/charts/bpdm-bridge-dummy/values.yaml @@ -25,7 +25,7 @@ replicaCount: 1 image: registry: ghcr.io - repository: catenax-ng/tx-bpdm/dummy-bridge + repository: catenax-ng/tx-bpdm/bridge-dummy pullPolicy: Always # Overrides the image tag whose default is the chart appVersion. tag: "" diff --git a/charts/bpdm/charts/bpdm-gate/Chart.yaml b/charts/bpdm/charts/bpdm-gate/Chart.yaml index b91a87a53..7a0baf041 100644 --- a/charts/bpdm/charts/bpdm-gate/Chart.yaml +++ b/charts/bpdm/charts/bpdm-gate/Chart.yaml @@ -21,7 +21,7 @@ apiVersion: v2 type: application name: bpdm-gate -appVersion: "4.0.0-alpha.3" +appVersion: "4.0.0-alpha.4" version: 4.0.0-alpha.5 description: A Helm chart for deploying the BPDM gate service home: https://eclipse-tractusx.github.io/docs/kits/Business%20Partner%20Kit/Adoption%20View diff --git a/charts/bpdm/charts/bpdm-pool/Chart.yaml b/charts/bpdm/charts/bpdm-pool/Chart.yaml index 2f5514e1f..55e80c02b 100644 --- a/charts/bpdm/charts/bpdm-pool/Chart.yaml +++ b/charts/bpdm/charts/bpdm-pool/Chart.yaml @@ -21,7 +21,7 @@ apiVersion: v2 type: application name: bpdm-pool -appVersion: "4.0.0-alpha.3" +appVersion: "4.0.0-alpha.4" version: 5.0.0-alpha.4 description: A Helm chart for deploying the BPDM pool service home: https://eclipse-tractusx.github.io/docs/kits/Business%20Partner%20Kit/Adoption%20View diff --git a/charts/bpdm/values.yaml b/charts/bpdm/values.yaml index e46d9a01a..628bbc13a 100644 --- a/charts/bpdm/values.yaml +++ b/charts/bpdm/values.yaml @@ -29,12 +29,12 @@ bpdm-pool: postgres: enabled: false -bpdm-dummy-bridge: +bpdm-bridge-dummy: enabled: true replicaCount: 1 image: registry: ghcr.io - repository: catenax-ng/tx-bpdm/dummy-bridge + repository: catenax-ng/tx-bpdm/bridge-dummy pullPolicy: Always tag: "" applicationConfig: From 04514141642ca98d0981bf340fa48a134be689b4 Mon Sep 17 00:00:00 2001 From: "fabio.d.mota" Date: Thu, 25 May 2023 14:42:31 +0100 Subject: [PATCH 4/4] fix(Gate-Pool): downgrade bridge capacity on helm resources --- charts/bpdm/charts/bpdm-bridge-dummy/values.yaml | 8 ++++---- charts/bpdm/charts/bpdm-gate/values.yaml | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/charts/bpdm/charts/bpdm-bridge-dummy/values.yaml b/charts/bpdm/charts/bpdm-bridge-dummy/values.yaml index 7b36bb8a6..5ed07667b 100644 --- a/charts/bpdm/charts/bpdm-bridge-dummy/values.yaml +++ b/charts/bpdm/charts/bpdm-bridge-dummy/values.yaml @@ -62,11 +62,11 @@ ingress: resources: limits: - cpu: 800m - memory: 2Gi + cpu: 200m + memory: 1Gi requests: - cpu: 300m - memory: 2Gi + cpu: 200m + memory: 1Gi nodeSelector: {} diff --git a/charts/bpdm/charts/bpdm-gate/values.yaml b/charts/bpdm/charts/bpdm-gate/values.yaml index 4aae2dde8..d8330f7a1 100644 --- a/charts/bpdm/charts/bpdm-gate/values.yaml +++ b/charts/bpdm/charts/bpdm-gate/values.yaml @@ -62,11 +62,11 @@ ingress: resources: limits: - cpu: 800m + cpu: 500m memory: 2Gi requests: - cpu: 300m - memory: 2Gi + cpu: 200m + memory: 1Gi nodeSelector: {}