Merge pull request #151 from Icinga/fix-annotations-and-labels

Fix annotation and label relations
Icinga · Dec 12, 2024 · 3528dd5 · 3528dd5
2 parents da3a566 + 13ebc4e
commit 3528dd5
Show file tree

Hide file tree

Showing 15 changed files with 54 additions and 51 deletions.
diff --git a/pkg/schema/v1/config_map.go b/pkg/schema/v1/config_map.go
@@ -86,11 +86,11 @@ func (c *ConfigMap) Relations() []database.Relation {
 	fk := database.WithForeignKey("config_map_uuid")
 
 	return []database.Relation{
+		database.HasMany(c.ResourceLabels, database.WithForeignKey("resource_uuid")),
 		database.HasMany(c.Labels, database.WithoutCascadeDelete()),
 		database.HasMany(c.ConfigMapLabels, fk),
-		database.HasMany(c.ResourceLabels, fk),
-		database.HasMany(c.ConfigMapAnnotations, fk),
+		database.HasMany(c.ResourceAnnotations, database.WithForeignKey("resource_uuid")),
 		database.HasMany(c.Annotations, database.WithoutCascadeDelete()),
-		database.HasMany(c.ResourceAnnotations, fk),
+		database.HasMany(c.ConfigMapAnnotations, fk),
 	}
 }
diff --git a/pkg/schema/v1/cron_job.go b/pkg/schema/v1/cron_job.go
@@ -123,11 +123,11 @@ func (c *CronJob) Relations() []database.Relation {
 	fk := database.WithForeignKey("cron_job_uuid")
 
 	return []database.Relation{
+		database.HasMany(c.ResourceLabels, database.WithForeignKey("resource_uuid")),
 		database.HasMany(c.Labels, database.WithoutCascadeDelete()),
 		database.HasMany(c.CronJobLabels, fk),
-		database.HasMany(c.ResourceLabels, fk),
-		database.HasMany(c.CronJobAnnotations, fk),
+		database.HasMany(c.ResourceAnnotations, database.WithForeignKey("resource_uuid")),
 		database.HasMany(c.Annotations, database.WithoutCascadeDelete()),
-		database.HasMany(c.ResourceAnnotations, fk),
+		database.HasMany(c.CronJobAnnotations, fk),
 	}
 }
diff --git a/pkg/schema/v1/daemon_set.go b/pkg/schema/v1/daemon_set.go
@@ -210,11 +210,11 @@ func (d *DaemonSet) Relations() []database.Relation {
 	return []database.Relation{
 		database.HasMany(d.Conditions, fk),
 		database.HasMany(d.Owners, fk),
-		database.HasMany(d.DaemonSetLabels, fk),
+		database.HasMany(d.ResourceLabels, database.WithForeignKey("resource_uuid")),
 		database.HasMany(d.Labels, database.WithoutCascadeDelete()),
-		database.HasMany(d.ResourceLabels, fk),
-		database.HasMany(d.DaemonSetAnnotations, fk),
+		database.HasMany(d.DaemonSetLabels, fk),
+		database.HasMany(d.ResourceAnnotations, database.WithForeignKey("resource_uuid")),
 		database.HasMany(d.Annotations, database.WithoutCascadeDelete()),
-		database.HasMany(d.ResourceAnnotations, fk),
+		database.HasMany(d.DaemonSetAnnotations, fk),
 	}
 }
diff --git a/pkg/schema/v1/deployment.go b/pkg/schema/v1/deployment.go
@@ -229,11 +229,11 @@ func (d *Deployment) Relations() []database.Relation {
 	return []database.Relation{
 		database.HasMany(d.Conditions, fk),
 		database.HasMany(d.Owners, fk),
-		database.HasMany(d.DeploymentLabels, fk),
+		database.HasMany(d.ResourceLabels, database.WithForeignKey("resource_uuid")),
 		database.HasMany(d.Labels, database.WithoutCascadeDelete()),
-		database.HasMany(d.ResourceLabels, fk),
-		database.HasMany(d.DeploymentAnnotations, fk),
+		database.HasMany(d.DeploymentLabels, fk),
+		database.HasMany(d.ResourceAnnotations, database.WithForeignKey("resource_uuid")),
 		database.HasMany(d.Annotations, database.WithoutCascadeDelete()),
-		database.HasMany(d.ResourceAnnotations, fk),
+		database.HasMany(d.DeploymentAnnotations, fk),
 	}
 }
