Skip to content

Commit 553c4e5

Browse files
author
Leon
committed
Merge branch 'release/v6.0.1'
2 parents 489e4fc + 2ee3092 commit 553c4e5

17 files changed

Lines changed: 170 additions & 15 deletions

‎.blueprint-override.yaml.template‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# copy this to .blueprint-override.yaml to override the default blueprint
12
apiVersion: k8s.cloudogu.com/v3
23
kind: Blueprint
34
metadata:
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# copy this to .ecosystem-core-values-patch.yaml to patch the default values
2+
backup:
3+
enabled: true
4+
monitoring:
5+
enabled: true

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,11 @@ terraform.tfvars
2525
.additionalValues.yaml
2626
# generated blueprint file
2727
.blueprint.yaml
28+
29+
# override and patch files
2830
.blueprint-override.yaml
31+
.longhorn-values-patch.yaml
32+
.ecosystem-core-values-patch.yaml
2933

3034
**/gcp_sa.json
3135
**/.terraform
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# copy this to longhorn-values-patch.yaml to patch the default values
2+
defaultBackupStore:
3+
backupTarget: s3://longhorn@dummyregion/
4+
backupTargetCredentialSecret: longhorn-backup-target

‎CHANGELOG.md‎

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

88
## [Unreleased]
99

