Use the configured kubernetes dev service flavor instead of trying to detect it from the image #38154
Conversation
|
Thanks for your pull request! The title of your pull request does not follow our editorial rules. Could you have a look?
This message is automatically generated by a bot. |
Tanemahuta
changed the title
...nt/src/main/java/io/quarkus/kubernetes/client/deployment/DevServicesKubernetesProcessor.java
Outdated
Show resolved
Hide resolved
...nt/src/main/java/io/quarkus/kubernetes/client/deployment/DevServicesKubernetesProcessor.java
Outdated
Show resolved
Hide resolved
| public Map<String, String> getKubeconfig() { | ||
| var image = getContainerInfo().getConfig().getImage(); | ||
| if (image.contains("rancher/k3s")) { | ||
| return getKubernetesClientConfigFromKubeConfig( | ||
| return switch (flavor) { | ||
| case k3s -> getKubernetesClientConfigFromKubeConfig( | ||
| KubeConfigUtils.parseKubeConfig(KubeConfigUtils.replaceServerInKubeconfig(containerAddress.getUrl(), | ||
| getFileContentFromContainer(K3S_KUBECONFIG)))); | ||
| } else if (image.contains("kindest/node")) { | ||
| return getKubernetesClientConfigFromKubeConfig( | ||
| case kind -> getKubernetesClientConfigFromKubeConfig( | ||
| KubeConfigUtils.parseKubeConfig(KubeConfigUtils.replaceServerInKubeconfig(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())); | ||
| } | ||
|
|
||
| // this can happen only if the user manually start | ||
| // a DEV_SERVICE_LABEL labeled container with an invalid image name | ||
| throw new RuntimeException("The container with the label '" + DEV_SERVICE_LABEL | ||
| + "' is not compatible with Dev Services for Kubernetes. Stop it or disable Dev Services for Kubernetes."); | ||
| case api_only -> | ||
| getKubernetesClientConfigFromKubeConfig(getKubeconfigFromApiContainer(containerAddress.getUrl())); | ||
| default -> throw new RuntimeException("The container with the label '" + DEV_SERVICE_LABEL | ||
| + "' is not compatible with Dev Services for Kubernetes. Stop it or disable Dev Services for Kubernetes."); | ||
| }; |
There was a problem hiding this comment.
Please don't use Java 17 language flavors in existing code, as it makes backports hard
There was a problem hiding this comment.
Time has passed and I think we are now fine with it as I don't expect us to backport this to 3.2.
|
Thanks a lot for the contribution! I added some small comments |
|
I should also note that when the issues are addressed, we'll need the commits to be squashed |
|
Can you please squash the commits and rebase onto the latest main? Thanks |
Instead of trying to detect it from the image. Fixes quarkusio#38152
|
@geoand I rebased/squashed and fixed the formatting. I let you review if things are all good for you as I haven't checked the rationale of this patch. |
|
I have to admit I am struggling to understand the change. @metacosm you know more about this so maybe you can chime in |
Status for workflow
|
Fixes #38152