refactor(remote-dev): use constants for K8s labels

Signed-off-by: Marc Nuri <marc@marcnuri.com>

jkube-kit/remote-dev/src/main/java/org/eclipse/jkube/kit/remotedev/KubernetesSshServiceForwarder.java

@@ -22,14 +22,16 @@
 
 import java.io.IOException;
 import java.net.InetAddress;
-import java.util.UUID;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import static org.eclipse.jkube.kit.common.util.AsyncUtil.await;
+import static org.eclipse.jkube.kit.remotedev.RemoteDevelopmentService.LABEL_INSTANCE;
+import static org.eclipse.jkube.kit.remotedev.RemoteDevelopmentService.LABEL_NAME;
+import static org.eclipse.jkube.kit.remotedev.RemoteDevelopmentService.LABEL_PART_OF;
 import static org.eclipse.jkube.kit.remotedev.RemoteDevelopmentService.REMOTE_DEVELOPMENT_APP;
 import static org.eclipse.jkube.kit.remotedev.RemoteDevelopmentService.REMOTE_DEVELOPMENT_GROUP;
 
@@ -90,9 +92,9 @@ private Pod deploySshServerPod() {
  final PodBuilder pod = new PodBuilder()
  .withNewMetadata()
  .withName(name)
- .addToLabels("app", REMOTE_DEVELOPMENT_APP)
- .addToLabels("group", REMOTE_DEVELOPMENT_GROUP)
- .addToLabels("jkube-id", context.getSessionID().toString())
+ .addToLabels(LABEL_INSTANCE, context.getSessionID().toString())
+ .addToLabels(LABEL_NAME, REMOTE_DEVELOPMENT_APP)
+ .addToLabels(LABEL_PART_OF, REMOTE_DEVELOPMENT_GROUP)
  .endMetadata()
  .withNewSpec()
  .addNewContainer()

jkube-kit/remote-dev/src/main/java/org/eclipse/jkube/kit/remotedev/LocalService.java

@@ -22,6 +22,8 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
+import static org.eclipse.jkube.kit.remotedev.RemoteDevelopmentService.LABEL_NAME;
+import static org.eclipse.jkube.kit.remotedev.RemoteDevelopmentService.LABEL_PART_OF;
 import static org.eclipse.jkube.kit.remotedev.RemoteDevelopmentService.REMOTE_DEVELOPMENT_APP;
 import static org.eclipse.jkube.kit.remotedev.RemoteDevelopmentService.REMOTE_DEVELOPMENT_GROUP;
 
@@ -46,8 +48,8 @@ public Service toKubernetesService() {
  .endMetadata()
  .withNewSpec()
  .withType(type)
- .addToSelector("app", REMOTE_DEVELOPMENT_APP)
- .addToSelector("group", REMOTE_DEVELOPMENT_GROUP)
+ .addToSelector(LABEL_NAME, REMOTE_DEVELOPMENT_APP)
+ .addToSelector(LABEL_PART_OF, REMOTE_DEVELOPMENT_GROUP)
  .addNewPort()
  .withProtocol("TCP")
  .withPort(port)

jkube-kit/remote-dev/src/main/java/org/eclipse/jkube/kit/remotedev/LocalServiceManager.java

@@ -21,6 +21,8 @@
 
 import java.util.Collections;
 
+import static org.eclipse.jkube.kit.remotedev.RemoteDevelopmentService.LABEL_INSTANCE;
+
 
 class LocalServiceManager {
 
@@ -71,7 +73,7 @@ public void createOrReplaceServices() {
  }
  final Service newService = newServiceBuilder
  .editSpec()
- .addToSelector("jkube-id", context.getSessionID().toString())
+ .addToSelector(LABEL_INSTANCE, context.getSessionID().toString())
  .endSpec()
  .build();
  kubernetesClient.services().resource(newService).createOrReplace();

jkube-kit/remote-dev/src/main/java/org/eclipse/jkube/kit/remotedev/RemoteDevelopmentService.java

@@ -23,6 +23,9 @@
 
 public class RemoteDevelopmentService {
 
+ static final String LABEL_INSTANCE = "app.kubernetes.io/instance";
+ static final String LABEL_NAME = "app.kubernetes.io/name";
+ static final String LABEL_PART_OF = "app.kubernetes.io/part-of";
  static final String REMOTE_DEVELOPMENT_APP = "jkube-remote-dev";
  static final String REMOTE_DEVELOPMENT_GROUP = "jkube-kit";
  private final RemoteDevelopmentContext context;

jkube-kit/remote-dev/src/test/java/org/eclipse/jkube/kit/remotedev/KubernetesSshServiceForwarderTest.java

@@ -76,9 +76,9 @@ void deployPodWithImage() {
  executorService.submit(kubernetesSshServiceForwarder);
  // Then
  final Pod result = kubernetesClient.pods()
- .withLabel("app", "jkube-remote-dev")
- .withLabel("group", "jkube-kit")
- .withLabel("jkube-id", context.getSessionID().toString())
+ .withLabel("app.kubernetes.io/name", "jkube-remote-dev")
+ .withLabel("app.kubernetes.io/part-of", "jkube-kit")
+ .withLabel("app.kubernetes.io/instance", context.getSessionID().toString())
  .waitUntilCondition(Objects::nonNull, 10, TimeUnit.SECONDS);
 
  assertThat(result)
@@ -95,9 +95,9 @@ void deployPodWithPortDefinitions() {
  executorService.submit(kubernetesSshServiceForwarder);
  // Then
  final Pod result = kubernetesClient.pods()
- .withLabel("app", "jkube-remote-dev")
- .withLabel("group", "jkube-kit")
- .withLabel("jkube-id", context.getSessionID().toString())
+ .withLabel("app.kubernetes.io/name", "jkube-remote-dev")
+ .withLabel("app.kubernetes.io/part-of", "jkube-kit")
+ .withLabel("app.kubernetes.io/instance", context.getSessionID().toString())
  .waitUntilCondition(Objects::nonNull, 10, TimeUnit.SECONDS);
 
  assertThat(result)
@@ -182,8 +182,8 @@ private String getRemoteDevPodName() {
 
  static String getRemoteDevPodName(KubernetesClient kubernetesClient) {
  return kubernetesClient.pods()
- .withLabel("app", "jkube-remote-dev")
- .withLabel("group", "jkube-kit")
+ .withLabel("app.kubernetes.io/name", "jkube-remote-dev")
+ .withLabel("app.kubernetes.io/part-of", "jkube-kit")
  .waitUntilCondition(Objects::nonNull, 10, TimeUnit.SECONDS)
  .getMetadata().getName();
  }

jkube-kit/remote-dev/src/test/java/org/eclipse/jkube/kit/remotedev/LocalServiceManagerTest.java

@@ -82,9 +82,9 @@ void createOrReplaceServices_usesJKubeSelectors() {
  .extracting(Service::getSpec)
  .extracting(ServiceSpec::getSelector)
  .asInstanceOf(InstanceOfAssertFactories.MAP)
- .containsEntry("app", "jkube-remote-dev")
- .containsEntry("group", "jkube-kit")
- .containsEntry("jkube-id", context.getSessionID().toString());
+ .containsEntry("app.kubernetes.io/name", "jkube-remote-dev")
+ .containsEntry("app.kubernetes.io/part-of", "jkube-kit")
+ .containsEntry("app.kubernetes.io/instance", context.getSessionID().toString());
  }
 
  @Test