diff --git a/pkg/schema/v1/ingress.go b/pkg/schema/v1/ingress.go
@@ -222,11 +222,11 @@ func (i *Ingress) Relations() []database.Relation {
 		database.HasMany(i.IngressBackendService, fk),
 		database.HasMany(i.IngressBackendResource, fk),
 		database.HasMany(i.IngressRule, fk),
+		database.HasMany(i.ResourceLabels, database.WithForeignKey("resource_uuid")),
 		database.HasMany(i.Labels, database.WithoutCascadeDelete()),
 		database.HasMany(i.IngressLabels, fk),
-		database.HasMany(i.ResourceLabels, fk),
-		database.HasMany(i.IngressAnnotations, fk),
+		database.HasMany(i.ResourceAnnotations, database.WithForeignKey("resource_uuid")),
 		database.HasMany(i.Annotations, database.WithoutCascadeDelete()),
-		database.HasMany(i.ResourceAnnotations, fk),
+		database.HasMany(i.IngressAnnotations, fk),
 	}
 }
diff --git a/pkg/schema/v1/job.go b/pkg/schema/v1/job.go
@@ -280,11 +280,12 @@ func (j *Job) Relations() []database.Relation {
 
 	return []database.Relation{
 		database.HasMany(j.Conditions, fk),
+		database.HasMany(j.ResourceLabels, database.WithForeignKey("resource_uuid")),
 		database.HasMany(j.Labels, database.WithoutCascadeDelete()),
 		database.HasMany(j.JobLabels, fk),
-		database.HasMany(j.ResourceLabels, fk),
-		database.HasMany(j.JobAnnotations, fk),
+		database.HasMany(j.ResourceAnnotations, database.WithForeignKey("resource_uuid")),
 		database.HasMany(j.Annotations, database.WithoutCascadeDelete()),
+		database.HasMany(j.JobAnnotations, fk),
 		database.HasMany(j.Owners, fk),
 	}
 }
diff --git a/pkg/schema/v1/namespace.go b/pkg/schema/v1/namespace.go
@@ -111,11 +111,11 @@ func (n *Namespace) Relations() []database.Relation {
 
 	return []database.Relation{
 		database.HasMany(n.Conditions, fk),
-		database.HasMany(n.NamespaceLabels, fk),
+		database.HasMany(n.ResourceLabels, database.WithForeignKey("resource_uuid")),
 		database.HasMany(n.Labels, database.WithoutCascadeDelete()),
-		database.HasMany(n.ResourceLabels, fk),
-		database.HasMany(n.NamespaceAnnotations, fk),
+		database.HasMany(n.NamespaceLabels, fk),
+		database.HasMany(n.ResourceAnnotations, database.WithForeignKey("resource_uuid")),
 		database.HasMany(n.Annotations, database.WithoutCascadeDelete()),
-		database.HasMany(n.ResourceAnnotations, fk),
+		database.HasMany(n.NamespaceAnnotations, fk),
 	}
 }
diff --git a/pkg/schema/v1/node.go b/pkg/schema/v1/node.go
@@ -261,12 +261,12 @@ func (n *Node) Relations() []database.Relation {
 	return []database.Relation{
 		database.HasMany(n.Conditions, fk),
 		database.HasMany(n.Volumes, fk),
-		database.HasMany(n.NodeLabels, fk),
+		database.HasMany(n.ResourceLabels, database.WithForeignKey("resource_uuid")),
 		database.HasMany(n.Labels, database.WithoutCascadeDelete()),
-		database.HasMany(n.ResourceLabels, fk),
-		database.HasMany(n.NodeAnnotations, fk),
+		database.HasMany(n.NodeLabels, fk),
+		database.HasMany(n.ResourceAnnotations, database.WithForeignKey("resource_uuid")),
 		database.HasMany(n.Annotations, database.WithoutCascadeDelete()),
-		database.HasMany(n.ResourceAnnotations, fk),
+		database.HasMany(n.NodeAnnotations, fk),
 	}
 }
 

