update
diff --git a/charts/virtual-machine/templates/configs.yaml b/charts/virtual-machine/templates/configs.yaml
deleted file mode 100644
index a82046e..0000000
--- a/charts/virtual-machine/templates/configs.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-{{- if .Values.configFiles }}
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: configs-{{ .Values.name }}
-data:
- {{ toYaml .Values.configFiles | nindent 2 }}
-{{- end }}
diff --git a/charts/virtual-machine/templates/secret-network-data.yaml b/charts/virtual-machine/templates/secret-network-data.yaml
index d4051ac..02c002c 100644
--- a/charts/virtual-machine/templates/secret-network-data.yaml
+++ b/charts/virtual-machine/templates/secret-network-data.yaml
@@ -3,9 +3,5 @@
metadata:
name: {{ .Values.name }}-network-data
type: Opaque
-stringData:
- networkdata: |
- version: 2
- ethernets:
- enp1s0:
- dhcp4: true
+data:
+ networkdata: {{ .Values.cloudInit.networkData}}
diff --git a/charts/virtual-machine/templates/secret-user-data.yaml b/charts/virtual-machine/templates/secret-user-data.yaml
index 6e370ef..228ab91 100644
--- a/charts/virtual-machine/templates/secret-user-data.yaml
+++ b/charts/virtual-machine/templates/secret-user-data.yaml
@@ -1,15 +1,7 @@
-{{- $userData := .Values.cloudInit.userData }}
-{{- if .Values.configFiles }}
-{{- $runcmd := get $userData "runcmd" | default list }}
-{{- $mkdir := print "sudo mkdir -p /home/" .Values.username "/.dodo" }}
-{{- $mount := print "sudo mount -t virtiofs configs /home/" .Values.username "/.dodo" }}
-{{- $_ := set $userData "runcmd" (concat $runcmd (list $mkdir $mount)) }}
-{{- end }}
-{{- $userDataYaml := print "#cloud-config\n" (toYaml $userData) }}
apiVersion: v1
kind: Secret
metadata:
name: {{ .Values.name }}-user-data
type: Opaque
data:
- userdata: {{ $userDataYaml | b64enc }}
+ userdata: {{ .Values.cloudInit.userData}}
diff --git a/charts/virtual-machine/templates/vm.yaml b/charts/virtual-machine/templates/vm.yaml
index ebb2fcb..3a0a446 100644
--- a/charts/virtual-machine/templates/vm.yaml
+++ b/charts/virtual-machine/templates/vm.yaml
@@ -38,9 +38,6 @@
disk:
bus: virtio
readonly: true
- filesystems:
- - name: configs
- virtiofs: {}
networks:
- name: default
pod: {}
@@ -54,8 +51,3 @@
name: {{ .Values.name }}-user-data
networkDataSecretRef:
name: {{ .Values.name }}-network-data
- {{- if .Values.configFiles }}
- - name: configs
- configMap:
- name: configs-{{ .Values.name }}
- {{- end }}
diff --git a/charts/virtual-machine/values.yaml b/charts/virtual-machine/values.yaml
index cf2f6ed..0199d6f 100644
--- a/charts/virtual-machine/values.yaml
+++ b/charts/virtual-machine/values.yaml
@@ -1,5 +1,4 @@
-name: "dodo"
-username: "dodo"
+name: ""
cpuCores: 1
memory: "1Gi"
disk:
@@ -7,6 +6,5 @@
size: 64Gi
ports: []
cloudInit:
- userData: {}
- networkData: {}
-configFiles: {}
+ userData: "" # base64 encoded
+ networkData: "" # base64 encoded