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

Merge branch 'fix/cloud-init-hostname' into testing

Browse source
This commit is contained in:
Michael Lipp 2025-01-30 16:57:26 +01:00
commit ad79e8542a
2 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -58,11 +58,7 @@ data:
# Forward the cloud-init data if provided # Forward the cloud-init data if provided
<#if spec.cloudInit??> <#if spec.cloudInit??>
cloudInit: cloudInit:
<#if spec.cloudInit.metaData??> metaData: ${ toJson(adjustCloudInitMeta(spec.cloudInit.metaData!{}, cr.metadata())) }
metaData: ${ toJson(adjustCloudInitMeta(spec.cloudInit.metaData, cr.metadata())) }
<#else>
metaData: {}
</#if>
<#if spec.cloudInit.userData??> <#if spec.cloudInit.userData??>
userData: ${ toJson(spec.cloudInit.userData) } userData: ${ toJson(spec.cloudInit.userData) }
<#else> <#else>

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

@ -29,7 +29,9 @@ import freemarker.template.TemplateException;
import freemarker.template.TemplateExceptionHandler; import freemarker.template.TemplateExceptionHandler;
import freemarker.template.TemplateHashModel; import freemarker.template.TemplateHashModel;
import freemarker.template.TemplateMethodModelEx; import freemarker.template.TemplateMethodModelEx;
import freemarker.template.TemplateModel;
import freemarker.template.TemplateModelException; import freemarker.template.TemplateModelException;
import freemarker.template.utility.DeepUnwrap;
import io.kubernetes.client.custom.Quantity; import io.kubernetes.client.custom.Quantity;
import io.kubernetes.client.openapi.ApiException; import io.kubernetes.client.openapi.ApiException;
import io.kubernetes.client.openapi.models.V1ObjectMeta; import io.kubernetes.client.openapi.models.V1ObjectMeta;
@ -53,7 +55,6 @@ import static org.jdrupes.vmoperator.manager.Constants.COMP_DISPLAY_SECRET;
import org.jdrupes.vmoperator.manager.events.ResetVm; import org.jdrupes.vmoperator.manager.events.ResetVm;
import org.jdrupes.vmoperator.manager.events.VmChannel; import org.jdrupes.vmoperator.manager.events.VmChannel;
import org.jdrupes.vmoperator.manager.events.VmDefChanged; import org.jdrupes.vmoperator.manager.events.VmDefChanged;
import org.jdrupes.vmoperator.util.DataPath;
import org.jdrupes.vmoperator.util.ExtendedObjectWrapper; import org.jdrupes.vmoperator.util.ExtendedObjectWrapper;
import org.jgrapes.core.Channel; import org.jgrapes.core.Channel;
import org.jgrapes.core.Component; import org.jgrapes.core.Component;
@ -354,8 +355,9 @@ public class Reconciler extends Component {
return ""; return "";
} }
try { try {
var imageUri = new URI("file://" + Constants.IMAGE_REPO_PATH var imageUri
+ "/").resolve(image); = new URI("file://" + Constants.IMAGE_REPO_PATH + "/")
.resolve(image);
if ("file".equals(imageUri.getScheme())) { if ("file".equals(imageUri.getScheme())) {
return imageUri.getPath(); return imageUri.getPath();
} }
@ -374,9 +376,8 @@ public class Reconciler extends Component {
public Object exec(@SuppressWarnings("rawtypes") List arguments) public Object exec(@SuppressWarnings("rawtypes") List arguments)
throws TemplateModelException { throws TemplateModelException {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
var res = (Map<String, Object>) DataPath var res = new HashMap<>((Map<String, Object>) DeepUnwrap
.deepCopy(((AdapterTemplateModel) arguments.get(0)) .unwrap((TemplateModel) arguments.get(0)));
.getAdaptedObject(Object.class));
var metadata var metadata
= (V1ObjectMeta) ((AdapterTemplateModel) arguments.get(1)) = (V1ObjectMeta) ((AdapterTemplateModel) arguments.get(1))
.getAdaptedObject(Object.class); .getAdaptedObject(Object.class);