Added fixes for VM backups

Signed-off-by: Myasnikov Daniil <myasnikovdaniil2001@gmail.com>

packages/apps/vm-instance/templates/secret.yaml

@@ -6,7 +6,7 @@ metadata:
   name: {{ include "virtual-machine.fullname" $ }}-ssh-keys
 stringData:
   {{- range $k, $v := .Values.sshKeys }}
-  key{{ $k }}: {{ quote $v }} 
+  key{{ $k }}: {{ quote $v }}
   {{- end }}
 {{- end }}
 {{- if or .Values.cloudInit .Values.sshKeys }}
@@ -27,7 +27,21 @@ stringData:
     #cloud-config
     ssh_authorized_keys:
       {{- range .Values.sshKeys }}
-      - {{ quote . }} 
+      - {{ quote . }}
       {{- end }}
     {{- end }}
+    networkdata: |
+    {{- /*
+      Provide network config without MAC addresses so the VM can be restored/cloned
+      with a new MAC without breaking DHCP. Interface names are stable by PCI slot:
+      enp1s0 = default (pod) NIC, enp2s0+ = additional subnet NICs.
+    */}}
+    version: 2
+    ethernets:
+      enp1s0:
+        dhcp4: true
+    {{- range $i, $subnet := .Values.subnets }}
+      enp{{ add $i 2 }}s0:
+        dhcp4: true
+    {{- end }}
 {{- end }}

packages/apps/vm-instance/templates/vm.yaml

@@ -113,6 +113,8 @@ spec:
         cloudInitNoCloud:
           secretRef:
             name: {{ include "virtual-machine.fullname" . }}-cloud-init
+          networkDataSecretRef:
+            name: {{ include "virtual-machine.fullname" . }}-cloud-init
       {{- end }}
       networks:
       - name: default

packages/core/platform/sources/backupstrategy-controller.yaml

@@ -18,5 +18,5 @@ spec:
       path: system/backupstrategy-controller
       install:
         privileged: true
-        namespace: cozy-backupstrategy-controller
+        namespace: cozy-backup-controller
         releaseName: backupstrategy-controller

packages/system/backup-controller/templates/rbac.yaml

@@ -14,3 +14,10 @@ rules:
 - apiGroups: ["backups.cozystack.io"]
   resources: ["backupjobs"]
   verbs: ["create", "get", "list", "watch"]
+# Leader election (--leader-elect)
+- apiGroups: ["coordination.k8s.io"]
+  resources: ["leases"]
+  verbs: ["get", "list", "watch", "create", "update", "patch"]
+- apiGroups: [""]
+  resources: ["events"]
+  verbs: ["create", "patch"]

packages/system/backupstrategy-controller/templates/rbac.yaml

@@ -30,6 +30,10 @@ rules:
 - apiGroups: ["velero.io"]
   resources: ["backups", "restores"]
   verbs: ["create", "get", "list", "watch", "update", "patch"]
+# Events from Recorder.Event() calls
+- apiGroups: [""]
+  resources: ["events"]
+  verbs: ["create", "patch"]
 # Leader election (--leader-elect)
 - apiGroups: ["coordination.k8s.io"]
   resources: ["leases"]

packages/system/kubevirt-instancetypes/templates/preferences.yaml

@@ -1069,7 +1069,7 @@ spec:
     preferredAutoattachInputDevice: true
     preferredDiskBus: sata
     preferredInterfaceModel: e1000e
-    preferredTPM:
+    preferredTPM: {}
   features:
     preferredAcpi: {}
     preferredApic: {}
@@ -1135,7 +1135,7 @@ spec:
     preferredInputBus: virtio
     preferredInputType: tablet
     preferredInterfaceModel: virtio
-    preferredTPM:
+    preferredTPM: {}
   features:
     preferredAcpi: {}
     preferredApic: {}
@@ -1455,7 +1455,7 @@ spec:
     preferredAutoattachInputDevice: true
     preferredDiskBus: sata
     preferredInterfaceModel: e1000e
-    preferredTPM:
+    preferredTPM: {}
   features:
     preferredAcpi: {}
     preferredApic: {}
@@ -1521,7 +1521,7 @@ spec:
     preferredInputBus: virtio
     preferredInputType: tablet
     preferredInterfaceModel: virtio
-    preferredTPM:
+    preferredTPM: {}
   features:
     preferredAcpi: {}
     preferredApic: {}
@@ -1585,7 +1585,7 @@ spec:
     preferredAutoattachInputDevice: true
     preferredDiskBus: sata
     preferredInterfaceModel: e1000e
-    preferredTPM:
+    preferredTPM: {}
   features:
     preferredAcpi: {}
     preferredApic: {}
@@ -1651,7 +1651,7 @@ spec:
     preferredInputBus: virtio
     preferredInputType: tablet
     preferredInterfaceModel: virtio
-    preferredTPM:
+    preferredTPM: {}
   features:
     preferredAcpi: {}
     preferredApic: {}