From cbee535b550e968c0f8fccb10b1e4dc7399b470e Mon Sep 17 00:00:00 2001 From: Jonada Hoxha Date: Wed, 22 May 2024 09:31:22 +0200 Subject: [PATCH] Add `owner_uuid` --- pkg/schema/v1/pod.go | 10 ++++++---- pkg/schema/v1/replica_set.go | 2 ++ schema/mysql/schema.sql | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/pkg/schema/v1/pod.go b/pkg/schema/v1/pod.go index 478eb58d..4bdf3f38 100644 --- a/pkg/schema/v1/pod.go +++ b/pkg/schema/v1/pod.go @@ -68,6 +68,7 @@ type PodLabel struct { type PodOwner struct { PodUuid types.UUID + OwnerUuid types.UUID Kind string Name string Uid ktypes.UID @@ -226,10 +227,11 @@ func (p *Pod) Obtain(k8s kmetav1.Object) { controller = *ownerReference.Controller } p.Owners = append(p.Owners, PodOwner{ - PodUuid: p.Uuid, - Kind: strcase.Snake(ownerReference.Kind), - Name: ownerReference.Name, - Uid: ownerReference.UID, + PodUuid: p.Uuid, + OwnerUuid: EnsureUUID(p.Uid), + Kind: strcase.Snake(ownerReference.Kind), + Name: ownerReference.Name, + Uid: ownerReference.UID, BlockOwnerDeletion: types.Bool{ Bool: blockOwnerDeletion, Valid: true, diff --git a/pkg/schema/v1/replica_set.go b/pkg/schema/v1/replica_set.go index 277aca00..1bfe81f2 100644 --- a/pkg/schema/v1/replica_set.go +++ b/pkg/schema/v1/replica_set.go @@ -39,6 +39,7 @@ type ReplicaSetCondition struct { type ReplicaSetOwner struct { ReplicaSetUuid types.UUID + OwnerUuid types.UUID Kind string Name string Uid ktypes.UID @@ -92,6 +93,7 @@ func (r *ReplicaSet) Obtain(k8s kmetav1.Object) { } r.Owners = append(r.Owners, ReplicaSetOwner{ ReplicaSetUuid: r.Uuid, + OwnerUuid: EnsureUUID(r.Uid), Kind: strcase.Snake(ownerReference.Kind), Name: ownerReference.Name, Uid: ownerReference.UID, diff --git a/schema/mysql/schema.sql b/schema/mysql/schema.sql index a6fbf6d7..6e5d1e82 100644 --- a/schema/mysql/schema.sql +++ b/schema/mysql/schema.sql @@ -95,12 +95,13 @@ CREATE TABLE pod_condition ( CREATE TABLE pod_owner ( pod_uuid binary(16) NOT NULL, + owner_uuid binary(16) NOT NULL, kind enum('daemon_set', 'node', 'replica_set', 'stateful_set', 'job') COLLATE utf8mb4_unicode_ci NOT NULL, name varchar(253) COLLATE utf8mb4_unicode_ci NOT NULL, uid varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, controller enum('n', 'y') COLLATE utf8mb4_unicode_ci NOT NULL, block_owner_deletion enum('n', 'y') COLLATE utf8mb4_unicode_ci NOT NULL, - PRIMARY KEY (pod_uuid, uid) + PRIMARY KEY (pod_uuid, owner_uuid) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin; CREATE TABLE pod_pvc ( @@ -376,12 +377,13 @@ CREATE TABLE replica_set_condition ( CREATE TABLE replica_set_owner ( replica_set_uuid binary(16) NOT NULL, + owner_uuid binary(16) NOT NULL, kind enum('deployment') COLLATE utf8mb4_unicode_ci NOT NULL, name varchar(253) COLLATE utf8mb4_unicode_ci NOT NULL, uid varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, controller enum('n', 'y') COLLATE utf8mb4_unicode_ci NOT NULL, block_owner_deletion enum('n', 'y') COLLATE utf8mb4_unicode_ci NOT NULL, - PRIMARY KEY (replica_set_uuid, uid) + PRIMARY KEY (replica_set_uuid, owner_uuid) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin; CREATE TABLE daemon_set (