Skip to content

Commit

Permalink
fix: fix k8s init config map and cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@matteo-s
matteo-s committed Jul 11, 2024
1 parent 0ec534e commit 1414aaf
Show file tree
Hide file tree
Showing 10 changed files with 143 additions and 274 deletions.
103 changes: 103 additions & 0 deletions ...main/java/it/smartcommunitylabdhub/framework/k8s/infrastructure/k8s/K8sBaseFramework.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@
import io.kubernetes.client.openapi.ApiClient;
import io.kubernetes.client.openapi.ApiException;
import io.kubernetes.client.openapi.apis.CoreV1Api;
import io.kubernetes.client.openapi.models.V1ConfigMap;
import io.kubernetes.client.openapi.models.V1EnvFromSource;
import io.kubernetes.client.openapi.models.V1EnvVar;
import io.kubernetes.client.openapi.models.V1LocalObjectReference;
import io.kubernetes.client.openapi.models.V1ObjectMeta;
import io.kubernetes.client.openapi.models.V1Pod;
import io.kubernetes.client.openapi.models.V1PodList;
import io.kubernetes.client.openapi.models.V1ResourceRequirements;
Expand All @@ -23,18 +25,23 @@
import it.smartcommunitylabdhub.commons.infrastructure.Framework;
import it.smartcommunitylabdhub.commons.jackson.JacksonMapper;
import it.smartcommunitylabdhub.commons.models.enums.State;
import it.smartcommunitylabdhub.commons.utils.MapUtils;
import it.smartcommunitylabdhub.framework.k8s.exceptions.K8sFrameworkException;
import it.smartcommunitylabdhub.framework.k8s.jackson.IntOrStringMixin;
import it.smartcommunitylabdhub.framework.k8s.kubernetes.K8sBuilderHelper;
import it.smartcommunitylabdhub.framework.k8s.kubernetes.K8sSecretHelper;
import it.smartcommunitylabdhub.framework.k8s.model.ContextRef;
import it.smartcommunitylabdhub.framework.k8s.model.ContextSource;
import it.smartcommunitylabdhub.framework.k8s.objects.CoreLabel;
import it.smartcommunitylabdhub.framework.k8s.objects.CoreLog;
import it.smartcommunitylabdhub.framework.k8s.objects.CoreMetric;
import it.smartcommunitylabdhub.framework.k8s.objects.CoreNodeSelector;
import it.smartcommunitylabdhub.framework.k8s.objects.CoreResource;
import it.smartcommunitylabdhub.framework.k8s.runnables.K8sRunnable;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Base64;
import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedList;
Expand All @@ -49,6 +56,7 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.lang.Nullable;
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;

@Slf4j
public abstract class K8sBaseFramework<T extends K8sRunnable, K extends KubernetesObject>
Expand Down Expand Up @@ -560,4 +568,99 @@ protected void cleanRunSecret(T runnable) {
log.warn("Failed to delete secret {}", secretName, e);
}
}

public V1ConfigMap buildInitConfigMap(T runnable) throws K8sFrameworkException {
//check context refs and build config
if (
(runnable.getContextSources() == null || runnable.getContextSources().isEmpty()) &&
(runnable.getContextRefs() == null || runnable.getContextRefs().isEmpty())
) {
//nothing to do
return null;
}

//build and create configMap
log.debug("build initConfigMap for {}", runnable.getId());
if (log.isTraceEnabled()) {
log.trace("contextSources {}", runnable.getContextSources());
log.trace("contextRefs {}", runnable.getContextRefs());
}

try {
// Generate Config map
Optional<List<ContextRef>> contextRefsOpt = Optional.ofNullable(runnable.getContextRefs());
Optional<List<ContextSource>> contextSourcesOpt = Optional.ofNullable(runnable.getContextSources());

V1ConfigMap configMap = new V1ConfigMap()
.metadata(new V1ObjectMeta().name("init-config-map-" + runnable.getId()).labels(buildLabels(runnable)))
.data(
MapUtils.mergeMultipleMaps(
// Generate context-refs.txt if exist
contextRefsOpt
.map(contextRefsList ->
Map.of(
"context-refs.txt",
contextRefsList
.stream()
.map(v ->
v.getProtocol() + "," + v.getDestination() + "," + v.getSource() + "\n"
)
.collect(Collectors.joining(""))
)
)
.orElseGet(Map::of),
// Generate context-sources.txt if exist
contextSourcesOpt
.map(contextSources ->
contextSources
.stream()
.filter(e -> StringUtils.hasText(e.getBase64()))
.collect(
Collectors.toMap(
c ->
Base64
.getUrlEncoder()
.withoutPadding()
.encodeToString(c.getName().getBytes()),
c ->
new String(
Base64.getDecoder().decode(c.getBase64()),
StandardCharsets.UTF_8
)
)
)
)
.orElseGet(Map::of),
contextSourcesOpt
.map(contextSources ->
Map.of(
"context-sources-map.txt",
contextSources
.stream()
.filter(e -> StringUtils.hasText(e.getBase64()))
.map(c ->
Base64
.getUrlEncoder()
.withoutPadding()
.encodeToString(c.getName().getBytes()) +
"," +
c.getName() +
"\n"
)
.collect(Collectors.joining(""))
)
)
.orElseGet(Map::of)
)
);

if (log.isTraceEnabled()) {
log.trace("configMap for {}: {}", runnable.getId(), configMap);
}

return configMap;
} catch (NullPointerException e) {
throw new K8sFrameworkException(e.getMessage());
}
}
}
11 changes: 11 additions & 0 deletions ...n/java/it/smartcommunitylabdhub/framework/k8s/infrastructure/k8s/K8sCronJobFramework.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import io.kubernetes.client.openapi.ApiClient;
import io.kubernetes.client.openapi.ApiException;
import io.kubernetes.client.openapi.apis.BatchV1Api;
import io.kubernetes.client.openapi.models.V1ConfigMap;
import io.kubernetes.client.openapi.models.V1CronJob;
import io.kubernetes.client.openapi.models.V1CronJobSpec;
import io.kubernetes.client.openapi.models.V1Job;
Expand Down Expand Up @@ -59,6 +60,16 @@ public K8sCronJobRunnable run(K8sCronJobRunnable runnable) throws K8sFrameworkEx
storeRunSecret(secret);
}

