Merge pull request #49415 from LarsSven/ls/produce-on-existing-devservice

Still produce KubernetesDevServiceInfoBuildItem when a dev service already exists

Author: holly-cummins

extensions/kubernetes-client/deployment/src/main/java/io/quarkus/kubernetes/client/deployment/DevServicesKubernetesProcessor.java

@@ -184,8 +184,8 @@ public void applyManifests(
             KubernetesDevServiceInfoBuildItem kubernetesDevServiceInfoBuildItem,
             KubernetesClientBuildConfig kubernetesClientBuildTimeConfig) {
         if (kubernetesDevServiceInfoBuildItem == null) {
-            // Gracefully return in case the Kubernetes dev service could not be spun up.
-            log.warn("Cannot apply manifests because the Kubernetes dev service is not running");
+            // Gracefully return in case the Kubernetes dev service could not be found
+            log.error("Cannot apply manifests because the Kubernetes dev service is not running");
             return;
         }
 
@@ -367,6 +367,13 @@ private RunningDevService startKubernetes(DockerStatusBuildItem dockerStatusBuil
                     getKubernetesClientConfigFromKubeConfig(kubeConfig));
         };
 
+        maybeContainerAddress.ifPresent(containerAddress -> {
+            devServicesKube
+                    .produce(new KubernetesDevServiceInfoBuildItem(
+                            KubeConfigUtils.serializeKubeConfig(getKubeconfigFromRunningContainer(containerAddress)),
+                            containerAddress.getId()));
+        });
+
         return maybeContainerAddress
                 .map(containerAddress -> new RunningDevService(Feature.KUBERNETES_CLIENT.getName(),
                         containerAddress.getId(),
@@ -425,6 +432,13 @@ private Map<String, String> resolveConfigurationFromRunningContainer(ContainerAd
         return container.getKubeconfig();
     }
 
+    private KubeConfig getKubeconfigFromRunningContainer(ContainerAddress containerAddress) {
+        var dockerClient = DockerClientFactory.lazyClient();
+        var container = new RunningContainer(dockerClient, containerAddress);
+
+        return container.getKubeconfigFromContainer();
+    }
+
     private KubernetesDevServiceCfg getConfiguration(KubernetesClientBuildConfig cfg) {
         KubernetesDevServicesBuildTimeConfig devServicesConfig = cfg.devservices();
         return new KubernetesDevServiceCfg(devServicesConfig);
@@ -496,19 +510,19 @@ public RunningContainer(DockerClient dockerClient, ContainerAddress containerAdd
             this.containerInfo = dockerClient.inspectContainerCmd(getContainerId()).exec();
         }
 
-        public Map<String, String> getKubeconfig() {
+        private KubeConfig getKubeconfigFromContainer() {
             var image = getContainerInfo().getConfig().getImage();
             if (image.contains("rancher/k3s")) {
-                return getKubernetesClientConfigFromKubeConfig(
-                        KubeConfigUtils.parseKubeConfig(KubeConfigUtils.replaceServerInKubeconfig(containerAddress.getUrl(),
-                                getFileContentFromContainer(K3S_KUBECONFIG))));
+                return KubeConfigUtils
+                        .parseKubeConfig(KubeConfigUtils.replaceServerInKubeconfig("https://" + containerAddress.getUrl(),
+                                getFileContentFromContainer(K3S_KUBECONFIG)));
             } else if (image.contains("kindest/node")) {
-                return getKubernetesClientConfigFromKubeConfig(
-                        KubeConfigUtils.parseKubeConfig(KubeConfigUtils.replaceServerInKubeconfig(containerAddress.getUrl(),
-                                getFileContentFromContainer(KIND_KUBECONFIG))));
+                return KubeConfigUtils
+                        .parseKubeConfig(KubeConfigUtils.replaceServerInKubeconfig("https://" + containerAddress.getUrl(),
+                                getFileContentFromContainer(KIND_KUBECONFIG)));
             } else if (image.contains("k8s.gcr.io/kube-apiserver") ||
                     image.contains("registry.k8s.io/kube-apiserver")) {
-                return getKubernetesClientConfigFromKubeConfig(getKubeconfigFromApiContainer(containerAddress.getUrl()));
+                return getKubeconfigFromApiContainer(containerAddress.getUrl());
             }
 
             // this can happen only if the user manually start
@@ -517,6 +531,10 @@ public Map<String, String> getKubeconfig() {
                     + "' is not compatible with Dev Services for Kubernetes. Stop it or disable Dev Services for Kubernetes.");
         }
 
+        public Map<String, String> getKubeconfig() {
+            return getKubernetesClientConfigFromKubeConfig(getKubeconfigFromContainer());
+        }
+
         protected KubeConfig getKubeconfigFromApiContainer(final String url) {
             final Cluster cluster = new Cluster();
             cluster.setName(APISERVER);