diff --git a/charts/icm-replication/.bumpversion.toml b/charts/icm-replication/.bumpversion.toml index e9e8ce90..6c2970c5 100644 --- a/charts/icm-replication/.bumpversion.toml +++ b/charts/icm-replication/.bumpversion.toml @@ -1,5 +1,5 @@ [tool.bumpversion] -current_version = "2.3.0" +current_version = "2.4.0" [[tool.bumpversion.files]] filename = "Chart.yaml" diff --git a/charts/icm-replication/CHANGELOG.md b/charts/icm-replication/CHANGELOG.md index fdbbf672..d3deacd4 100644 --- a/charts/icm-replication/CHANGELOG.md +++ b/charts/icm-replication/CHANGELOG.md @@ -1,4 +1,42 @@ + +## [icm-replication-2.4.0](https://github.com/intershop/helm-charts/compare/icm-replication-2.3.0...icm-replication-2.4.0) + +> 2024-08-05 + +### Chore + +* bump versions of icm:minor icm-replication:minor + +### Feat + +* **icm:** prevent test abortions ([#775](https://github.com/intershop/helm-charts/issues/775)) + + + +## [icm-replication-2.3.0](https://github.com/intershop/helm-charts/compare/icm-replication-2.2.2...icm-replication-2.3.0) + +> 2024-07-24 + +### Chore + +* bump versions of icm-web:minor + + + +## [icm-replication-2.2.2](https://github.com/intershop/helm-charts/compare/icm-replication-2.2.1...icm-replication-2.2.2) + +> 2024-07-19 + +### Chore + +* bump versions of icm-as:patch + +### Fix + +* **icm:** test performance optimized ([#764](https://github.com/intershop/helm-charts/issues/764)) + + ## [icm-replication-2.2.1](https://github.com/intershop/helm-charts/compare/icm-replication-2.2.0...icm-replication-2.2.1) @@ -6,6 +44,7 @@ ### Chore +* generated changelog+release notes for icm:patch icm-replication:patch * bump versions of icm:patch icm-replication:patch ### Fix diff --git a/charts/icm-replication/Chart.yaml b/charts/icm-replication/Chart.yaml index 2bf43fb2..6181a4c2 100644 --- a/charts/icm-replication/Chart.yaml +++ b/charts/icm-replication/Chart.yaml @@ -3,16 +3,16 @@ appVersion: "11.9.0" description: Intershop Commerce Management - ICM Replication # name and version must be in this exact order, otherwise bump2version won't work name: icm-replication -version: 2.3.0 +version: 2.4.0 annotations: requestedMemoryQuota: 9Gi requestedCpuQuotaInMinutes: 3000 dependencies: - name: icm - version: 2.3.0 + version: 2.4.0 repository: file://../icm alias: icm-live - name: icm - version: 2.3.0 + version: 2.4.0 repository: file://../icm alias: icm-edit diff --git a/charts/icm-replication/RELEASE_NOTES.md b/charts/icm-replication/RELEASE_NOTES.md index eba1ee85..76bebb10 100644 --- a/charts/icm-replication/RELEASE_NOTES.md +++ b/charts/icm-replication/RELEASE_NOTES.md @@ -1,14 +1,14 @@ - -## [icm-replication-2.2.1](https://github.com/intershop/helm-charts/compare/icm-replication-2.2.0...icm-replication-2.2.1) + +## [icm-replication-2.4.0](https://github.com/intershop/helm-charts/compare/icm-replication-2.3.0...icm-replication-2.4.0) -> 2024-07-17 +> 2024-08-05 ### Chore -* bump versions of icm:patch icm-replication:patch +* bump versions of icm:minor icm-replication:minor -### Fix +### Feat -* **icm:** use logger instead of tee ([#716](https://github.com/intershop/helm-charts/issues/716)) +* **icm:** prevent test abortions ([#775](https://github.com/intershop/helm-charts/issues/775)) diff --git a/charts/icm-replication/values-iste_linux.tmpl b/charts/icm-replication/values-iste_linux.tmpl index ee4b2be1..2aa64ea8 100644 --- a/charts/icm-replication/values-iste_linux.tmpl +++ b/charts/icm-replication/values-iste_linux.tmpl @@ -327,6 +327,9 @@ icm-live: disable-access-log: "true" resources: requests: + cpu: 100m + memory: 90Mi + limits: cpu: 200m memory: 300Mi diff --git a/charts/icm/.bumpversion.toml b/charts/icm/.bumpversion.toml index 446987e9..1eec91d5 100644 --- a/charts/icm/.bumpversion.toml +++ b/charts/icm/.bumpversion.toml @@ -1,5 +1,5 @@ [tool.bumpversion] -current_version = "2.3.0" +current_version = "2.4.0" [[tool.bumpversion.files]] filename = "Chart.yaml" diff --git a/charts/icm/CHANGELOG.md b/charts/icm/CHANGELOG.md index 6b10b6e1..8af88cc4 100644 --- a/charts/icm/CHANGELOG.md +++ b/charts/icm/CHANGELOG.md @@ -1,4 +1,42 @@ + +## [icm-2.4.0](https://github.com/intershop/helm-charts/compare/icm-2.3.0...icm-2.4.0) + +> 2024-08-05 + +### Chore + +* bump versions of icm:minor icm-replication:minor + +### Feat + +* **icm:** prevent test abortions ([#775](https://github.com/intershop/helm-charts/issues/775)) + + + +## [icm-2.3.0](https://github.com/intershop/helm-charts/compare/icm-2.2.2...icm-2.3.0) + +> 2024-07-24 + +### Chore + +* bump versions of icm-web:minor + + + +## [icm-2.2.2](https://github.com/intershop/helm-charts/compare/icm-2.2.1...icm-2.2.2) + +> 2024-07-19 + +### Chore + +* bump versions of icm-as:patch + +### Fix + +* **icm:** test performance optimized ([#764](https://github.com/intershop/helm-charts/issues/764)) + + ## [icm-2.2.1](https://github.com/intershop/helm-charts/compare/icm-2.2.0...icm-2.2.1) @@ -6,6 +44,7 @@ ### Chore +* generated changelog+release notes for icm:patch icm-replication:patch * bump versions of icm:patch icm-replication:patch ### Fix diff --git a/charts/icm/Chart.yaml b/charts/icm/Chart.yaml index 035ac4a1..34e84fcd 100644 --- a/charts/icm/Chart.yaml +++ b/charts/icm/Chart.yaml @@ -3,11 +3,11 @@ appVersion: "12.0.0" description: Intershop Commerce Management - ICM # name and version must be in this exact order, otherwise bump2version won't work name: icm -version: 2.3.0 +version: 2.4.0 # test related annotations annotations: - requestedMemoryQuota: 5300Mi - requestedCpuQuotaInMinutes: "2000" + requestedMemoryQuota: 6000Mi + requestedCpuQuotaInMinutes: "2200" dependencies: - name: icm-as version: 2.0.3 @@ -17,7 +17,7 @@ dependencies: repository: file://../icm-web condition: icm-web.enabled - name: ingress-nginx - version: 4.9.0 + version: 4.11.1 repository: https://kubernetes.github.io/ingress-nginx condition: ingress-nginx.enabled - name: mailhog diff --git a/charts/icm/RELEASE_NOTES.md b/charts/icm/RELEASE_NOTES.md index c06960b9..e81a3879 100644 --- a/charts/icm/RELEASE_NOTES.md +++ b/charts/icm/RELEASE_NOTES.md @@ -1,14 +1,14 @@ - -## [icm-2.2.1](https://github.com/intershop/helm-charts/compare/icm-2.2.0...icm-2.2.1) + +## [icm-2.4.0](https://github.com/intershop/helm-charts/compare/icm-2.3.0...icm-2.4.0) -> 2024-07-17 +> 2024-08-05 ### Chore -* bump versions of icm:patch icm-replication:patch +* bump versions of icm:minor icm-replication:minor -### Fix +### Feat -* **icm:** use logger instead of tee ([#716](https://github.com/intershop/helm-charts/issues/716)) +* **icm:** prevent test abortions ([#775](https://github.com/intershop/helm-charts/issues/775)) diff --git a/charts/icm/values-iste_linux.tmpl b/charts/icm/values-iste_linux.tmpl index 4ec4f3cb..44d63868 100644 --- a/charts/icm/values-iste_linux.tmpl +++ b/charts/icm/values-iste_linux.tmpl @@ -183,6 +183,9 @@ ingress-nginx: disable-access-log: "true" resources: requests: + cpu: 100m + memory: 90Mi + limits: cpu: 200m memory: 300Mi