From 892c74a47d42883fd04784aff895b8698a81952b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Crocquesel?= <88554524+scrocquesel@users.noreply.github.com> Date: Sat, 29 Apr 2023 15:43:03 +0200 Subject: [PATCH] Lowercase enum values to avoid hypen in k8s flavor accronym (cherry picked from commit c1ebd0844c342a627a3ae9555bcac1e53d65d5b8) --- .../client/deployment/DevServicesKubernetesProcessor.java | 6 +++--- .../runtime/KubernetesDevServicesBuildTimeConfig.java | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/extensions/kubernetes-client/deployment/src/main/java/io/quarkus/kubernetes/client/deployment/DevServicesKubernetesProcessor.java b/extensions/kubernetes-client/deployment/src/main/java/io/quarkus/kubernetes/client/deployment/DevServicesKubernetesProcessor.java index 9ba246d4a00e2..b2996cf385d54 100644 --- a/extensions/kubernetes-client/deployment/src/main/java/io/quarkus/kubernetes/client/deployment/DevServicesKubernetesProcessor.java +++ b/extensions/kubernetes-client/deployment/src/main/java/io/quarkus/kubernetes/client/deployment/DevServicesKubernetesProcessor.java @@ -197,17 +197,17 @@ private RunningDevService startKubernetes(DockerStatusBuildItem dockerStatusBuil final Supplier defaultKubernetesClusterSupplier = () -> { KubernetesContainer container; switch (config.flavor) { - case API_ONLY: + case api_only: container = new ApiServerContainer( config.apiVersion.map(version -> findOrElseThrow(version, ApiServerContainerVersion.class)) .orElseGet(() -> latest(ApiServerContainerVersion.class))); break; - case K3S: + case k3s: container = new K3sContainer( config.apiVersion.map(version -> findOrElseThrow(version, K3sContainerVersion.class)) .orElseGet(() -> latest(K3sContainerVersion.class))); break; - case KIND: + case kind: container = new KindContainer( config.apiVersion.map(version -> findOrElseThrow(version, KindContainerVersion.class)) .orElseGet(() -> latest(KindContainerVersion.class))); diff --git a/extensions/kubernetes-client/runtime-internal/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesDevServicesBuildTimeConfig.java b/extensions/kubernetes-client/runtime-internal/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesDevServicesBuildTimeConfig.java index 6c50f4ce8154e..3c194f1d269d9 100644 --- a/extensions/kubernetes-client/runtime-internal/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesDevServicesBuildTimeConfig.java +++ b/extensions/kubernetes-client/runtime-internal/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesDevServicesBuildTimeConfig.java @@ -29,7 +29,7 @@ public class KubernetesDevServicesBuildTimeConfig { /** * The flavor to use (kind, k3s or api-only). Default to api-only. */ - @ConfigItem(defaultValue = "API_ONLY") + @ConfigItem(defaultValue = "api-only") public Flavor flavor; /** @@ -70,14 +70,14 @@ public static enum Flavor { /** * kind (needs priviledge docker) */ - KIND, + kind, /** * k3s (needs priviledge docker) */ - K3S, + k3s, /** * api only */ - API_ONLY; + api_only; } }