Skip to content

Commit 6fc9ba5

Browse files
authored
Merge pull request #55 from projectsyn/allow-setting-ns-metadata
Allow setting namespace metadata using `.namespaceMetadata`
2 parents 54e0e8e + 8d1972a commit 6fc9ba5

File tree

5 files changed

+27
-2
lines changed

5 files changed

+27
-2
lines changed

class/defaults.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ parameters:
33
=_metadata:
44
multi_instance: true
55
namespace: syn-${_instance}
6+
namespaceMetadata: {}
67

78
host_service_cidr: null
89

component/main.jsonnet

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ local instance = inv.parameters._instance;
1010

1111
// Define outputs below
1212
{
13-
'00_namespace': kube.Namespace(params.namespace),
13+
'00_namespace': kube.Namespace(params.namespace) {
14+
metadata+: com.makeMergeable(params.namespaceMetadata),
15+
},
1416
'10_cluster': cluster.Cluster(instance, params),
1517
}

docs/modules/ROOT/pages/references/parameters.adoc

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,24 @@ The namespace in which to deploy this component.
1414

1515
Deploying multiple vclusters in the same namespace isn't supported.
1616

17+
18+
== `namespaceMetadata`
19+
20+
[horizontal]
21+
type:: dictionary
22+
default:: `{}`
23+
example::
24+
+
25+
[source,yaml]
26+
----
27+
namespace:
28+
annotations:
29+
prometheus: infra
30+
----
31+
32+
Additional metadata for the namespace.
33+
34+
1735
== `host_service_cidr`
1836

1937
[horizontal]
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
apiVersion: v1
22
kind: Namespace
33
metadata:
4-
annotations: {}
4+
annotations:
5+
openshift.io/cluster-monitoring: 'true'
56
labels:
67
name: syn-openshift
78
name: syn-openshift

tests/openshift.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ parameters:
33
host_service_cidr: 172.30.0.0/16
44
ocp_route:
55
host: test.apps.local
6+
namespaceMetadata:
7+
annotations:
8+
openshift.io/cluster-monitoring: "true"
69

710
facts:
811
distribution: openshift4

0 commit comments

Comments
 (0)