try {
V1ConfigMap initConfigMap = buildInitConfigMap(runnable);
if (initConfigMap != null) {
log.info("create initConfigMap for {}", String.valueOf(initConfigMap.getMetadata().getName()));
coreV1Api.createNamespacedConfigMap(namespace, initConfigMap, null, null, null, null);
}
} catch (ApiException | NullPointerException e) {
throw new K8sFrameworkException(e.getMessage());
}

log.info("create job for {}", String.valueOf(job.getMetadata().getName()));
job = create(job);

Expand Down
86 changes: 7 additions & 79 deletions ...ava/it/smartcommunitylabdhub/framework/k8s/infrastructure/k8s/K8sDeploymentFramework.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,11 @@
import io.kubernetes.client.openapi.models.V1VolumeMount;
import it.smartcommunitylabdhub.commons.annotations.infrastructure.FrameworkComponent;
import it.smartcommunitylabdhub.commons.models.enums.State;
import it.smartcommunitylabdhub.commons.utils.MapUtils;
import it.smartcommunitylabdhub.framework.k8s.exceptions.K8sFrameworkException;
import it.smartcommunitylabdhub.framework.k8s.model.ContextRef;
import it.smartcommunitylabdhub.framework.k8s.model.ContextSource;
import it.smartcommunitylabdhub.framework.k8s.objects.CoreVolume;
import it.smartcommunitylabdhub.framework.k8s.runnables.K8sDeploymentRunnable;
import jakarta.validation.constraints.NotNull;
import java.io.Serializable;
import java.nio.charset.StandardCharsets;
import java.util.Base64;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
Expand Down Expand Up @@ -75,81 +70,14 @@ public K8sDeploymentRunnable run(K8sDeploymentRunnable runnable) throws K8sFrame
storeRunSecret(secret);
}

