Skip to content

Commit

Permalink
Merge pull request #622 from catenax-ng/feat/charts/remove-opensearch
Browse files Browse the repository at this point in the history
Feat(Charts): Remove Opensearch
  • Loading branch information
nicoprow authored Dec 11, 2023
2 parents eb83725 + 0fb8b83 commit a10a208
Show file tree
Hide file tree
Showing 16 changed files with 106 additions and 142 deletions.
21 changes: 20 additions & 1 deletion charts/bpdm/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,25 @@ 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

- update application version to 5.0.0

## [3.1.2] - 2023-11-16

### Changed

- update BPDM Pool dependency to 5.1.1
- remove Opensearch dependency

## [3.1.1] - 2023-11-10

### Changed

- update application version to 4.1.0

## [3.1.0] - 2023-11-03

### Added
Expand All @@ -19,4 +38,4 @@ The format is based on Keep a Changelog (https://keepachangelog.com/en/1.0.0/),

### Changed

- increase to app version 4.0.1
- update application version to 4.0.1
19 changes: 7 additions & 12 deletions charts/bpdm/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ apiVersion: v2
name: bpdm
type: application
description: A Helm chart for Kubernetes that deploys the BPDM applications
version: 3.1.2
appVersion: "4.1.0"
version: 4.0.0-alpha.0
appVersion: "5.0.0-alpha.0"
home: https://github.com/eclipse-tractusx/bpdm
sources:
- https://github.com/eclipse-tractusx/bpdm
Expand All @@ -33,30 +33,25 @@ maintainers:

dependencies:
- name: bpdm-gate
version: 4.1.0
version: 5.0.0-alpha.0
alias: bpdm-gate
condition: bpdm-gate.enabled
- name: bpdm-pool
version: 5.1.0
version: 6.0.0-alpha.0
alias: bpdm-pool
condition: bpdm-pool.enabled
- name: bpdm-bridge-dummy
version: 1.1.0
version: 2.0.0-alpha.0
alias: bpdm-bridge-dummy
condition: bpdm-bridge-dummy.enabled
- name: bpdm-cleaning-service-dummy
version: 1.0.2
version: 2.0.0-alpha.0
alias: bpdm-cleaning-service-dummy
condition: bpdm-cleaning-service-dummy.enabled
- name: bpdm-orchestrator
version: 1.0.1
version: 2.0.0-alpha.0
alias: bpdm-orchestrator
condition: bpdm-orchestrator.enabled
- name: opensearch
version: 2.12.2
repository: https://opensearch-project.github.io/helm-charts/
alias: opensearch
condition: opensearch.enabled
- name: postgresql
version: 11.9.13
repository: https://charts.bitnami.com/bitnami
Expand Down
12 changes: 9 additions & 3 deletions charts/bpdm/charts/bpdm-bridge-dummy/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,29 @@ 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/),

## [2.0.0] - tbd

### Changed

- update application version to 5.0.0

## [1.1.0] - 2023-11-03

### Changed

- increase to app version 4.1.0
- update application version to 4.1.0

## [1.0.2] - 2023-08-28

### Changed

- increase to app version 4.0.1
- update application version to 4.0.1

## [1.0.1] - 2023-08-18

### Changed

- increase to app version 4.0.0
- update application version to 4.0.0
- add missing license headers to ingress templates
- change default registry for image to dockerhub

Expand Down
4 changes: 2 additions & 2 deletions charts/bpdm/charts/bpdm-bridge-dummy/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
apiVersion: v2
type: application
name: bpdm-bridge-dummy
appVersion: "4.1.0"
version: 1.1.0
appVersion: "5.0.0-alpha.0"
version: 2.0.0-alpha.0
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:
Expand Down
2 changes: 2 additions & 0 deletions charts/bpdm/charts/bpdm-bridge-dummy/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,8 @@ startupProbe:

# Used to overwrite the default property values of the application configuration
applicationConfig:
server:
port: 8083
# bpdm:
# pool:
# base-url: ...
Expand Down
18 changes: 18 additions & 0 deletions charts/bpdm/charts/bpdm-cleaning-service-dummy/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,24 @@ 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/),

## [2.0.0] - tbd

### Change

- Update application version to 5.0.0

## [1.0.2] - 2023-11-23

### Change

- Update readme outdated information

## [1.0.1] - 2023-11-03

### Change

- Fix faulty inlining of template files

## [1.0.0] - 2023-11-03

### Added
Expand Down
4 changes: 2 additions & 2 deletions charts/bpdm/charts/bpdm-cleaning-service-dummy/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
apiVersion: v2
type: application
name: bpdm-cleaning-service-dummy
appVersion: "4.1.0"
version: 1.0.2
appVersion: "5.0.0-alpha.0"
version: 2.0.0-alpha.0
description: A Helm chart for deploying the BPDM cleaning service
home: https://eclipse-tractusx.github.io/docs/kits/Business%20Partner%20Kit/Adoption%20View
sources:
Expand Down
26 changes: 16 additions & 10 deletions charts/bpdm/charts/bpdm-gate/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,26 +1,32 @@
# Changelog
^# 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/),

## [5.0.0] - tbd

### Changed

- Update application version to 5.0.0

## [4.1.0] - 2023-11-03

### Changed

- increase to app version 4.1.0
- Update application version to 4.1.0

## [4.0.1] - 2023-08-28

### Changed

- increase to app version 4.0.1
- Update application version to 4.0.1

## [4.0.0] - 2023-08-18

### Changed

- increase to app version 4.0.0
- Update application version to 4.0.0
- add missing license headers to ingress templates
- change default registry for image to dockerhub