diff --git a/pkg/schema/v1/persistent_volume.go b/pkg/schema/v1/persistent_volume.go
@@ -141,11 +141,11 @@ func (p *PersistentVolume) Relations() []database.Relation {
 
 	return []database.Relation{
 		database.HasOne(p.Claim, fk),
+		database.HasMany(p.ResourceLabels, database.WithForeignKey("resource_uuid")),
 		database.HasMany(p.Labels, database.WithoutCascadeDelete()),
 		database.HasMany(p.PersistentVolumeLabels, fk),
-		database.HasMany(p.ResourceLabels, fk),
-		database.HasMany(p.PersistentVolumeAnnotations, fk),
+		database.HasMany(p.ResourceAnnotations, database.WithForeignKey("resource_uuid")),
 		database.HasMany(p.Annotations, database.WithoutCascadeDelete()),
-		database.HasMany(p.ResourceAnnotations, fk),
+		database.HasMany(p.PersistentVolumeAnnotations, fk),
 	}
 }
diff --git a/pkg/schema/v1/pod.go b/pkg/schema/v1/pod.go
@@ -451,12 +451,12 @@ func (p *Pod) Relations() []database.Relation {
 		database.HasMany(p.InitContainers, database.WithoutCascadeDelete()),
 		database.HasMany(p.SidecarContainers, database.WithoutCascadeDelete()),
 		database.HasMany(p.Owners, fk),
+		database.HasMany(p.ResourceLabels, database.WithForeignKey("resource_uuid")),
 		database.HasMany(p.Labels, database.WithoutCascadeDelete()),
 		database.HasMany(p.PodLabels, fk),
-		database.HasMany(p.ResourceLabels, fk),
+		database.HasMany(p.ResourceAnnotations, database.WithForeignKey("resource_uuid")),
 		database.HasMany(p.Annotations, database.WithoutCascadeDelete()),
 		database.HasMany(p.PodAnnotations, fk),
-		database.HasMany(p.ResourceAnnotations, fk),
 		database.HasMany(p.Pvcs, fk),
 		database.HasMany(p.Volumes, fk),
 	}

diff --git a/pkg/schema/v1/pvc.go b/pkg/schema/v1/pvc.go
@@ -166,9 +166,11 @@ func (p *Pvc) Relations() []database.Relation {
 
 	return []database.Relation{
 		database.HasMany(p.Conditions, fk),
-		database.HasMany(p.PvcLabels, fk),
+		database.HasMany(p.ResourceLabels, database.WithForeignKey("resource_uuid")),
 		database.HasMany(p.Labels, database.WithoutCascadeDelete()),
-		database.HasMany(p.ResourceAnnotations, fk),
-		database.HasMany(p.ResourceLabels, fk),
+		database.HasMany(p.PvcLabels, fk),
+		database.HasMany(p.ResourceAnnotations, database.WithForeignKey("resource_uuid")),
+		database.HasMany(p.Annotations, database.WithoutCascadeDelete()),
+		database.HasMany(p.PvcAnnotations, fk),
 	}
 }
