DodoApp: Support dev virtual machines
Change-Id: Ib7641adb5be477bdde7cd9a06df4b45aa65a1c01
diff --git a/charts/virtual-machine/templates/secret-network-data.yaml b/charts/virtual-machine/templates/secret-network-data.yaml
new file mode 100644
index 0000000..02c002c
--- /dev/null
+++ b/charts/virtual-machine/templates/secret-network-data.yaml
@@ -0,0 +1,7 @@
+apiVersion: v1
+kind: Secret
+metadata:
+ name: {{ .Values.name }}-network-data
+type: Opaque
+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
new file mode 100644
index 0000000..228ab91
--- /dev/null
+++ b/charts/virtual-machine/templates/secret-user-data.yaml
@@ -0,0 +1,7 @@
+apiVersion: v1
+kind: Secret
+metadata:
+ name: {{ .Values.name }}-user-data
+type: Opaque
+data:
+ userdata: {{ .Values.cloudInit.userData}}
diff --git a/charts/virtual-machine/templates/service-code-server.yaml b/charts/virtual-machine/templates/service-code-server.yaml
deleted file mode 100644
index 3be8855..0000000
--- a/charts/virtual-machine/templates/service-code-server.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-# TODO(gio): enable
-# apiVersion: v1
-# kind: Service
-# metadata:
-# name: {{ .Values.name }}-code-server
-# spec:
-# type: ClusterIP
-# selector:
-# app: {{ .Values.name }}
-# ports:
-# - name: http
-# port: 80
-# targetPort: 8080 # TODO(gio): add to values.yaml
-# protocol: TCP
diff --git a/charts/virtual-machine/templates/service.yaml b/charts/virtual-machine/templates/service.yaml
new file mode 100644
index 0000000..b79b385
--- /dev/null
+++ b/charts/virtual-machine/templates/service.yaml
@@ -0,0 +1,10 @@
+apiVersion: v1
+kind: Service
+metadata:
+ name: {{ .Values.name }}
+spec:
+ type: ClusterIP
+ selector:
+ app: {{ .Values.name }}
+ ports:
+ {{- toYaml .Values.servicePorts | nindent 4 }}
diff --git a/charts/virtual-machine/templates/vm.yaml b/charts/virtual-machine/templates/vm.yaml
index d66da80..40c4a34 100644
--- a/charts/virtual-machine/templates/vm.yaml
+++ b/charts/virtual-machine/templates/vm.yaml
@@ -22,7 +22,8 @@
devices:
interfaces:
- name: default
- masquerade: {}
+ # masquerade: {}
+ bridge: {}
ports:
{{- range .Values.ports }}
- port: {{ . }}
@@ -44,6 +45,7 @@
claimName: dv-{{ .Values.name }}
- name: cloudinitdisk
cloudInitNoCloud:
- userData: |
- #cloud-config
- {{- toYaml .Values.cloudInit.userData | nindent 14 }}
+ secretRef:
+ name: {{ .Values.name }}-user-data
+ networkDataSecretRef:
+ name: {{ .Values.name }}-network-data
diff --git a/charts/virtual-machine/values.yaml b/charts/virtual-machine/values.yaml
index 6c8b642..79ea0a9 100644
--- a/charts/virtual-machine/values.yaml
+++ b/charts/virtual-machine/values.yaml
@@ -6,4 +6,6 @@
size: 64Gi
ports: []
cloudInit:
- userData: {}
+ userData: "" # base64 encoded
+ networkData: "" # base64 encoded
+ports: []