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.

Sign up for GitHub

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

Jump to bottom

Release icm:patch icm-replication:patch #795

Merged
merged 4 commits into from
Aug 26, 2024
Merged

Release icm:patch icm-replication:patch #795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c61cbeb
Merge pull request #791 from intershop/feature/icm/integrate-main
khauser Aug 12, 2024
9cb16c0
fix(icm): no command overwrite in wa and waa (#793)
khauser Aug 26, 2024
97973f9
chore: bump versions of icm:patch icm-replication:patch
khauser Aug 26, 2024
96cbd55
chore: generated changelog+release notes for icm:patch icm-replicatio…
khauser Aug 26, 2024
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 charts/icm-replication/.bumpversion.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tool.bumpversion]
current_version = "2.5.0"
current_version = "2.5.1"

[[tool.bumpversion.files]]
filename = "Chart.yaml"
Expand Down
25 changes: 25 additions & 0 deletions charts/icm-replication/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,36 @@

<a name="icm-replication-2.5.1"></a>
## [icm-replication-2.5.1](https://github.com/intershop/helm-charts/compare/icm-replication-2.5.0...icm-replication-2.5.1)

> 2024-08-26

### Chore

* bump versions of icm:patch icm-replication:patch

### Fix

* **icm:** no command overwrite in wa and waa ([#793](https://github.com/intershop/helm-charts/issues/793))


<a name="icm-replication-2.5.0"></a>
## [icm-replication-2.5.0](https://github.com/intershop/helm-charts/compare/icm-replication-2.4.0...icm-replication-2.5.0)

> 2024-08-12

### Chore

* bump versions of icm-as:minor icm-web:minor


<a name="icm-replication-2.4.0"></a>
## [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

* generated changelog+release notes for icm:minor icm-replication:minor
* bump versions of icm:minor icm-replication:minor

### Feat
Expand Down
6 changes: 3 additions & 3 deletions charts/icm-replication/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.5.0
version: 2.5.1
annotations:
requestedMemoryQuota: 9Gi
requestedCpuQuotaInMinutes: 3000
dependencies:
- name: icm
version: 2.5.0
version: 2.5.1
repository: file://../icm
alias: icm-live
- name: icm
version: 2.5.0
version: 2.5.1
repository: file://../icm
alias: icm-edit
12 changes: 6 additions & 6 deletions charts/icm-replication/RELEASE_NOTES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@

<a name="icm-replication-2.4.0"></a>
## [icm-replication-2.4.0](https://github.com/intershop/helm-charts/compare/icm-replication-2.3.0...icm-replication-2.4.0)
<a name="icm-replication-2.5.1"></a>
## [icm-replication-2.5.1](https://github.com/intershop/helm-charts/compare/icm-replication-2.5.0...icm-replication-2.5.1)

> 2024-08-05
> 2024-08-26

### Chore

* bump versions of icm:minor icm-replication:minor
* bump versions of icm:patch icm-replication:patch

### Feat
### Fix

* **icm:** prevent test abortions ([#775](https://github.com/intershop/helm-charts/issues/775))
* **icm:** no command overwrite in wa and waa ([#793](https://github.com/intershop/helm-charts/issues/793))

20 changes: 0 additions & 20 deletions charts/icm-replication/values-iste_linux.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,19 +92,9 @@ icm-edit:
"cluster-autoscaler.kubernetes.io/safe-to-evict": "false"
image:
repository: "${ICM_WEBSERVER_IMAGE}"
command: |
mkdir -p $HELM_DIRECTORY/server-logs-edit
chown -R ${SERVER_DIRECTORY_USER}:${SERVER_DIRECTORY_GROUP} ${HELM_DIRECTORY}/server-logs-edit
timestamp=$(date '+%Y-%m-%d_%H_%M_%S')
su ${SERVER_DIRECTORY_USER} -c "/intershop/bin/intershop.sh 2>&1 | tee outfile $HELM_DIRECTORY/server-logs-edit/wa${timestamp}.log"
agent:
image:
repository: "${ICM_WEBADAPTER_AGENT_IMAGE}"
command: |
mkdir -p $HELM_DIRECTORY/server-logs-edit
chown -R ${SERVER_DIRECTORY_USER}:${SERVER_DIRECTORY_GROUP} ${HELM_DIRECTORY}/server-logs-edit
timestamp=$(date '+%Y-%m-%d_%H_%M_%S')
su ${SERVER_DIRECTORY_USER} -c "/intershop/bin/start-waa.sh 2>&1 | tee outfile $HELM_DIRECTORY/server-logs-edit/waa${timestamp}.log"
podSecurityContext:
runAsUser: 0
runAsGroup: 0
Expand Down Expand Up @@ -235,19 +225,9 @@ icm-live:
"cluster-autoscaler.kubernetes.io/safe-to-evict": "false"
image:
repository: "${ICM_WEBSERVER_IMAGE}"
command: |
mkdir -p $HELM_DIRECTORY/server-logs-live
chown -R ${SERVER_DIRECTORY_USER}:${SERVER_DIRECTORY_GROUP} ${HELM_DIRECTORY}/server-logs-live
timestamp=$(date '+%Y-%m-%d_%H_%M_%S')
su ${SERVER_DIRECTORY_USER} -c "/intershop/bin/intershop.sh 2>&1 | tee outfile $HELM_DIRECTORY/server-logs-live/wa${timestamp}.log"
agent:
image:
repository: "${ICM_WEBADAPTER_AGENT_IMAGE}"
command: |
mkdir -p $HELM_DIRECTORY/server-logs-live
chown -R ${SERVER_DIRECTORY_USER}:${SERVER_DIRECTORY_GROUP} ${HELM_DIRECTORY}/server-logs-live
timestamp=$(date '+%Y-%m-%d_%H_%M_%S')
su ${SERVER_DIRECTORY_USER} -c "/intershop/bin/start-waa.sh 2>&1 | tee outfile $HELM_DIRECTORY/server-logs-live/waa${timestamp}.log"
podSecurityContext:
runAsUser: 0
runAsGroup: 0
Expand Down
2 changes: 1 addition & 1 deletion charts/icm/.bumpversion.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tool.bumpversion]
current_version = "2.5.0"
current_version = "2.5.1"

[[tool.bumpversion.files]]
filename = "Chart.yaml"
Expand Down
25 changes: 25 additions & 0 deletions charts/icm/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,36 @@

<a name="icm-2.5.1"></a>
## [icm-2.5.1](https://github.com/intershop/helm-charts/compare/icm-2.5.0...icm-2.5.1)

> 2024-08-26

### Chore

* bump versions of icm:patch icm-replication:patch

### Fix

* **icm:** no command overwrite in wa and waa ([#793](https://github.com/intershop/helm-charts/issues/793))


<a name="icm-2.5.0"></a>
## [icm-2.5.0](https://github.com/intershop/helm-charts/compare/icm-2.4.0...icm-2.5.0)

> 2024-08-12

### Chore

* bump versions of icm-as:minor icm-web:minor


<a name="icm-2.4.0"></a>
## [icm-2.4.0](https://github.com/intershop/helm-charts/compare/icm-2.3.0...icm-2.4.0)

> 2024-08-05

### Chore

* generated changelog+release notes for icm:minor icm-replication:minor
* bump versions of icm:minor icm-replication:minor

### Feat
Expand Down
2 changes: 1 addition & 1 deletion charts/icm/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ 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.5.0
version: 2.5.1
# test related annotations
annotations:
requestedMemoryQuota: 6000Mi
Expand Down
12 changes: 6 additions & 6 deletions charts/icm/RELEASE_NOTES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@

<a name="icm-2.4.0"></a>
## [icm-2.4.0](https://github.com/intershop/helm-charts/compare/icm-2.3.0...icm-2.4.0)
<a name="icm-2.5.1"></a>
## [icm-2.5.1](https://github.com/intershop/helm-charts/compare/icm-2.5.0...icm-2.5.1)

> 2024-08-05
> 2024-08-26

### Chore

* bump versions of icm:minor icm-replication:minor
* bump versions of icm:patch icm-replication:patch

### Feat
### Fix

* **icm:** prevent test abortions ([#775](https://github.com/intershop/helm-charts/issues/775))
* **icm:** no command overwrite in wa and waa ([#793](https://github.com/intershop/helm-charts/issues/793))

10 changes: 0 additions & 10 deletions charts/icm/values-iste_linux.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,19 +91,9 @@ icm-web:
"cluster-autoscaler.kubernetes.io/safe-to-evict": "false"
image:
repository: "${ICM_WEBSERVER_IMAGE}"
command: |
mkdir -p $HELM_DIRECTORY/server-logs
chown -R ${SERVER_DIRECTORY_USER}:${SERVER_DIRECTORY_GROUP} ${HELM_DIRECTORY}/server-logs
timestamp=$(date '+%Y-%m-%d_%H_%M_%S')
su ${SERVER_DIRECTORY_USER} -c "/intershop/bin/intershop.sh 2>&1 | tee outfile $HELM_DIRECTORY/server-logs/wa${timestamp}.log"
agent:
image:
repository: "${ICM_WEBADAPTER_AGENT_IMAGE}"
command: |
mkdir -p $HELM_DIRECTORY/server-logs
chown -R ${SERVER_DIRECTORY_USER}:${SERVER_DIRECTORY_GROUP} ${HELM_DIRECTORY}/server-logs
timestamp=$(date '+%Y-%m-%d_%H_%M_%S')
su ${SERVER_DIRECTORY_USER} -c "/intershop/bin/start-waa.sh 2>&1 | tee outfile $HELM_DIRECTORY/server-logs/waa${timestamp}.log"
podSecurityContext:
runAsUser: 0
runAsGroup: 0
Expand Down
Loading