reuse realm name

Author: andrewazores

src/main/java/io/cryostat/discovery/KubeEndpointSlicesDiscovery.java

@@ -73,7 +73,7 @@ public class KubeEndpointSlicesDiscovery implements ResourceEventHandler<Endpoin
     private static final String NAMESPACE_QUERY_ADDR = "NS_QUERY_ENDPOINT_SLICE";
     private static final String ENDPOINT_SLICE_DISCOVERY_ADDR = "ENDPOINT_SLICE_DISC";
 
-    public static final String REALM = "KubernetesEndpointSlices";
+    public static final String REALM = "KubernetesApi";
 
     public static final String DISCOVERY_NAMESPACE_LABEL_KEY = "discovery.cryostat.io/namespace";
 

src/main/resources/db/migration/V4.0.0__cryostat.sql

@@ -144,8 +144,7 @@
         parentNode
     ) values
     ((select nextval('DiscoveryNode_SEQ')), '{}'::jsonb, 'Custom Targets', 'Realm', (select id from universe)),
-    ((select nextval('DiscoveryNode_SEQ')), '{}'::jsonb, 'KubernetesEndpoints', 'Realm', (select id from universe)),
-    ((select nextval('DiscoveryNode_SEQ')), '{}'::jsonb, 'KubernetesEndpointSlices', 'Realm', (select id from universe)),
+    ((select nextval('DiscoveryNode_SEQ')), '{}'::jsonb, 'KubernetesApi', 'Realm', (select id from universe)),
     ((select nextval('DiscoveryNode_SEQ')), '{}'::jsonb, 'JDP', 'Realm', (select id from universe)),
     ((select nextval('DiscoveryNode_SEQ')), '{}'::jsonb, 'Podman', 'Realm', (select id from universe)),
     ((select nextval('DiscoveryNode_SEQ')), '{}'::jsonb, 'Docker', 'Realm', (select id from universe));

src/main/resources/db/migration/V4.1.0__cryostat.sql

@@ -1,16 +1 @@
 alter table Rule add column metadata jsonb default '{"labels":{}}';
-
-/* Select the Universe node, then insert Realm nodes for each builtin discovery plugin with the universe as their parent */
-with universe as (
-    select id from DiscoveryNode where (nodeType = 'Universe')
-)
-insert into DiscoveryNode(
-    id,
-    labels,
-    name,
-    nodeType,
-    parentNode
-) values
-((select nextval('DiscoveryNode_SEQ')), '{}'::jsonb, 'KubernetesEndpointSlices', 'Realm', (select id from universe));
-
-delete from DiscoveryNode where name='KubernetesApi';

src/test/java/io/cryostat/discovery/DiscoveryTest.java

@@ -53,7 +53,7 @@ void testGetUniverse() {
                         "children",
                         Matchers.hasItems(
                                 Matchers.hasEntry("name", "Custom Targets"),
-                                Matchers.hasEntry("name", "KubernetesEndpointSlices"),
+                                Matchers.hasEntry("name", "KubernetesApi"),
                                 Matchers.hasEntry("name", "Podman"),
                                 Matchers.hasEntry("name", "Docker"),
                                 Matchers.hasEntry("name", "JDP")))