diff --git a/component/main.jsonnet b/component/main.jsonnet index a9a419a..05c42ce 100644 --- a/component/main.jsonnet +++ b/component/main.jsonnet @@ -10,7 +10,8 @@ local params = inv.parameters.control_api; local zones = [ - controlApi.Zone(name) + params.zones[name] { + controlApi.Zone(name) + + com.makeMergeable(params.zones[name]) { metadata+: { labels+: common.DefaultLabels, }, diff --git a/tests/defaults.yml b/tests/defaults.yml index 8bdaa0f..f4ddab6 100644 --- a/tests/defaults.yml +++ b/tests/defaults.yml @@ -93,6 +93,9 @@ parameters: zones: example-zone-1: + metadata: + labels: + control.appuio.io/zone-cluster-id: c-appuio-example1 data: displayName: Example Zone 1 features: diff --git a/tests/golden/defaults/control-api/control-api/20_zones.yaml b/tests/golden/defaults/control-api/control-api/20_zones.yaml index d1bcd28..a2bb303 100644 --- a/tests/golden/defaults/control-api/control-api/20_zones.yaml +++ b/tests/golden/defaults/control-api/control-api/20_zones.yaml @@ -23,6 +23,7 @@ metadata: app.kubernetes.io/component: control-api app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: control-api + control.appuio.io/zone-cluster-id: c-appuio-example1 name: example-zone-1 name: example-zone-1 ---