Replay upstream changes

.drone.yml

@@ -6,9 +6,6 @@ volumes:
 - name: output
   claim:
     name: flexvolsmb-drone-output
-- name: scratch
-  claim:
-    name: flexvolsmb-drone-scratch
 
 steps:
 - name: Debugging information
@@ -22,12 +19,6 @@ 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

Makefile

@@ -81,7 +81,7 @@ deps-osc:
 	hack/ensure-packer.sh
 	hack/ensure-goss.sh
 	packer plugins install github.com/outscale/outscale
-   
+
 .PHONY: deps-gce
 deps-gce: ## Installs/checks dependencies for GCE builds
 deps-gce:
@@ -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
@@ -494,7 +494,7 @@ $(OCI_VALIDATE_TARGETS): deps-oci
 	packer validate $(PACKER_NODE_FLAGS) -var-file="$(abspath packer/oci/$(subst validate-oci-,,$@).json)" $(ABSOLUTE_PACKER_VAR_FILES) packer/oci/packer.json
 
 .PHONY: $(OSC_BUILD_TARGETS)
-$(OSC_BUILD_TARGETS): deps-osc 
+$(OSC_BUILD_TARGETS): deps-osc
 	packer build $(PACKER_NODE_FLAGS) -var-file="$(abspath packer/outscale/$(subst build-osc-,,$@).json)" $(ABSOLUTE_PACKER_VAR_FILES) packer/outscale/packer.json
 
 .PHONY: $(OSC_VALIDATE_TARGETS)

ansible/roles/custom/tasks/main.yml

@@ -1,6 +0,0 @@
-- 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 ]

packer/config/additional_components.json

@@ -2,8 +2,8 @@
   "additional_executables": "false",
   "additional_executables_destination_path": "",
   "additional_executables_list": "",
-  "additional_registry_images": "false",
+  "additional_registry_images": "true",
-  "additional_registry_images_list": "",
+  "additional_registry_images_list": "ghcr.io/kube-vip/kube-vip:v0.5.5",
   "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": "open-iscsi",
+  "extra_debs": "nfs-common open-iscsi",
   "extra_repos": "",
   "extra_rpms": "",
   "firstboot_custom_roles_post": "",
@@ -9,9 +9,9 @@
   "http_proxy": "",
   "https_proxy": "",
   "no_proxy": "",
-  "node_custom_roles_post": "custom",
+  "node_custom_roles_post": "",
   "node_custom_roles_pre": "",
-  "pause_image": "registry.k8s.io/pause:3.6",
+  "pause_image": "registry.k8s.io/pause:3.8",
   "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.23.15-00",
+  "kubernetes_deb_version": "1.25.9-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.23.15-0",
+  "kubernetes_rpm_version": "1.25.9-0",
-  "kubernetes_semver": "v1.23.15",
+  "kubernetes_semver": "v1.25.9",
-  "kubernetes_series": "v1.23",
+  "kubernetes_series": "v1.25",
   "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 '{{user `shutdown_command`}}'",
+      "shutdown_command": "echo '{{user `ssh_password`}}' | sudo -S -E sh -c 'usermod -L {{user `ssh_username`}} && {{user `shutdown_command`}}'",
       "ssh_password": "{{user `ssh_password`}}",
       "ssh_timeout": "4h",
       "ssh_username": "{{user `ssh_username`}}",