//check context refs and build config
if (runnable.getContextRefs() != null || runnable.getContextSources() != null) {
//build and create configMap
//TODO move to shared method
try {
// Generate Config map
Optional<List<ContextRef>> contextRefsOpt = Optional.ofNullable(runnable.getContextRefs());
Optional<List<ContextSource>> contextSourcesOpt = Optional.ofNullable(runnable.getContextSources());
V1ConfigMap configMap = new V1ConfigMap()
.metadata(
new V1ObjectMeta().name("init-config-map-" + runnable.getId()).labels(buildLabels(runnable))
)
.data(
MapUtils.mergeMultipleMaps(
// Generate context-refs.txt if exist
contextRefsOpt
.map(contextRefsList ->
Map.of(
"context-refs.txt",
contextRefsList
.stream()
.map(v ->
v.getProtocol() + "," + v.getDestination() + "," + v.getSource() + "\n"
)
.collect(Collectors.joining(""))
)
)
.orElseGet(Map::of),
// Generate context-sources.txt if exist
contextSourcesOpt
.map(contextSources ->
contextSources
.stream()
.collect(
Collectors.toMap(
c ->
Base64
.getUrlEncoder()
.withoutPadding()
.encodeToString(c.getName().getBytes()),
c ->
new String(
Base64.getDecoder().decode(c.getBase64()),
StandardCharsets.UTF_8
)
)
)
)
.orElseGet(Map::of),
contextSourcesOpt
.map(contextSources ->
Map.of(
"context-sources-map.txt",
contextSources
.stream()
.map(c ->
Base64
.getUrlEncoder()
.withoutPadding()
.encodeToString(c.getName().getBytes()) +
"," +
c.getName() +
"\n"
)
.collect(Collectors.joining(""))
)
)
.orElseGet(Map::of)
)
);

coreV1Api.createNamespacedConfigMap(namespace, configMap, null, null, null, null);
} catch (ApiException | NullPointerException e) {
throw new K8sFrameworkException(e.getMessage());
try {
V1ConfigMap initConfigMap = buildInitConfigMap(runnable);
if (initConfigMap != null) {
log.info("create initConfigMap for {}", String.valueOf(initConfigMap.getMetadata().getName()));
coreV1Api.createNamespacedConfigMap(namespace, initConfigMap, null, null, null, null);
}
} catch (ApiException | NullPointerException e) {
throw new K8sFrameworkException(e.getMessage());
}

log.info("create deployment for {}", String.valueOf(deployment.getMetadata().getName()));
Expand Down
86 changes: 7 additions & 79 deletions .../main/java/it/smartcommunitylabdhub/framework/k8s/infrastructure/k8s/K8sJobFramework.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,11 @@
import io.kubernetes.client.openapi.models.V1VolumeMount;
import it.smartcommunitylabdhub.commons.annotations.infrastructure.FrameworkComponent;
import it.smartcommunitylabdhub.commons.models.enums.State;
import it.smartcommunitylabdhub.commons.utils.MapUtils;
import it.smartcommunitylabdhub.framework.k8s.exceptions.K8sFrameworkException;
import it.smartcommunitylabdhub.framework.k8s.model.ContextRef;
import it.smartcommunitylabdhub.framework.k8s.model.ContextSource;
import it.smartcommunitylabdhub.framework.k8s.objects.CoreVolume;
import it.smartcommunitylabdhub.framework.k8s.runnables.K8sJobRunnable;
import jakarta.validation.constraints.NotNull;
import java.io.Serializable;
import java.nio.charset.StandardCharsets;
import java.util.Base64;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
Expand Down Expand Up @@ -88,81 +83,14 @@ public K8sJobRunnable run(K8sJobRunnable runnable) throws K8sFrameworkException
storeRunSecret(secret);
}

//check context refs and build config
if (runnable.getContextRefs() != null || runnable.getContextSources() != null) {
//build and create configMap
//TODO move to shared method
try {
// Generate Config map
Optional<List<ContextRef>> contextRefsOpt = Optional.ofNullable(runnable.getContextRefs());
Optional<List<ContextSource>> contextSourcesOpt = Optional.ofNullable(runnable.getContextSources());
V1ConfigMap configMap = new V1ConfigMap()
.metadata(
new V1ObjectMeta().name("init-config-map-" + runnable.getId()).labels(buildLabels(runnable))
)
.data(
MapUtils.mergeMultipleMaps(
// Generate context-refs.txt if exist
contextRefsOpt
.map(contextRefsList ->
Map.of(
"context-refs.txt",
contextRefsList
.stream()
.map(v ->
v.getProtocol() + "," + v.getDestination() + "," + v.getSource() + "\n"
)
.collect(Collectors.joining(""))
)
)
.orElseGet(Map::of),
// Generate context-sources.txt if exist
contextSourcesOpt
.map(contextSources ->
contextSources
.stream()
.collect(
Collectors.toMap(
c ->
Base64
.getUrlEncoder()
.withoutPadding()
.encodeToString(c.getName().getBytes()),
c ->
new String(
Base64.getDecoder().decode(c.getBase64()),
StandardCharsets.UTF_8
)
)
)
)
.orElseGet(Map::of),
contextSourcesOpt
.map(contextSources ->
Map.of(
"context-sources-map.txt",
contextSources
.stream()
.map(c ->
Base64
.getUrlEncoder()
.withoutPadding()
.encodeToString(c.getName().getBytes()) +
"," +
c.getName() +
"\n"
)
.collect(Collectors.joining(""))
)
)
.orElseGet(Map::of)
)
);

coreV1Api.createNamespacedConfigMap(namespace, configMap, null, null, null, null);
} catch (ApiException | NullPointerException e) {
throw new K8sFrameworkException(e.getMessage());
try {
V1ConfigMap initConfigMap = buildInitConfigMap(runnable);
if (initConfigMap != null) {
log.info("create initConfigMap for {}", String.valueOf(initConfigMap.getMetadata().getName()));
coreV1Api.createNamespacedConfigMap(namespace, initConfigMap, null, null, null, null);
}
} catch (ApiException | NullPointerException e) {
throw new K8sFrameworkException(e.getMessage());
}

log.info("create job for {}", String.valueOf(job.getMetadata().getName()));
Expand Down
Loading

0 comments on commit 1414aaf

Please sign in to comment.