diff --git a/pkg/schema/v1/replica_set.go b/pkg/schema/v1/replica_set.go
@@ -211,11 +211,11 @@ func (r *ReplicaSet) Relations() []database.Relation {
 	return []database.Relation{
 		database.HasMany(r.Conditions, fk),
 		database.HasMany(r.Owners, fk),
-		database.HasMany(r.ReplicaSetLabels, fk),
+		database.HasMany(r.ResourceLabels, database.WithForeignKey("resource_uuid")),
 		database.HasMany(r.Labels, database.WithoutCascadeDelete()),
-		database.HasMany(r.ResourceLabels, fk),
-		database.HasMany(r.ReplicaSetAnnotations, fk),
+		database.HasMany(r.ReplicaSetLabels, fk),
+		database.HasMany(r.ResourceAnnotations, database.WithForeignKey("resource_uuid")),
 		database.HasMany(r.Annotations, database.WithoutCascadeDelete()),
-		database.HasMany(r.ResourceAnnotations, fk),
+		database.HasMany(r.ReplicaSetAnnotations, fk),
 	}
 }
diff --git a/pkg/schema/v1/secret.go b/pkg/schema/v1/secret.go
@@ -89,11 +89,11 @@ func (s *Secret) Relations() []database.Relation {
 	fk := database.WithForeignKey("secret_uuid")
 
 	return []database.Relation{
+		database.HasMany(s.ResourceLabels, database.WithForeignKey("resource_uuid")),
 		database.HasMany(s.Labels, database.WithoutCascadeDelete()),
 		database.HasMany(s.SecretLabels, fk),
-		database.HasMany(s.ResourceLabels, fk),
-		database.HasMany(s.SecretAnnotations, fk),
+		database.HasMany(s.ResourceAnnotations, database.WithForeignKey("resource_uuid")),
 		database.HasMany(s.Annotations, database.WithoutCascadeDelete()),
-		database.HasMany(s.ResourceAnnotations, fk),
+		database.HasMany(s.SecretAnnotations, fk),
 	}
 }
diff --git a/pkg/schema/v1/service.go b/pkg/schema/v1/service.go
@@ -230,13 +230,13 @@ func (s *Service) Relations() []database.Relation {
 	return []database.Relation{
 		database.HasMany(s.Conditions, fk),
 		database.HasMany(s.Ports, fk),
-		database.HasMany(s.Labels, database.WithoutCascadeDelete()),
-		database.HasMany(s.ServiceLabels, fk),
-		database.HasMany(s.ResourceLabels, fk),
 		database.HasMany(s.Selectors, database.WithoutCascadeDelete()),
 		database.HasMany(s.ServiceSelectors, fk),
-		database.HasMany(s.ServiceAnnotations, fk),
+		database.HasMany(s.ResourceLabels, database.WithForeignKey("resource_uuid")),
+		database.HasMany(s.Labels, database.WithoutCascadeDelete()),
+		database.HasMany(s.ServiceLabels, fk),
+		database.HasMany(s.ResourceAnnotations, database.WithForeignKey("resource_uuid")),
 		database.HasMany(s.Annotations, database.WithoutCascadeDelete()),
-		database.HasMany(s.ResourceAnnotations, fk),
+		database.HasMany(s.ServiceAnnotations, fk),
 	}
 }
diff --git a/pkg/schema/v1/stateful_set.go b/pkg/schema/v1/stateful_set.go
@@ -228,11 +228,11 @@ func (s *StatefulSet) Relations() []database.Relation {
 	return []database.Relation{
 		database.HasMany(s.Conditions, fk),
 		database.HasMany(s.Owners, fk),
-		database.HasMany(s.StatefulSetLabels, fk),
+		database.HasMany(s.ResourceLabels, database.WithForeignKey("resource_uuid")),
 		database.HasMany(s.Labels, database.WithoutCascadeDelete()),
-		database.HasMany(s.ResourceLabels, fk),
-		database.HasMany(s.StatefulSetAnnotations, fk),
+		database.HasMany(s.StatefulSetLabels, fk),
+		database.HasMany(s.ResourceAnnotations, database.WithForeignKey("resource_uuid")),
 		database.HasMany(s.Annotations, database.WithoutCascadeDelete()),
-		database.HasMany(s.ResourceAnnotations, fk),
+		database.HasMany(s.StatefulSetAnnotations, fk),
 	}
 }