Expand All @@ -32,7 +38,7 @@ The format is based on Keep a Changelog (https://keepachangelog.com/en/1.0.0/),

### Changed

- increase to app version 3.2.0
- Update application version to 3.2.0

## [3.2.0] - 2023-03-16

Expand All @@ -44,19 +50,19 @@ The format is based on Keep a Changelog (https://keepachangelog.com/en/1.0.0/),

### Changed

- increase to app version 3.1.0
- Update application version to 3.1.0

## [3.0.6] - 2023-02-24

### Changed

- increase to app version 3.0.3
- Update application version to 3.0.3

## [3.0.5] - 2023-02-16

### Changed

- support app version 3.0.2
- Update application version to 3.0.2

### Fixed

Expand All @@ -77,7 +83,7 @@ The format is based on Keep a Changelog (https://keepachangelog.com/en/1.0.0/),

### Changed

- AppVersion to 3.0.1
- Update application version to 3.0.1

## [3.0.2] - 2022-01-23

Expand All @@ -89,4 +95,4 @@ The format is based on Keep a Changelog (https://keepachangelog.com/en/1.0.0/),

## Changed

- AppVersion to 3.0.0
- Update application version to 3.0.0
4 changes: 2 additions & 2 deletions charts/bpdm/charts/bpdm-gate/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
apiVersion: v2
type: application
name: bpdm-gate
appVersion: "4.1.0"
version: 4.1.0
appVersion: "5.0.0-alpha.0"
version: 5.0.0-alpha.0
description: A Helm chart for deploying the BPDM gate service
home: https://eclipse-tractusx.github.io/docs/kits/Business%20Partner%20Kit/Adoption%20View
sources:
Expand Down
12 changes: 12 additions & 0 deletions charts/bpdm/charts/bpdm-orchestrator/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,18 @@ 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/),

## [2.0.0] - tbd

### Changed

- Update application version to 5.0.0

## [1.0.1] - 2023-11-23

### Changed

- Fix faulty inlining in template files

## [1.0.0] - 2023-11-03

### Added
Expand Down
4 changes: 2 additions & 2 deletions charts/bpdm/charts/bpdm-orchestrator/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
apiVersion: v2
type: application
name: bpdm-orchestrator
appVersion: "4.1.0"
version: 1.0.1
appVersion: "5.0.0-alpha.0"
version: 2.0.0-alpha.0
description: A Helm chart for deploying the BPDM Orchestrator service
home: https://eclipse-tractusx.github.io/docs/kits/Business%20Partner%20Kit/Adoption%20View
sources:
Expand Down
12 changes: 12 additions & 0 deletions charts/bpdm/charts/bpdm-pool/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,18 @@ 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/),

## [6.0.0] - tbd

### Changed

- Update application version to 5.0.0

## [5.1.1] - 2023-11-16

### Changed

- remove Opensearch dependency

## [5.1.0] - 2023-11-03

### Changed
Expand Down
9 changes: 2 additions & 7 deletions charts/bpdm/charts/bpdm-pool/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,13 @@
apiVersion: v2
type: application
name: bpdm-pool
appVersion: "4.1.0"
version: 5.1.0
appVersion: "5.0.0-alpha.0"
version: 6.0.0-alpha.0
description: A Helm chart for deploying the BPDM pool service
home: https://eclipse-tractusx.github.io/docs/kits/Business%20Partner%20Kit/Adoption%20View
sources:
- https://github.com/eclipse-tractusx/bpdm
dependencies:
- name: opensearch
version: 2.12.2
repository: https://opensearch-project.github.io/helm-charts/
alias: opensearch
condition: opensearch.enabled
- name: postgresql
version: 11.9.13
repository: https://charts.bitnami.com/bitnami
Expand Down
2 changes: 0 additions & 2 deletions charts/bpdm/charts/bpdm-pool/templates/configMap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@ data:
bpdm:
datasource:
host: {{ include "bpdm.postgresDependency" . }}
opensearch:
host: {{ include "bpdm.opensearchDependency" . }}
external.yml: |-
# External properties for overwriting application config
{{- if .Values.applicationConfig }}
Expand Down
49 changes: 0 additions & 49 deletions charts/bpdm/charts/bpdm-pool/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -130,52 +130,3 @@ postgres:
database: bpdm
username: bpdm

opensearch:
enabled: true
replicas: 1
protocol: http
roles:
- master
- ingest
- data
resources:
limits:
cpu: 300m
memory: 2Gi
requests:
cpu: 100m
memory: 2Gi
config:
opensearch.yml: |
cluster.name: opensearch-cluster
# Bind to all interfaces because we don't know what
# IP address Docker will assign to us.
network.host: 0.0.0.0
# Disable security
plugins.security.disabled: true
securityConfig:
enabled: false
extraInitContainers:
# Image that performs the sysctl operation to modify Kernel settings
# needed sometimes to avoid boot errors
- name: sysctl
image: docker.io/bitnami/bitnami-shell:10-debian-10-r199
imagePullPolicy: "IfNotPresent"
command:
- /bin/bash
- -ec
- |
CURRENT=`sysctl -n vm.max_map_count`;
DESIRED="262144";
if [ "$DESIRED" -gt "$CURRENT" ]; then
sysctl -w vm.max_map_count=262144;
fi;
CURRENT=`sysctl -n fs.file-max`;
DESIRED="65536";
if [ "$DESIRED" -gt "$CURRENT" ]; then
sysctl -w fs.file-max=65536;
fi;
securityContext:
runAsUser: 0
privileged: true

Loading

0 comments on commit a10a208

Please sign in to comment.