summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wedgwood <cw@f00f.org>2017-10-31 02:24:56 +0000
committerChris Wedgwood <cw@f00f.org>2017-10-31 03:30:17 +0000
commit6d249ac2fabf35574d65988d8b873c926989cbd7 (patch)
treec40aa33c42afc8e4e2d7ecd103c66c06d606de3b
parente9b9182f7fda9b82b4123dca6eee87c4e467dc4c (diff)
Rename entry point file appropriately
-rw-r--r--README.md2
-rw-r--r--README.rst2
-rwxr-xr-xberth/templates/bin/_startvm.sh.tpl (renamed from berth/templates/bin/_startvm.txt)0
-rw-r--r--berth/templates/iter-configmap.yaml4
-rw-r--r--berth/templates/iter-deployment.yaml8
5 files changed, 8 insertions, 8 deletions
diff --git a/README.md b/README.md
index 7534aa8..b3dc4b6 100644
--- a/README.md
+++ b/README.md
@@ -79,7 +79,7 @@ At a high level, it works like this:
79 ConfigMap mounts with the same name and turning them into an ISO 79 ConfigMap mounts with the same name and turning them into an ISO
80 presented to the guest. 80 presented to the guest.
81 81
82The startvm entry-point supports several environment variables: 82The startvm.sh entry-point supports several environment variables:
83 83
84* `IMG_SOURCE` which is an http or https URL that contains a qcow2 84* `IMG_SOURCE` which is an http or https URL that contains a qcow2
85 image. It can also be a full path to a local file baked into the 85 image. It can also be a full path to a local file baked into the
diff --git a/README.rst b/README.rst
index 8734ba9..8d0ef85 100644
--- a/README.rst
+++ b/README.rst
@@ -79,7 +79,7 @@ At a high level, it works like this:
79 ConfigMap mounts with the same name and turning them into an ISO 79 ConfigMap mounts with the same name and turning them into an ISO
80 presented to the guest. 80 presented to the guest.
81 81
82The startvm entry-point supports several environment variables: 82The startvm.sh entry-point supports several environment variables:
83 83
84 * `IMG_SOURCE` which is an http or https URL that contains a qcow2 84 * `IMG_SOURCE` which is an http or https URL that contains a qcow2
85 image. It can also be a full path to a local file baked into the 85 image. It can also be a full path to a local file baked into the
diff --git a/berth/templates/bin/_startvm.txt b/berth/templates/bin/_startvm.sh.tpl
index 0de881f..0de881f 100755
--- a/berth/templates/bin/_startvm.txt
+++ b/berth/templates/bin/_startvm.sh.tpl
diff --git a/berth/templates/iter-configmap.yaml b/berth/templates/iter-configmap.yaml
index 2b2fcff..4840621 100644
--- a/berth/templates/iter-configmap.yaml
+++ b/berth/templates/iter-configmap.yaml
@@ -14,8 +14,8 @@ kind: ConfigMap
14metadata: 14metadata:
15 name: configmap-generic-startvm 15 name: configmap-generic-startvm
16data: 16data:
17 startvm: | 17 startvm.sh: |
18{{ tuple "bin/_startvm.txt" . | include "template" | indent 4 }} 18{{ tuple "bin/_startvm.sh.tpl" . | include "template" | indent 4 }}
19 19
20--- 20---
21 21
diff --git a/berth/templates/iter-deployment.yaml b/berth/templates/iter-deployment.yaml
index e615a98..fecd008 100644
--- a/berth/templates/iter-deployment.yaml
+++ b/berth/templates/iter-deployment.yaml
@@ -41,7 +41,7 @@ spec:
41 securityContext: 41 securityContext:
42 privileged: true 42 privileged: true
43 command: 43 command:
44 - /usr/local/bin/startvm 44 - /startvm.sh
45{{- if $vm.netconfig.ports }} 45{{- if $vm.netconfig.ports }}
46 ports: 46 ports:
47{{- range $for, $port := $vm.netconfig.ports }} 47{{- range $for, $port := $vm.netconfig.ports }}
@@ -55,8 +55,8 @@ spec:
55{{- end }} 55{{- end }}
56 volumeMounts: 56 volumeMounts:
57 - name: volume-startvm 57 - name: volume-startvm
58 mountPath: /usr/local/bin/startvm 58 mountPath: /startvm.sh
59 subPath: startvm 59 subPath: startvm.sh
60 - name: image 60 - name: image
61 mountPath: /image 61 mountPath: /image
62 - name: dev 62 - name: dev
@@ -73,7 +73,7 @@ spec:
73 - name: volume-startvm 73 - name: volume-startvm
74 configMap: 74 configMap:
75 name: configmap-generic-startvm 75 name: configmap-generic-startvm
76 defaultMode: 0755 76 defaultMode: 0555
77 - name: image 77 - name: image
78 persistentVolumeClaim: 78 persistentVolumeClaim:
79 claimName: {{ $name }} 79 claimName: {{ $name }}