Skip to content

Commit 0a64756

Browse files
nhinze23cesmarvin
authored andcommitted
Merge branch 'release/v1.20.0-5'
2 parents bedca57 + 553062a commit 0a64756

File tree

7 files changed

+23
-7
lines changed

7 files changed

+23
-7
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
## [Unreleased]
88

9+
## [v1.20.0-5] - 2025-04-25
10+
11+
### Changed
12+
- [#200] Set sensible resource requests and limits
13+
914
## [v1.20.0-4] - 2025-04-10
1015
### Changed
1116
- Update Tomcat to 9.0.102 [#197]

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ FROM registry.cloudogu.com/official/java:8u432-1
7575
ARG TOMCAT_VERSION
7676

7777
LABEL NAME="official/usermgt" \
78-
VERSION="1.20.0-4" \
78+
VERSION="1.20.0-5" \
7979
maintainer="hello@cloudogu.com"
8080

8181
# mark as webapp for nginx

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Set these to the desired values
22
ARTIFACT_ID=usermgt
3-
VERSION=1.20.0-4
3+
VERSION=1.20.0-5
44
# overwrite ADDITIONAL_LDFLAGS to disable static compilation
55
# this should fix https://github.com/golang/go/issues/13470
66
ADDITIONAL_LDFLAGS=""

docs/gui/release_notes_de.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ Technische Details zu einem Release finden Sie im zugehörigen [Changelog](https
66

77
## [Unreleased]
88

9+
## [v1.20.0-5] - 2025-04-25
10+
### Changed
11+
- Die Verwendung von Speicher und CPU wurden für die Kubernetes-Multinode-Umgebung optimiert.
12+
913
## [v1.20.0-4] - 2025-04-10
1014
### Security
1115
* Das Release behebt die kritische Sicherheitslücke [CVE-2025-24813](https://nvd.nist.gov/vuln/detail/CVE-2025-24813).

docs/gui/release_notes_en.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ Technical details on a release can be found in the corresponding [Changelog](htt
66

77
## [Unreleased]
88

9+
## [v1.20.0-5] - 2025-04-25
10+
### Changed
11+
- Usage of memory and CPU was optimized for the Kubernetes Mutlinode environment.
12+
913
## [v1.20.0-4] - 2025-04-10
1014
### Security
1115
* This release fixes the critical security vulnerability [CVE-2025-24813](https://nvd.nist.gov/vuln/detail/CVE-2025-24813).

dogu.json

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"Name": "official/usermgt",
3-
"Version": "1.20.0-4",
3+
"Version": "1.20.0-5",
44
"DisplayName": "User Management",
55
"Description": "User and Group Management.",
66
"Category": "Administration Apps",
@@ -57,15 +57,17 @@
5757
{
5858
"Name": "container_config/cpu_core_request",
5959
"Description": "Requests the container's minimal CPU core requirement. Use a positive floating value describing a fraction of 1 CPU core. When you define a value of '0.5', you are requesting half as much CPU time compared to if you asked for '1.0' CPU.",
60-
"Optional": true
60+
"Optional": true,
61+
"Default": "0.05"
6162
},
6263
{
6364
"Name": "container_config/memory_request",
6465
"Description": "Requests the container's minimal memory requirement. Use a positive integer value followed by one of these units [b,k,m,g] (byte, kibibyte, mebibyte, gibibyte).",
6566
"Optional": true,
6667
"Validation": {
6768
"Type": "BINARY_MEASUREMENT"
68-
}
69+
},
70+
"Default": "400m"
6971
},
7072
{
7173
"Name": "container_config/storage_limit",
@@ -138,7 +140,8 @@
138140
"Optional": true,
139141
"Validation": {
140142
"Type": "BINARY_MEASUREMENT"
141-
}
143+
},
144+
"Default": "400m"
142145
},
143146
{
144147
"Name": "container_config/swap_limit",

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
"cypress": "^13.13.1",
44
"yarn": "^1.22.22"
55
},
6-
"version": "1.20.0-4"
6+
"version": "1.20.0-5"
77
}

0 commit comments

Comments
 (0)