mnl/VM-Operator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 4 Wiki Activity Actions

Trigger immediate update.

Browse source
This commit is contained in:
Michael Lipp 2023-07-28 22:12:50 +02:00
parent 7ebc4f50b3
commit 6be7239d49
3 changed files with 27 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
org.jdrupes.vmoperator.manager/resources/org/jdrupes/vmoperator/manager/runnerPod.ftl.yaml
View file

@ -7,7 +7,11 @@ metadata:
app.kubernetes.io/name: ${ constants.APP_NAME } app.kubernetes.io/name: ${ constants.APP_NAME }
app.kubernetes.io/instance: ${ cr.metadata.name.asString } app.kubernetes.io/instance: ${ cr.metadata.name.asString }
app.kubernetes.io/managed-by: ${ constants.VM_OP_NAME } app.kubernetes.io/managed-by: ${ constants.VM_OP_NAME }
annotations:
# Triggers update of config map mounted in pod
# See https://ahmet.im/blog/kubernetes-secret-volumes-delay/
vmrunner.jdrupes.org/cmVersion: "${ cm.metadata.resourceVersion.asString }"
spec: spec:
containers: containers:
- name: ${ cr.metadata.name.asString } - name: ${ cr.metadata.name.asString }

6
org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/K8s.java
View file

@ -122,15 +122,15 @@ public class K8s {
* @throws ApiException the api exception * @throws ApiException the api exception
*/ */
public static <T extends KubernetesObject, LT extends KubernetesListObject> public static <T extends KubernetesObject, LT extends KubernetesListObject>
void T apply(GenericKubernetesApi<T, LT> api, T existing, String update)
apply(GenericKubernetesApi<T, LT> api, T existing, String update)
throws ApiException { throws ApiException {
PatchOptions opts = new PatchOptions(); PatchOptions opts = new PatchOptions();
opts.setForce(false); opts.setForce(false);
opts.setFieldManager("kubernetes-java-kubectl-apply"); opts.setFieldManager("kubernetes-java-kubectl-apply");
api.patch(existing.getMetadata().getNamespace(), var response = api.patch(existing.getMetadata().getNamespace(),
existing.getMetadata().getName(), V1Patch.PATCH_FORMAT_APPLY_YAML, existing.getMetadata().getName(), V1Patch.PATCH_FORMAT_APPLY_YAML,
new V1Patch(update), opts).throwsApiException(); new V1Patch(update), opts).throwsApiException();
return response.getObject();
} }
} }

24
org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/Reconciler.java
View file

@ -29,6 +29,7 @@ import freemarker.template.TemplateException;
import freemarker.template.TemplateExceptionHandler; import freemarker.template.TemplateExceptionHandler;
import freemarker.template.TemplateHashModel; import freemarker.template.TemplateHashModel;
import freemarker.template.TemplateNotFoundException; import freemarker.template.TemplateNotFoundException;
import io.kubernetes.client.custom.V1Patch;
import io.kubernetes.client.openapi.ApiException; import io.kubernetes.client.openapi.ApiException;
import io.kubernetes.client.util.generic.dynamic.DynamicKubernetesApi; import io.kubernetes.client.util.generic.dynamic.DynamicKubernetesApi;
import io.kubernetes.client.util.generic.dynamic.DynamicKubernetesObject; import io.kubernetes.client.util.generic.dynamic.DynamicKubernetesObject;
@ -118,7 +119,8 @@ public class Reconciler extends Component {
if (event.type() != Type.DELETED) { if (event.type() != Type.DELETED) {
reconcileDataPvc(model, channel); reconcileDataPvc(model, channel);
reconcileDisks(vmDef, channel); reconcileDisks(vmDef, channel);
reconcileConfigMap(event, model, channel); var configMap = reconcileConfigMap(event, model, channel);
model.put("cm", configMap.getRaw());
reconcilePod(event, model, channel); reconcilePod(event, model, channel);
} else { } else {
reconcilePod(event, model, channel); reconcilePod(event, model, channel);
@ -229,7 +231,7 @@ public class Reconciler extends Component {
} }
} }
private void reconcileConfigMap(VmDefChanged event, private DynamicKubernetesObject reconcileConfigMap(VmDefChanged event,
Map<String, Object> model, WatchChannel channel) Map<String, Object> model, WatchChannel channel)
throws IOException, TemplateException, ApiException { throws IOException, TemplateException, ApiException {
// Get API and check if exists // Get API and check if exists
@ -242,7 +244,7 @@ public class Reconciler extends Component {
if (existing.isPresent()) { if (existing.isPresent()) {
K8s.delete(cmApi, existing.get()); K8s.delete(cmApi, existing.get());
} }
return; return null;
} }
// Combine template and data and parse result // Combine template and data and parse result
@ -254,7 +256,7 @@ public class Reconciler extends Component {
var mapDef = Dynamics.newFromYaml(out.toString()); var mapDef = Dynamics.newFromYaml(out.toString());
// Apply // Apply
K8s.apply(cmApi, mapDef, out.toString()); return K8s.apply(cmApi, mapDef, out.toString());
} }
private void reconcilePod(VmDefChanged event, Map<String, Object> model, private void reconcilePod(VmDefChanged event, Map<String, Object> model,
@ -281,9 +283,21 @@ public class Reconciler extends Component {
// https://github.com/kubernetes-client/java/issues/2741 // https://github.com/kubernetes-client/java/issues/2741
var podDef = Dynamics.newFromYaml(out.toString()); var podDef = Dynamics.newFromYaml(out.toString());
// Nothing can be updated here // Check if update
if (existing.isEmpty()) { if (existing.isEmpty()) {
podApi.create(podDef); podApi.create(podDef);
} else {
// only annotations are updated
var metadata = new JsonObject();
metadata.add("annotations", GsonPtr.to(podDef.getRaw())
.to("metadata").get(JsonObject.class, "annotations").get());
var patch = new JsonObject();
patch.add("metadata", metadata);
podApi.patch(existing.get().getMetadata().getNamespace(),
existing.get().getMetadata().getName(),
V1Patch.PATCH_FORMAT_JSON_MERGE_PATCH,
new V1Patch(channel.client().getJSON().serialize(patch)))
.throwsApiException();
} }
} }