10+
## [v6.0.1] - 2026-06-02
11+
### Changed
12+
- [#142] activate Cilium NetworkPolicy in terraform module
13+
1014
## [v6.0.0] - 2026-04-13
1115
### Changed
1216
- [#137] prepare modules for using with ecosystem-core v4
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
apiVersion: k8s.cloudogu.com/v3
2+
kind: Blueprint
3+
metadata:
4+
labels:
5+
app: ces
6+
app.kubernetes.io/name: k8s-blueprint-lib
7+
name: blueprint
8+
spec:
9+
displayName: "k3ces.localdomain"
10+
stopped: false
11+
blueprint:
12+
dogus: []
13+
config:
14+
dogus: {}
15+
global:
16+
- key: "fqdn"
17+
value: "k3ces.localdomain"
18+
- key: "domain"
19+
value: "k3ces.localdomain"
20+
# should be set to "external" for mk-cert
21+
- key: "certificate/type"
22+
value: "selfsigned"
23+
- key: "password-policy/min_length"
24+
value: "1"
25+
- key: "password-policy/must_contain_capital_letter"
26+
value: "false"
27+
- key: "password-policy/must_contain_digit"
28+
value: "false"
29+
- key: "password-policy/must_contain_lower_case_letter"
30+
value: "false"
31+
- key: "password-policy/must_contain_special_character"
32+
value: "false"
33+
blueprintMask:
34+
manifest:
35+
dogus: []
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
components:
2+
lop-idp:
3+
version: 1.1.0
4+
valuesObject:
5+
defaultConfig:
6+
env:
7+
initialDomain: "k3ces.localdomain"
8+
ldap:
9+
secrets:
10+
initialAdminPasswordSecretRef:
11+
create: false
12+
name: initial-admin-password
13+
passwordKey: admin-password
14+
cas:
15+
configuration:
16+
normal:
17+
allow_local_urls: "true"
18+
k8s-dogu-operator:
19+
valuesObject:
20+
controllerManager:
21+
env:
22+
authRegistrationEnabled: true
23+
disablePostfixDependencyCheck: true
24+
k8s-auth-registration-crd:
25+
version: 1.0.0
26+
postfix:
27+
version: 3.10.8-3

‎docs/development/dev_box_de.md‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,30 @@ Wenn das der Fall ist, werden keine weiteren Schritte ausgeführt.
120120
Über die Konfiguration `forceUpgradeEcosystem` in der `.vagrant.rb`-Datei, kann dieses Verhalten deaktiviert werden.
121121
Dann wird das Helm-Release `ecosystem-core` und das Blueprint bei jedem `vagrant up` aktualisiert.
122122

123+
#### Ecosystem-Core-Values patchen
124+
125+
Um Ecosystem-Core spezieller zu konfigurieren, kann eine Datei `.ecosystem-core-values-patch.yaml` im Root-Verzeichnis abgelegt werden.
126+
Ist diese Datei vorhanden, wird sie mit den Default-Values gemergt, wobei sich überschneidende Einträge überschrieben werden.
127+
128+
Vorgehen:
129+
1. Template kopieren:
130+
`cp .ecosystem-core-values-patch.yaml.template .ecosystem-core-values-patch.yaml`
131+
2. Inhalte anpassen (z. B. Backup & Monitoring aktivieren).
132+
3. Lokales Cluster neu erstellen mit `vagrant destroy -f && vagrant up`.
133+
Die Datei wird automatisch in die Default-Values gemergt und angewendet.
134+
135+
#### Longhorn-Values patchen
136+
137+
Um Longhorn spezieller zu konfigurieren, kann eine Datei `.longhorn-values-patch.yaml` im Root-Verzeichnis abgelegt werden.
138+
Ist diese Datei vorhanden, wird sie mit den Default-Values gemergt, wobei sich überschneidende Einträge überschrieben werden.
139+
140+
Vorgehen:
141+
1. Template kopieren:
142+
`cp .longhorn-values-patch.yaml.template .longhorn-values-patch.yaml`
143+
2. Inhalte anpassen (z. B. Backup-Bucket konfigurieren).
144+
3. Lokales Cluster neu erstellen mit `vagrant destroy -f && vagrant up`.
145+
Die Datei wird automatisch in die Default-Values gemergt und angewendet.
146+
123147
#### Blueprint-Override
124148

125149
Um weitere Dogus, oder spezielle Config zu installieren kann eine Datei `.blueprint-override.yaml` im Root-Verzeichnis abgelegt werden.

‎docs/development/dev_box_en.md‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,30 @@ If this is the case, no further steps are taken.
120120
This behavior can be disabled via the `forceUpgradeEcosystem` configuration in the `.vagrant.rb` file.
121121
Then the Helm release `ecosystem-core` and the blueprint will be updated with every `vagrant up`.
122122

123+
#### Patch Ecosystem-Core values
124+
125+
To customize the Ecosystem-Core configuration, a `.ecosystem-core-values-patch.yaml` file can be placed in the root directory.
126+
If this file exists, it is merged with the default values; overlapping entries are overwritten.
127+
128+
Procedure:
129+
1. Copy the template:
130+
`cp .ecosystem-core-values-patch.yaml.template .ecosystem-core-values-patch.yaml`
131+
2. Customize the content (e.g., enable backup & monitoring).
132+
3. Recreate the local cluster with `vagrant destroy -f && vagrant up`.
133+
The file is automatically merged into the default values and applied.
134+
135+
#### Patch Longhorn values
136+
137+
To customize the Longhorn configuration, a `.longhorn-values-patch.yaml` file can be placed in the root directory.
138+
If this file exists, it is merged with the default values; overlapping entries are overwritten.
139+
140+
Procedure:
141+
1. Copy the template:
142+
`cp .longhorn-values-patch.yaml.template .longhorn-values-patch.yaml`
143+
2. Customize the content (e.g., configure a backup bucket).
144+
3. Recreate the local cluster with `vagrant destroy -f && vagrant up`.
145+
The file is automatically merged into the default values and applied.
146+
123147
#### Blueprint override
124148

125149
To install additional Dogus or special configurations, a file named `.blueprint-override.yaml` can be stored in the root directory.
@@ -138,4 +162,4 @@ Notes:
138162
#### Cas configuration
139163
To ensure that cas Dogu forwards the logout URLs correctly locally, it is important
140164
that the key `allow_local_urls` is set to `‘true’` in the configuration for cas.
141-
This makes `*.localdomain` a valid domain for cas and the logout URLs are set correctly.
165+
This makes `*.localdomain` a valid domain for cas and the logout URLs are set correctly.
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# Test LOP-IDP
2+
3+
To test the new LOP-IDP and postfix components, copy the appropriate values patches like so:
4+
```bash
5+
cp docs/development/.lop-idp-blueprint-override.yaml .blueprint-override.yaml
6+
cp docs/development/.lop-idp-ecosystem-core-values-patch.yaml .ecosystem-core-values-patch.yaml
7+
```
8+
9+
If you use mkcert, you have to set the `certificate/type` key to `external` in `.blueprint-override.yaml`.
10+
11+
Due to [a bug in ecosystem-core](https://github.com/cloudogu/ecosystem-core/issues/64), a configmap with the name `postfix-config` will already exist and cause an error during the installation of postfix. Until it is fixed, it can for now be circumvented by deleting the configmap.

0 commit comments

Comments
 (0)