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

Better name for runner pvc.

Browse source
This commit is contained in:
Michael Lipp 2023-07-28 18:01:37 +02:00
parent 7fdec42905
commit 838bd1bb5e
5 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
deploy/crds/vmoperator-crd.yaml
View file

@ -208,6 +208,7 @@ spec:
idempotence and configuration definition. Cannot be idempotence and configuration definition. Cannot be
updated. More info: http://kubernetes.io/docs/user-guide/identifiers#names. updated. More info: http://kubernetes.io/docs/user-guide/identifiers#names.
The name is generated automatically but can be overriden. The name is generated automatically but can be overriden.
Note that the name "<vm-name>-runner-data" is reserved.
type: string type: string
labels: labels:
description: >- description: >-

4
deploy/test-vm.yaml
View file

@ -20,8 +20,8 @@ spec:
mac: "00:16:3e:33:59:10" mac: "00:16:3e:33:59:10"
disks: disks:
- volumeClaimTemplate: - volumeClaimTemplate:
# metadata: metadata:
# name: test-vm-system name: test-vm-system
spec: spec:
storageClassName: "" storageClassName: ""
selector: selector:

2
org.jdrupes.vmoperator.manager/resources/org/jdrupes/vmoperator/manager/vmDataPvc.ftl.yaml → org.jdrupes.vmoperator.manager/resources/org/jdrupes/vmoperator/manager/runnerDataPvc.ftl.yaml
View file

@ -2,7 +2,7 @@ kind: PersistentVolumeClaim
apiVersion: v1 apiVersion: v1
metadata: metadata:
namespace: ${ cr.metadata.namespace.asString } namespace: ${ cr.metadata.namespace.asString }
name: ${ cr.metadata.name.asString + "-data" } name: ${ cr.metadata.name.asString + "-runner-data" }
labels: labels:
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 }

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

@ -60,7 +60,7 @@ spec:
name: ${ cr.metadata.name.asString } name: ${ cr.metadata.name.asString }
- name: vm-data - name: vm-data
persistentVolumeClaim: persistentVolumeClaim:
claimName: ${ cr.metadata.name.asString }-data claimName: ${ cr.metadata.name.asString }-runner-data
<#assign diskCounter = 0/> <#assign diskCounter = 0/>
<#list cr.spec.vm.disks.asList() as disk> <#list cr.spec.vm.disks.asList() as disk>
<#if disk.volumeClaimTemplate.metadata?? <#if disk.volumeClaimTemplate.metadata??

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

@ -132,7 +132,7 @@ public class Reconciler extends Component {
WatchChannel channel) WatchChannel channel)
throws TemplateException, ApiException, IOException { throws TemplateException, ApiException, IOException {
// Combine template and data and parse result // Combine template and data and parse result
var fmTemplate = fmConfig.getTemplate("vmDataPvc.ftl.yaml"); var fmTemplate = fmConfig.getTemplate("runnerDataPvc.ftl.yaml");
StringWriter out = new StringWriter(); StringWriter out = new StringWriter();
fmTemplate.process(model, out); fmTemplate.process(model, out);
// Avoid Yaml.load due to // Avoid Yaml.load due to