diff --git a/component/main.jsonnet b/component/main.jsonnet index 2b9c2687..53d37f5f 100644 --- a/component/main.jsonnet +++ b/component/main.jsonnet @@ -83,7 +83,7 @@ local netpols = kube.NetworkPolicy('allow-from-other-namespaces') { metadata+: { labels+: { 'app.kubernetes.io/managed-by': 'commodore', - 'app.kubernetes.io/name': params.namespace, + 'app.kubernetes.io/name': params.namespace.name, [if params.global.zoneAwareReplication.enabled then 'rollout-operator.syn.tools/allow']: '', }, } + com.makeMergeable(params.namespace.metadata), diff --git a/tests/golden/defaults/defaults/defaults/00_namespace.yaml b/tests/golden/defaults/defaults/defaults/00_namespace.yaml index db2ca993..2217686d 100644 --- a/tests/golden/defaults/defaults/defaults/00_namespace.yaml +++ b/tests/golden/defaults/defaults/defaults/00_namespace.yaml @@ -4,9 +4,6 @@ metadata: annotations: {} labels: app.kubernetes.io/managed-by: commodore - app.kubernetes.io/name: - create: true - metadata: {} - name: defaults + app.kubernetes.io/name: defaults name: defaults name: defaults diff --git a/tests/golden/extra-config/extra-config/extra-config/00_namespace.yaml b/tests/golden/extra-config/extra-config/extra-config/00_namespace.yaml index dc7dd5c2..a5c27bc0 100644 --- a/tests/golden/extra-config/extra-config/extra-config/00_namespace.yaml +++ b/tests/golden/extra-config/extra-config/extra-config/00_namespace.yaml @@ -4,10 +4,7 @@ metadata: annotations: {} labels: app.kubernetes.io/managed-by: commodore - app.kubernetes.io/name: - create: true - metadata: {} - name: extra-config + app.kubernetes.io/name: extra-config name: extra-config rollout-operator.syn.tools/allow: '' name: extra-config diff --git a/tests/golden/legacy/legacy/legacy/00_namespace.yaml b/tests/golden/legacy/legacy/legacy/00_namespace.yaml index 7e104fc1..6e0033c1 100644 --- a/tests/golden/legacy/legacy/legacy/00_namespace.yaml +++ b/tests/golden/legacy/legacy/legacy/00_namespace.yaml @@ -4,9 +4,6 @@ metadata: annotations: {} labels: app.kubernetes.io/managed-by: commodore - app.kubernetes.io/name: - create: true - metadata: {} - name: legacy + app.kubernetes.io/name: legacy name: legacy name: legacy diff --git a/tests/golden/openshift/openshift/openshift/00_namespace.yaml b/tests/golden/openshift/openshift/openshift/00_namespace.yaml index 43150159..fb1feebd 100644 --- a/tests/golden/openshift/openshift/openshift/00_namespace.yaml +++ b/tests/golden/openshift/openshift/openshift/00_namespace.yaml @@ -4,10 +4,7 @@ metadata: annotations: {} labels: app.kubernetes.io/managed-by: commodore - app.kubernetes.io/name: - create: true - metadata: {} - name: openshift + app.kubernetes.io/name: openshift name: openshift rollout-operator.syn.tools/allow: '' name: openshift diff --git a/tests/golden/preset-large/preset-large/preset-large/00_namespace.yaml b/tests/golden/preset-large/preset-large/preset-large/00_namespace.yaml index 51cbf13b..d1db95db 100644 --- a/tests/golden/preset-large/preset-large/preset-large/00_namespace.yaml +++ b/tests/golden/preset-large/preset-large/preset-large/00_namespace.yaml @@ -4,9 +4,6 @@ metadata: annotations: {} labels: app.kubernetes.io/managed-by: commodore - app.kubernetes.io/name: - create: true - metadata: {} - name: preset-large + app.kubernetes.io/name: preset-large name: preset-large name: preset-large diff --git a/tests/golden/preset-small/preset-small/preset-small/00_namespace.yaml b/tests/golden/preset-small/preset-small/preset-small/00_namespace.yaml index ae425024..4b3ea036 100644 --- a/tests/golden/preset-small/preset-small/preset-small/00_namespace.yaml +++ b/tests/golden/preset-small/preset-small/preset-small/00_namespace.yaml @@ -4,9 +4,6 @@ metadata: annotations: {} labels: app.kubernetes.io/managed-by: commodore - app.kubernetes.io/name: - create: true - metadata: {} - name: preset-small + app.kubernetes.io/name: preset-small name: preset-small name: preset-small