Skip to content

Commit 0eb6c4b

Browse files
nhinze23cesmarvin
authored andcommitted
Merge branch 'release/v2.0.2'
2 parents fb37c97 + 8096259 commit 0eb6c4b

File tree

6 files changed

+64
-96
lines changed

6 files changed

+64
-96
lines changed

CHANGELOG.md

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

77
## [Unreleased]
88

9+
## [v2.0.2] - 2025-12-03
10+
### Changed
11+
- Update minio to reduce CVEs with a kubectl image change.
12+
913
## [v2.0.1] - 2025-12-02
1014
### Fixed
1115
- [#34] Update k8s-ces-gateway to v2.0.1 to use the correct controller class name `ingress-nginx`.

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
ARTIFACT_ID=ecosystem-core
33
ARTIFACT_ID_DEFAULT_CONFIG=${ARTIFACT_ID}-default-config
44

5-
VERSION=2.0.1
5+
VERSION=2.0.2
66
GOTAG?=1.25.1
77

88
ADDITIONAL_CLEAN=clean_charts

docs/operations/argoCD_de.md

Lines changed: 28 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -147,57 +147,39 @@ spec:
147147
### blueprint
148148
149149
```yaml
150-
apiVersion: k8s.cloudogu.com/v2
151-
kind: Blueprint
150+
apiVersion: argoproj.io/v1alpha1
151+
kind: Application
152152
metadata:
153-
labels:
154-
app: ces
155-
app.kubernetes.io/name: k8s-blueprint-lib
156153
name: blueprint
154+
namespace: argocd
157155
annotations:
158156
argocd.argoproj.io/sync-wave: "1"
159-
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
157+
finalizers:
158+
- resources-finalizer.argocd.argoproj.io
160159
spec:
161-
blueprint:
162-
dogus:
163-
- name: "official/ldap"
164-
version: "2.6.8-4"
165-
- name: "official/gotenberg"
166-
version: "8.18.0-1"
167-
- name: "official/jenkins"
168-
version: "2.492.3-4"
169-
- name: "official/cockpit"
170-
version: "2.3.0-3"
171-
- name: "official/mysql"
172-
version: "8.4.6-1"
173-
- name: "official/nexus"
174-
version: "3.75.0-4"
175-
- name: "official/plantuml"
176-
version: "2025.2-1"
177-
- name: "official/postfix"
178-
version: "3.10.2-2"
179-
- name: "official/postgresql"
180-
version: "14.17-1"
181-
- name: "official/redis"
182-
version: "6.2.17-2"
183-
- name: "official/redmine"
184-
version: "5.1.6-2"
185-
- name: "official/scm"
186-
version: "3.8.0-1"
187-
- name: "official/smeagol"
188-
version: "1.7.8-1"
189-
- name: "official/sonar"
190-
version: "25.1.0-3"
191-
- name: "official/swaggerui"
192-
version: "5.21.0-1"
193-
- name: "official/usermgt"
194-
version: "1.20.0-4"
195-
- name: "premium/admin"
196-
version: "2.13.2-1"
197-
- name: "premium/grafana"
198-
version: "11.5.2-1"
199-
- name: "official/cas"
200-
version: "7.2.6-3"
160+
project: default
161+
source:
162+
repoURL: registry.cloudogu.com/k8s
163+
chart: k8s-blueprint
164+
targetRevision: "1.1.1"
165+
path: "." # required for Helm OCI sources
166+
# You can override the default configuration here.
167+
# See https://github.com/cloudogu/k8s-blueprint-helm/blob/develop/k8s/helm/values.yaml for all available options.
168+
#helm:
169+
# valuesObject:
170+
# spec:
171+
# blueprint:
172+
# official/cas: "7.2.7-5"
173+
destination:
174+
server: https://kubernetes.default.svc
175+
namespace: ecosystem
176+
syncPolicy:
177+
automated:
178+
prune: true
179+
selfHeal: true
180+
syncOptions:
181+
- CreateNamespace=true
182+
- PruneLast=true # safer deletion
201183
```
202184
203185
### CES-MN

docs/operations/argoCD_en.md

Lines changed: 28 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -146,57 +146,39 @@ spec:
146146
### blueprint
147147
148148
```yaml
149-
apiVersion: k8s.cloudogu.com/v2
150-
kind: Blueprint
149+
apiVersion: argoproj.io/v1alpha1
150+
kind: Application
151151
metadata:
152-
labels:
153-
app: ces
154-
app.kubernetes.io/name: k8s-blueprint-lib
155152
name: blueprint
153+
namespace: argocd
156154
annotations:
157155
argocd.argoproj.io/sync-wave: "1"
158-
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
156+
finalizers:
157+
- resources-finalizer.argocd.argoproj.io
159158
spec:
160-
blueprint:
161-
dogus:
162-
- name: "official/ldap"
163-
version: "2.6.8-4"
164-
- name: "official/gotenberg"
165-
version: "8.18.0-1"
166-
- name: "official/jenkins"
167-
version: "2.492.3-4"
168-
- name: "official/cockpit"
169-
version: "2.3.0-3"
170-
- name: "official/mysql"
171-
version: "8.4.6-1"
172-
- name: "official/nexus"
173-
version: "3.75.0-4"
174-
- name: "official/plantuml"
175-
version: "2025.2-1"
176-
- name: "official/postfix"
177-
version: "3.10.2-2"
178-
- name: "official/postgresql"
179-
version: "14.17-1"
180-
- name: "official/redis"
181-
version: "6.2.17-2"
182-
- name: "official/redmine"
183-
version: "5.1.6-2"
184-
- name: "official/scm"
185-
version: "3.8.0-1"
186-
- name: "official/smeagol"
187-
version: "1.7.8-1"
188-
- name: "official/sonar"
189-
version: "25.1.0-3"
190-
- name: "official/swaggerui"
191-
version: "5.21.0-1"
192-
- name: "official/usermgt"
193-
version: "1.20.0-4"
194-
- name: "premium/admin"
195-
version: "2.13.2-1"
196-
- name: "premium/grafana"
197-
version: "11.5.2-1"
198-
- name: "official/cas"
199-
version: "7.2.6-3"
159+
project: default
160+
source:
161+
repoURL: registry.cloudogu.com/k8s
162+
chart: k8s-blueprint
163+
targetRevision: "1.1.1"
164+
path: "." # required for Helm OCI sources
165+
# You can override the default configuration here.
166+
# See https://github.com/cloudogu/k8s-blueprint-helm/blob/develop/k8s/helm/values.yaml for all available options.
167+
#helm:
168+
# valuesObject:
169+
# spec:
170+
# blueprint:
171+
# official/cas: "7.2.7-5"
172+
destination:
173+
server: https://kubernetes.default.svc
174+
namespace: ecosystem
175+
syncPolicy:
176+
automated:
177+
prune: true
178+
selfHeal: true
179+
syncOptions:
180+
- CreateNamespace=true
181+
- PruneLast=true # safer deletion
200182
```
201183
202184
### CES-MN

k8s/helm/component-patch-tpl.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v1
22
values:
33
images:
44
componentOperator: cloudogu/k8s-component-operator:1.12.0
5-
defaultConfig: cloudogu/ecosystem-core-default-config:2.0.1
5+
defaultConfig: cloudogu/ecosystem-core-default-config:2.0.2
66
kubectl: docker.io/alpine/kubectl:1.34.0
77
patches:
88
values.yaml:

k8s/helm/values.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ monitoring:
5757
k8s-prometheus:
5858
version: 75.3.5-3
5959
k8s-minio:
60-
version: 2025.6.13-2
60+
version: 2025.6.13-3
6161
k8s-loki:
6262
version: 3.3.2-6
6363
k8s-promtail:
@@ -78,7 +78,7 @@ defaultConfig:
7878
image:
7979
registry: docker.io
8080
repository: cloudogu/ecosystem-core-default-config
81-
tag: 2.0.1
81+
tag: 2.0.2
8282
imagePullPolicy: IfNotPresent
8383
env:
8484
logLevel: info

0 commit comments

Comments
 (0)