Skip to content

Feature/136 add config map references for configuration #142

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

Open
wants to merge 19 commits into
base: v2/develop
Choose a base branch
from
+2,366 −190
Open

Feature/136 add config map references for configuration #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
0796f5b
#136 add config map reference to domain
nroeske Oct 22, 2025
ca77be4
#136 add config map reference reader
nroeske Oct 22, 2025
10545bb
#136 add config map reference to state diff (wip)
nroeske Oct 22, 2025
d48674f
#136 fix tests
nroeske Oct 23, 2025
3284b14
Merge remote-tracking branch 'origin/v2/develop' into feature/136-add…
nroeske Oct 24, 2025
d839bd2
#136 add configMapRefReader to stateDiffUseCase
nroeske Oct 24, 2025
cfc01f3
#136 fix configRef serialization
nroeske Oct 24, 2025
d920a29
#136 remove unnecessary logs
nroeske Oct 24, 2025
a46bb75
#136 fix tests
nroeske Oct 24, 2025
7de9d7f
#136 add tests for configMapRefReader
nroeske Oct 24, 2025
37fde4e
#136 use secretRefs and configRefs in global config
nroeske Oct 27, 2025
f00ca87
#136 add tests for configMapRefReader and secretRefReader
nroeske Oct 27, 2025
5aae862
Merge remote-tracking branch 'origin/v2/develop' into feature/136-add…
nroeske Oct 27, 2025
4014544
#136 update blueprint-lib
nroeske Oct 27, 2025
3c66f47
#136 add changelog entry
nroeske Oct 28, 2025
38c2891
#136 fix review findings
nroeske Oct 28, 2025
265a7c1
#136 remove base64 out of stateDiffGlobalConfig
nroeske Oct 29, 2025
303f52b
#136 reference normal config out of secrets
nroeske Oct 29, 2025
c3497ae
#136 update CHANGELOG.md
nroeske Oct 29, 2025
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: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- [#135] Support for the blueprint mask custom resource.
- [#129] Reconciliation of the blueprint on changes of dogu-crs, ces-configMaps and ces-secrets
- [#131] Ignore loglevel changes while debug-mode is active
- [#136] Support non-sensitive config references with config maps and secrets

### Changed
- [#119] *breaking* sensitive dogu config can now only be referenced with secrets
Expand All @@ -29,6 +30,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- [#121] Upgrade Makefiles to v10.4.0
- [#121] *breaking* merge proxy config dogu action into one to simplify the status
- [#133] updated and added docs for the operator
- [#136] Prevent sensitive configs in global config

### Removed
- [#119] *breaking* no support for v1 blueprint CRs anymore
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
github.com/Masterminds/semver/v3 v3.4.0
github.com/cloudogu/ces-commons-lib v0.2.0
github.com/cloudogu/cesapp-lib v0.18.1
github.com/cloudogu/k8s-blueprint-lib/v3 v3.0.2
github.com/cloudogu/k8s-blueprint-lib/v3 v3.0.0-20251027130412-81a09b228be0
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • Update if released

github.com/cloudogu/k8s-debug-mode-cr-lib v1.0.0
github.com/cloudogu/k8s-dogu-lib/v2 v2.10.0
github.com/cloudogu/k8s-registry-lib v0.6.0
Expand Down
8 changes: 6 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,12 @@ github.com/cloudogu/ces-commons-lib v0.2.0 h1:yOEZWFl4W9N3J/6fok4svE3UufK5GQQtyx
github.com/cloudogu/ces-commons-lib v0.2.0/go.mod h1:4rvR2RTDDaz5a6OZ1fW27G0MOnl5I3ackeiHxt4gn3o=
github.com/cloudogu/cesapp-lib v0.18.1 h1:LMdGktIefm/PuhdPqpLTPvjY1smO06EEGBbRSAaYi7U=
github.com/cloudogu/cesapp-lib v0.18.1/go.mod h1:J05eXFxnz4enZblABlmiVTZaUtJ+LIhlJ2UF6l9jpDw=
github.com/cloudogu/k8s-blueprint-lib/v3 v3.0.2 h1:XR3pts5LVFWIG1/OK1KtwN7H06dM5AO7416V3TIsWus=
github.com/cloudogu/k8s-blueprint-lib/v3 v3.0.2/go.mod h1:3E1iLra8//8+kCwBjuDi6b0iwtNoArYfOIYnzNXSFMQ=
github.com/cloudogu/k8s-blueprint-lib/v3 v3.0.0-20251023135924-ab35c661e8ff h1:bDnFiKscc9ARUJDkOj1I4DqEean/df1VgGYmOdWmh+o=
github.com/cloudogu/k8s-blueprint-lib/v3 v3.0.0-20251023135924-ab35c661e8ff/go.mod h1:3E1iLra8//8+kCwBjuDi6b0iwtNoArYfOIYnzNXSFMQ=
github.com/cloudogu/k8s-blueprint-lib/v3 v3.0.0-20251027130412-81a09b228be0 h1:XyHiEbXC5uFuQ8GhsZllNGvQ/lUycrSEX0DGrvyEfHA=
github.com/cloudogu/k8s-blueprint-lib/v3 v3.0.0-20251027130412-81a09b228be0/go.mod h1:3E1iLra8//8+kCwBjuDi6b0iwtNoArYfOIYnzNXSFMQ=
github.com/cloudogu/k8s-blueprint-lib/v3 v3.0.0 h1:XDWrVVmQ1aJ00aisCNQ1nJqOHVK9LB3q92swJFMZEFg=
github.com/cloudogu/k8s-blueprint-lib/v3 v3.0.0/go.mod h1:3E1iLra8//8+kCwBjuDi6b0iwtNoArYfOIYnzNXSFMQ=
github.com/cloudogu/k8s-debug-mode-cr-lib v1.0.0 h1:geZjXwWQY8d8aEWA9l2is/DwlADdOHQveBokPK63XH0=
github.com/cloudogu/k8s-debug-mode-cr-lib v1.0.0/go.mod h1:OPAO5P5ZSZkEexP9YOWNj4wEE8T3wqs92yyP5muymxQ=
github.com/cloudogu/k8s-dogu-lib/v2 v2.10.0 h1:flTmcBHzHU6uiwpXnlxLi93sKmYD85pul//8KxkkgGI=
Expand Down
113 changes: 57 additions & 56 deletions pkg/adapter/kubernetes/blueprintcr/v3/mock_blueprintInterface_test.go
View file
Open in desktop

Large diffs are not rendered by default.

91 changes: 46 additions & 45 deletions pkg/adapter/kubernetes/blueprintcr/v3/mock_blueprintMaskInterface_test.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 16 additions & 2 deletions pkg/adapter/kubernetes/blueprintcr/v3/serializer/blueprint_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,13 @@ func TestConvertToBlueprintDTO(t *testing.T) {
SecretKey: "myKey",
},
},
{
Key: "configmap-config",
ConfigRef: &domain.ConfigValueRef{
ConfigMapName: "myConfigMap",
ConfigMapKey: "myKey",
},
},
},
},
Global: domain.GlobalConfigEntries{
Expand All @@ -94,11 +101,18 @@ func TestConvertToBlueprintDTO(t *testing.T) {
crd.ConfigEntry{
Key: "sensitive-config",
Sensitive: &trueVar,
SecretRef: &crd.SecretReference{
SecretRef: &crd.Reference{
Name: "mySecret",
Key: "myKey",
},
},
crd.ConfigEntry{
Key: "configmap-config",
ConfigRef: &crd.Reference{
Name: "myConfigMap",
Key: "myKey",
},
},
},
},
Global: []crd.ConfigEntry{
Expand Down Expand Up @@ -154,7 +168,7 @@ func TestConvertToEffectiveBlueprintDomain(t *testing.T) {
crd.ConfigEntry{
Key: "sensitive-config",
Sensitive: &trueVar,
SecretRef: &crd.SecretReference{
SecretRef: &crd.Reference{
Name: "mySecret",
Key: "myKey",
},
Expand Down
Loading