-
Notifications
You must be signed in to change notification settings - Fork 2.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refactor: Kubernetes extension now uses
quarkus.
- Loading branch information
Showing
43 changed files
with
3,009 additions
and
275 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
22 changes: 0 additions & 22 deletions
22
...ubernetes/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesConfig.java
This file was deleted.
Oops, something went wrong.
99 changes: 99 additions & 0 deletions
99
...netes/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesConfigUtil.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,99 @@ | ||
package io.quarkus.kubernetes.deployment; | ||
|
||
import static io.quarkus.kubernetes.deployment.Constants.*; | ||
|
||
import java.util.Arrays; | ||
import java.util.HashMap; | ||
import java.util.HashSet; | ||
import java.util.List; | ||
import java.util.Map; | ||
import java.util.Optional; | ||
import java.util.Set; | ||
import java.util.stream.Collectors; | ||
import java.util.stream.StreamSupport; | ||
|
||
import org.eclipse.microprofile.config.Config; | ||
import org.eclipse.microprofile.config.ConfigProvider; | ||
|
||
import io.dekorate.utils.Strings; | ||
|
||
public class KubernetesConfigUtil { | ||
|
||
private static final String DEKORATE_PREFIX = "dekorate."; | ||
private static final String QUARKUS_PREFIX = "quarkus."; | ||
private static final Set<String> ALLOWED_GENERATORS = new HashSet( | ||
Arrays.asList("kubernetes", "openshift", "knative", "docker", "s2i")); | ||
private static final Set<String> IMAGE_GENERATORS = new HashSet(Arrays.asList("docker", "s2i")); | ||
|
||
public static List<String> getDeploymentTargets() { | ||
return getDeploymentTargets(toMap()); | ||
} | ||
|
||
public static List<String> getDeploymentTargets(Map<String, Object> map) { | ||
return Arrays.stream(map.getOrDefault(DEKORATE_PREFIX + DEPLOYMENT_TARGET, KUBERNETES).toString().split(",")) | ||
.map(String::trim) | ||
.map(String::toLowerCase) | ||
.collect(Collectors.toList()); | ||
} | ||
|
||
public static Optional<String> getDockerRegistry(Map<String, Object> map) { | ||
return IMAGE_GENERATORS.stream().map(g -> map.get(DEKORATE_PREFIX + g + ".registry")).filter(p -> p != null) | ||
.map(String::valueOf).findFirst(); | ||
} | ||
|
||
public static Optional<String> getGroup(Map<String, Object> map) { | ||
return ALLOWED_GENERATORS.stream().map(g -> map.get(DEKORATE_PREFIX + g + ".group")).filter(p -> p != null) | ||
.map(String::valueOf).findFirst(); | ||
} | ||
|
||
/* | ||
* Collects configuration properties for Kubernetes. Reads all properties and | ||
* matches properties that match known dekorate generators. These properties may | ||
* or may not be prefixed with `quarkus.` though the prefixed ones take | ||
* precedence. | ||
* | ||
* @return A map containing the properties. | ||
*/ | ||
public static Map<String, Object> toMap() { | ||
Config config = ConfigProvider.getConfig(); | ||
Map<String, Object> result = new HashMap<>(); | ||
|
||
/* | ||
* Map<String, Object> quarkusPrefixed = StreamSupport.stream(config.getPropertyNames().spliterator(), false) | ||
* .filter(s -> s.startsWith(QUARKUS_PREFIX)) | ||
* .map(s -> s.replaceFirst(QUARKUS_PREFIX, "")) | ||
* .filter(k -> ALLOWED_GENERATORS.contains(generatorName(k))) | ||
* .filter(k -> config.getOptionalValue(QUARKUS_PREFIX + k, String.class).isPresent()) | ||
* .collect(Collectors.toMap(k -> DEKORATE_PREFIX + k, | ||
* k -> config.getValue(QUARKUS_PREFIX + k, String.class))); | ||
*/ | ||
|
||
Map<String, Object> UnPrefixed = StreamSupport.stream(config.getPropertyNames().spliterator(), false) | ||
.filter(k -> ALLOWED_GENERATORS.contains(generatorName(k))) | ||
.filter(k -> config.getOptionalValue(k, String.class).isPresent()) | ||
.collect(Collectors.toMap(k -> DEKORATE_PREFIX + k, k -> config.getValue(k, String.class))); | ||
|
||
result.putAll(UnPrefixed); | ||
//result.putAll(quarkusPrefixed); | ||
return result; | ||
} | ||
|
||
/** | ||
* Returns the name of the generators that can handle the specified key. | ||
* | ||
* @param key The key. | ||
* @return The generator name or null if the key format is unexpected. | ||
*/ | ||
private static String generatorName(String key) { | ||
if (Strings.isNullOrEmpty(key) || !key.contains(".")) { | ||
return null; | ||
} | ||
return key.substring(0, key.indexOf(".")); | ||
} | ||
|
||
private <T> T[] toArray(List<T> list) { | ||
Class clazz = list.get(0).getClass(); | ||
T[] array = (T[]) java.lang.reflect.Array.newInstance(clazz, list.size()); | ||
return list.toArray(array); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.