.drone.yml

@@ -6,6 +6,9 @@ volumes:
 - name: output
   claim:
     name: flexvolsmb-drone-output
+- name: scratch
+  claim:
+    name: flexvolsmb-drone-scratch
 
 steps:
 - name: Debugging information
@@ -19,13 +22,19 @@ steps:
   image: bv11-cr01.bessems.eu/library/packer-extended
   pull: always
   commands:
+  - |
+    apt-get update
+  - |
+    apt-get install -y \
+      curl \
+      make
   - |
     jq '.password="'"$VSPHERE_PASSWORD"'"' ./packer/ova/vsphere.json > /tmp/vsphere.json && \
     mv /tmp/vsphere.json ./packer/ova/vsphere.json
   - |
     make deps-ova
   - |
-    make build-node-ova-vsphere-ubuntu-2204
+    make build-node-ova-vsphere-ubuntu-2004
   - |
     mv -fv ./output/**/*.ova /output
   environment:

Makefile

@@ -93,7 +93,7 @@ deps-gce:
 deps-ova: ## Installs/checks dependencies for OVA builds
 deps-ova:
 	hack/ensure-ansible.sh
-	: hack/ensure-ansible-windows.sh
+	hack/ensure-ansible-windows.sh
 	hack/ensure-packer.sh
 	hack/ensure-goss.sh
 	hack/ensure-ovftool.sh

ansible/roles/custom/tasks/main.yml

@@ -0,0 +1,6 @@
+- name: Override cloud-init datasource list
+  ansible.builtin.copy:
+    dest: /etc/cloud/cloud.cfg.d/90_dpkg.cfg
+    content: |
+      # To update this file, run dpkg-reconfigure cloud-init
+      datasource_list: [ VMware, None ]

ansible/roles/providers/tasks/vmware-ubuntu.yml

@@ -43,11 +43,3 @@
     - { src: files/etc/networkd-dispatcher/routable.d/20-chrony.j2, dest: /etc/networkd-dispatcher/routable.d/20-chrony }
     - { src: files/etc/networkd-dispatcher/off.d/20-chrony.j2, dest: /etc/networkd-dispatcher/off.d/20-chrony }
     - { src: files/etc/networkd-dispatcher/no-carrier.d/20-chrony.j2, dest: /etc/networkd-dispatcher/no-carrier.d/20-chrony }
-
-- name: Create cloud-init datasource config file
-  copy:
-    dest: /etc/cloud/ds-identify.cfg
-    force: true
-    content: |
-      datasource: VMware
-  when: ansible_distribution_version is version('22.04', '>=')

ansible/roles/sysprep/tasks/debian.yml

@@ -93,15 +93,3 @@
   file:
     state: absent
     path: /etc/udev/rules.d/70-persistent-net.rules
-
-- name: Removing subiquity disable cloud-init networking config
-  file:
-    path: /etc/cloud/cloud.cfg.d/subiquity-disable-cloudinit-networking.cfg
-    state: absent
-  when: ansible_distribution_version is version('22.04', '>=')
-
-- name: Removing 99-installer.cfg which sets the cloud-init datasource to None
-  file:
-    path: /etc/cloud/cloud.cfg.d/99-installer.cfg
-    state: absent
-  when: ansible_distribution_version is version('22.04', '>=')

packer/config/additional_components.json

@@ -2,8 +2,8 @@
   "additional_executables": "false",
   "additional_executables_destination_path": "",
   "additional_executables_list": "",
-  "additional_registry_images": "true",
+  "additional_registry_images": "false",
-  "additional_registry_images_list": "ghcr.io/kube-vip/kube-vip:v0.5.5",
+  "additional_registry_images_list": "",
   "additional_url_images": "false",
   "additional_url_images_list": "",
   "load_additional_components": "false"

packer/config/common.json

@@ -1,7 +1,7 @@
 {
   "build_target": "virt",
   "disable_public_repos": "false",
-  "extra_debs": "nfs-common open-iscsi",
+  "extra_debs": "open-iscsi",
   "extra_repos": "",
   "extra_rpms": "",
   "firstboot_custom_roles_post": "",
@@ -9,9 +9,9 @@
   "http_proxy": "",
   "https_proxy": "",
   "no_proxy": "",
-  "node_custom_roles_post": "",
+  "node_custom_roles_post": "custom",
   "node_custom_roles_pre": "",
-  "pause_image": "registry.k8s.io/pause:3.8",
+  "pause_image": "registry.k8s.io/pause:3.6",
   "pip_conf_file": "",
   "redhat_epel_rpm": "https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm",
   "reenable_public_repos": "true",

packer/config/kubernetes.json

@@ -8,16 +8,16 @@
   "kubernetes_container_registry": "registry.k8s.io",
   "kubernetes_deb_gpg_key": "https://packages.cloud.google.com/apt/doc/apt-key.gpg",
   "kubernetes_deb_repo": "\"https://apt.kubernetes.io/ kubernetes-xenial\"",
-  "kubernetes_deb_version": "1.25.10-00",
+  "kubernetes_deb_version": "1.23.15-00",
   "kubernetes_http_source": "https://dl.k8s.io/release",
   "kubernetes_load_additional_imgs": "false",
   "kubernetes_rpm_gpg_check": "True",
   "kubernetes_rpm_gpg_key": "\"https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg\"",
   "kubernetes_rpm_repo": "https://packages.cloud.google.com/yum/repos/kubernetes-el7-{{user `kubernetes_rpm_repo_arch`}}",
   "kubernetes_rpm_repo_arch": "x86_64",
-  "kubernetes_rpm_version": "1.25.10-0",
+  "kubernetes_rpm_version": "1.23.15-0",
-  "kubernetes_semver": "v1.25.10",
+  "kubernetes_semver": "v1.23.15",
-  "kubernetes_series": "v1.25",
+  "kubernetes_series": "v1.23",
   "kubernetes_source_type": "pkg",
   "systemd_prefix": "/usr/lib/systemd",
   "sysusr_prefix": "/usr",

packer/ova/packer-node.json

@@ -221,7 +221,7 @@
         }
       ],
       "password": "{{user `password`}}",
-      "shutdown_command": "echo '{{user `ssh_password`}}' | sudo -S -E sh -c 'usermod -L {{user `ssh_username`}} && {{user `shutdown_command`}}'",
+      "shutdown_command": "echo '{{user `ssh_password`}}' | sudo -S -E sh -c '{{user `shutdown_command`}}'",
       "ssh_password": "{{user `ssh_password`}}",
       "ssh_timeout": "4h",
       "ssh_username": "{{user `ssh_username`}}",

packer/ova/ubuntu-2204.json

@@ -8,9 +8,9 @@
   "distro_name": "ubuntu",
   "distro_version": "22.04",
   "guest_os_type": "ubuntu-64",
-  "iso_checksum": "5e38b55d57d94ff029719342357325ed3bda38fa80054f9330dc789cd2d43931",
+  "iso_checksum": "10f19c5b2b8d6db711582e0e27f5116296c34fe4b313ba45f9b201a5007056cb",
   "iso_checksum_type": "sha256",
-  "iso_url": "https://releases.ubuntu.com/jammy/ubuntu-22.04.2-live-server-amd64.iso",
+  "iso_url": "https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso",
   "os_display_name": "Ubuntu 22.04",
   "shutdown_command": "shutdown -P now",
   "vsphere_guest_os_type": "ubuntu64Guest"