Try removing redundant label matching from k8s dependent annotations

Apicurio · Jan 27, 2025 · d229372 · d229372
1 parent fb91990
commit d229372
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 64 deletions.
diff --git a/...oller/src/main/java/io/apicurio/registry/operator/resource/app/AppDeploymentResource.java b/...oller/src/main/java/io/apicurio/registry/operator/resource/app/AppDeploymentResource.java
@@ -28,19 +28,13 @@
 
 import static io.apicurio.registry.operator.api.v1.ContainerNames.REGISTRY_APP_CONTAINER_NAME;
 import static io.apicurio.registry.operator.resource.LabelDiscriminators.AppDeploymentDiscriminator;
-import static io.apicurio.registry.operator.resource.ResourceFactory.COMPONENT_APP;
 import static io.apicurio.registry.operator.resource.ResourceKey.APP_DEPLOYMENT_KEY;
 import static io.apicurio.registry.operator.resource.ResourceKey.STUDIO_UI_SERVICE_KEY;
 import static io.apicurio.registry.operator.utils.Mapper.toYAML;
 import static java.util.Objects.requireNonNull;
 import static java.util.Optional.ofNullable;
 
-// spotless:off
-@KubernetesDependent(
-        labelSelector = "app.kubernetes.io/name=apicurio-registry,app.kubernetes.io/component=" + COMPONENT_APP,
-        resourceDiscriminator = AppDeploymentDiscriminator.class
-)
-// spotless:on
+@KubernetesDependent(resourceDiscriminator = AppDeploymentDiscriminator.class)
 public class AppDeploymentResource extends CRUDKubernetesDependentResource<Deployment, ApicurioRegistry3> {
 
     private static final Logger log = LoggerFactory.getLogger(AppDeploymentResource.class);

diff --git a/...ntroller/src/main/java/io/apicurio/registry/operator/resource/app/AppIngressResource.java b/...ntroller/src/main/java/io/apicurio/registry/operator/resource/app/AppIngressResource.java
@@ -16,12 +16,7 @@
 import static io.apicurio.registry.operator.utils.IngressUtils.withIngressRule;
 import static io.apicurio.registry.operator.utils.Mapper.toYAML;
 
-// spotless:off
-@KubernetesDependent(
-        labelSelector = "app.kubernetes.io/name=apicurio-registry,app.kubernetes.io/component=" + COMPONENT_APP,
-        resourceDiscriminator = AppIngressDiscriminator.class
-)
-// spotless:on
+@KubernetesDependent(resourceDiscriminator = AppIngressDiscriminator.class)
 public class AppIngressResource extends CRUDKubernetesDependentResource<Ingress, ApicurioRegistry3> {
 
     private static final Logger log = LoggerFactory.getLogger(AppIngressResource.class);

diff --git a/...ntroller/src/main/java/io/apicurio/registry/operator/resource/app/AppServiceResource.java b/...ntroller/src/main/java/io/apicurio/registry/operator/resource/app/AppServiceResource.java
@@ -8,17 +8,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static io.apicurio.registry.operator.resource.LabelDiscriminators.*;
-import static io.apicurio.registry.operator.resource.ResourceFactory.COMPONENT_APP;
+import static io.apicurio.registry.operator.resource.LabelDiscriminators.AppServiceDiscriminator;
 import static io.apicurio.registry.operator.resource.ResourceKey.APP_SERVICE_KEY;
 import static io.apicurio.registry.operator.utils.Mapper.toYAML;
 
-// spotless:off
-@KubernetesDependent(
-        labelSelector = "app.kubernetes.io/name=apicurio-registry,app.kubernetes.io/component=" + COMPONENT_APP,
-        resourceDiscriminator = AppServiceDiscriminator.class
-)
-// spotless:on
+@KubernetesDependent(resourceDiscriminator = AppServiceDiscriminator.class)
 public class AppServiceResource extends CRUDKubernetesDependentResource<Service, ApicurioRegistry3> {
 
     private static final Logger log = LoggerFactory.getLogger(AppServiceResource.class);

diff --git a/...main/java/io/apicurio/registry/operator/resource/studioui/StudioUIDeploymentResource.java b/...main/java/io/apicurio/registry/operator/resource/studioui/StudioUIDeploymentResource.java
@@ -16,20 +16,18 @@
 import java.util.LinkedHashMap;
 
 import static io.apicurio.registry.operator.api.v1.ContainerNames.STUDIO_UI_CONTAINER_NAME;
-import static io.apicurio.registry.operator.resource.ResourceFactory.COMPONENT_STUDIO_UI;
-import static io.apicurio.registry.operator.resource.ResourceKey.*;
+import static io.apicurio.registry.operator.resource.ResourceKey.APP_INGRESS_KEY;
+import static io.apicurio.registry.operator.resource.ResourceKey.APP_SERVICE_KEY;
+import static io.apicurio.registry.operator.resource.ResourceKey.STUDIO_UI_DEPLOYMENT_KEY;
+import static io.apicurio.registry.operator.resource.ResourceKey.UI_INGRESS_KEY;
+import static io.apicurio.registry.operator.resource.ResourceKey.UI_SERVICE_KEY;
 import static io.apicurio.registry.operator.resource.app.AppDeploymentResource.addEnvVar;
 import static io.apicurio.registry.operator.resource.app.AppDeploymentResource.getContainerFromDeployment;
 import static io.apicurio.registry.operator.utils.IngressUtils.withIngressRule;
 import static io.apicurio.registry.operator.utils.Mapper.toYAML;
 import static java.util.Optional.ofNullable;
 
-// spotless:off
-@KubernetesDependent(
-        labelSelector = "app.kubernetes.io/name=apicurio-registry,app.kubernetes.io/component=" + COMPONENT_STUDIO_UI,
-        resourceDiscriminator = StudioUIDeploymentDiscriminator.class
-)
-// spotless:on
+@KubernetesDependent(resourceDiscriminator = StudioUIDeploymentDiscriminator.class)
 public class StudioUIDeploymentResource
         extends CRUDKubernetesDependentResource<Deployment, ApicurioRegistry3> {
 

diff --git a/...rc/main/java/io/apicurio/registry/operator/resource/studioui/StudioUIIngressResource.java b/...rc/main/java/io/apicurio/registry/operator/resource/studioui/StudioUIIngressResource.java
@@ -16,12 +16,7 @@
 import static io.apicurio.registry.operator.utils.IngressUtils.withIngressRule;
 import static io.apicurio.registry.operator.utils.Mapper.toYAML;
 
-// spotless:off
-@KubernetesDependent(
-        labelSelector = "app.kubernetes.io/name=apicurio-registry,app.kubernetes.io/component=" + COMPONENT_STUDIO_UI,
-        resourceDiscriminator = StudioUIIngressDiscriminator.class
-)
-// spotless:on
+@KubernetesDependent(resourceDiscriminator = StudioUIIngressDiscriminator.class)
 public class StudioUIIngressResource extends CRUDKubernetesDependentResource<Ingress, ApicurioRegistry3> {
 
     private static final Logger log = LoggerFactory.getLogger(StudioUIIngressResource.class);

diff --git a/...rc/main/java/io/apicurio/registry/operator/resource/studioui/StudioUIServiceResource.java b/...rc/main/java/io/apicurio/registry/operator/resource/studioui/StudioUIServiceResource.java
@@ -9,16 +9,10 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static io.apicurio.registry.operator.resource.ResourceFactory.COMPONENT_STUDIO_UI;
 import static io.apicurio.registry.operator.resource.ResourceKey.STUDIO_UI_SERVICE_KEY;
 import static io.apicurio.registry.operator.utils.Mapper.toYAML;
 
-// spotless:off
-@KubernetesDependent(
-        labelSelector = "app.kubernetes.io/name=apicurio-registry,app.kubernetes.io/component=" + COMPONENT_STUDIO_UI,
-        resourceDiscriminator = StudioUIServiceDiscriminator.class
-)
-// spotless:on
+@KubernetesDependent(resourceDiscriminator = StudioUIServiceDiscriminator.class)
 public class StudioUIServiceResource extends CRUDKubernetesDependentResource<Service, ApicurioRegistry3> {
 
     private static final Logger log = LoggerFactory.getLogger(StudioUIServiceResource.class);

diff --git a/...troller/src/main/java/io/apicurio/registry/operator/resource/ui/UIDeploymentResource.java b/...troller/src/main/java/io/apicurio/registry/operator/resource/ui/UIDeploymentResource.java
@@ -16,20 +16,16 @@
 
 import static io.apicurio.registry.operator.api.v1.ContainerNames.REGISTRY_UI_CONTAINER_NAME;
 import static io.apicurio.registry.operator.resource.LabelDiscriminators.UIDeploymentDiscriminator;
-import static io.apicurio.registry.operator.resource.ResourceFactory.COMPONENT_UI;
-import static io.apicurio.registry.operator.resource.ResourceKey.*;
+import static io.apicurio.registry.operator.resource.ResourceKey.APP_INGRESS_KEY;
+import static io.apicurio.registry.operator.resource.ResourceKey.APP_SERVICE_KEY;
+import static io.apicurio.registry.operator.resource.ResourceKey.UI_DEPLOYMENT_KEY;
 import static io.apicurio.registry.operator.resource.app.AppDeploymentResource.addEnvVar;
 import static io.apicurio.registry.operator.resource.app.AppDeploymentResource.getContainerFromDeployment;
 import static io.apicurio.registry.operator.utils.IngressUtils.withIngressRule;
 import static io.apicurio.registry.operator.utils.Mapper.toYAML;
 import static java.util.Optional.ofNullable;
 
-// spotless:off
-@KubernetesDependent(
-        labelSelector = "app.kubernetes.io/name=apicurio-registry,app.kubernetes.io/component=" + COMPONENT_UI,
-        resourceDiscriminator = UIDeploymentDiscriminator.class
-)
-// spotless:on
+@KubernetesDependent(resourceDiscriminator = UIDeploymentDiscriminator.class)
 public class UIDeploymentResource extends CRUDKubernetesDependentResource<Deployment, ApicurioRegistry3> {
 
     private static final Logger log = LoggerFactory.getLogger(UIDeploymentResource.class);

diff --git a/...controller/src/main/java/io/apicurio/registry/operator/resource/ui/UIIngressResource.java b/...controller/src/main/java/io/apicurio/registry/operator/resource/ui/UIIngressResource.java
@@ -16,12 +16,7 @@
 import static io.apicurio.registry.operator.utils.IngressUtils.withIngressRule;
 import static io.apicurio.registry.operator.utils.Mapper.toYAML;
 
-// spotless:off
-@KubernetesDependent(
-        labelSelector = "app.kubernetes.io/name=apicurio-registry,app.kubernetes.io/component=" + COMPONENT_UI,
-        resourceDiscriminator = UIIngressDiscriminator.class
-)
-// spotless:on
+@KubernetesDependent(resourceDiscriminator = UIIngressDiscriminator.class)
 public class UIIngressResource extends CRUDKubernetesDependentResource<Ingress, ApicurioRegistry3> {
 
     private static final Logger log = LoggerFactory.getLogger(UIIngressResource.class);

diff --git a/...controller/src/main/java/io/apicurio/registry/operator/resource/ui/UIServiceResource.java b/...controller/src/main/java/io/apicurio/registry/operator/resource/ui/UIServiceResource.java
@@ -8,17 +8,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static io.apicurio.registry.operator.resource.LabelDiscriminators.*;
-import static io.apicurio.registry.operator.resource.ResourceFactory.COMPONENT_UI;
+import static io.apicurio.registry.operator.resource.LabelDiscriminators.UIServiceDiscriminator;
 import static io.apicurio.registry.operator.resource.ResourceKey.UI_SERVICE_KEY;
 import static io.apicurio.registry.operator.utils.Mapper.toYAML;
 
-// spotless:off
-@KubernetesDependent(
-        labelSelector = "app.kubernetes.io/name=apicurio-registry,app.kubernetes.io/component=" + COMPONENT_UI,
-        resourceDiscriminator = UIServiceDiscriminator.class
-)
-// spotless:on
+@KubernetesDependent(resourceDiscriminator = UIServiceDiscriminator.class)
 public class UIServiceResource extends CRUDKubernetesDependentResource<Service, ApicurioRegistry3> {
 
     private static final Logger log = LoggerFactory.getLogger(UIServiceResource.class);