Skip to content

Commit c46a1e2

Browse files
committed
Merge branch 'k8s-job-metadata' into 'master'
add labels and annotations to created job resources Closes #24 See merge request acs/public/villas/controller!22
2 parents 786d755 + 92a576b commit c46a1e2

File tree

1 file changed

+15
-3
lines changed

1 file changed

+15
-3
lines changed

villas/controller/components/simulators/kubernetes.py

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,21 @@ def _prepare_job(self, job, payload):
8888
job.metadata.labels = {}
8989

9090
job.metadata.labels.update({
91-
'controller': 'villas',
92-
'controller-uuid': self.manager.uuid,
93-
'uuid': self.uuid
91+
'app.kubernetes.io/part-of': 'villas',
92+
'app.kubernetes.io/managed-by': 'villas-controller',
93+
'app.kubernetes.io/component': 'infrastructure-component',
94+
95+
'villas.fein-aachen.org/ic-manager-uuid': self.manager.uuid,
96+
'villas.fein-aachen.org/ic-uuid': self.uuid
97+
})
98+
99+
if job.metadata.annotations is None:
100+
job.metadata.annotations = {}
101+
102+
job.metadata.annotations.update({
103+
'villas.fein-aachen.org/name': self.name,
104+
'villas.fein-aachen.org/location': self.location,
105+
'villas.fein-aachen.org/realm': self.realm
94106
})
95107

96108
return job

0 commit comments

Comments
 (0)