feat: create package bundle for ubuntu 22.04

.github/workflows/aws-e2e.yaml

@@ -70,6 +70,8 @@ jobs:
             buildConfig: "basic"
           - os: "ubuntu 22.04"
             buildConfig: "nvidia"
+          - os: "ubuntu 22.04"
+            buildConfig: "offline"
           # Rocky 9.1
           - os: "rocky 9.1"
             buildConfig: "basic"

.github/workflows/vsphere-e2e.yaml

@@ -29,6 +29,8 @@ jobs:
           buildConfig: "basic"
         - os: "ubuntu 22.04"
           buildConfig: "basic"
+        - os: "ubuntu 22.04"
+          buildConfig: "offline"
         - os: "rocky 9.1"
           buildConfig: "offline"
         - os: "oracle 9.4"

bundles/ubuntu22.04/bundle.sh.gotmpl

@@ -0,0 +1,35 @@
+#!/bin/bash
+set -euo pipefail
+export DEBIAN_FRONTEND=noninteractive
+apt-get update && apt-get install -y --no-install-recommends \
+apt-transport-https software-properties-common dpkg-dev curl gpg
+
+KUBERNETES_DEB_BUILD_VERSION="1.1"
+CRI_TOOLS_DEB_BUILD_VERSION="1.1"
+
+# Install dependencies.
+mkdir -p /etc/apt/keyrings
+curl -fsSL "https://pkgs.k8s.io/core:/stable:/{{ .KubernetesMajorMinorVersion }}/deb/Release.key" | gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg
+echo "deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/{{ .KubernetesMajorMinorVersion }}/deb/ /" | tee /etc/apt/sources.list.d/kubernetes.list
+apt-get update
+#shellcheck disable=SC2046
+apt-cache depends --recurse --no-recommends --no-suggests --no-conflicts --no-breaks --no-replaces --no-enhances --no-pre-depends $(< packages.txt) | grep "^\w" > /tmp/packages
+
+# The list returned by apt-cache depends does not contain the versions
+# Append the bare Kubernetes packages with the provided versions
+sed -i 's/kubelet/kubelet='"{{ .KubernetesVersion }}-${KUBERNETES_DEB_BUILD_VERSION}"'/' /tmp/packages
+sed -i 's/kubectl/kubectl='"{{ .KubernetesVersion }}-${KUBERNETES_DEB_BUILD_VERSION}"'/' /tmp/packages
+sed -i 's/kubeadm/kubeadm='"{{ .KubernetesVersion }}-${KUBERNETES_DEB_BUILD_VERSION}"'/' /tmp/packages
+sed -i 's/cri-tools/cri-tools='"{{ .CRIToolsVersion }}-${CRI_TOOLS_DEB_BUILD_VERSION}"'/' /tmp/packages
+
+TMP_DIR="$(mktemp -d repodata-XXXX)"
+pushd "${TMP_DIR}"
+#shellcheck disable=SC2046
+apt-get download $(< /tmp/packages)
+dpkg-scanpackages -m . | gzip > Packages.gz
+#shellcheck disable=SC1083,SC2035
+tar -czf  {{ .OutputDirectory }}/{{ .KubernetesVersion }}_ubuntu_22.04_x86_64.tar.gz *
+#shellcheck disable=SC1083
+chmod 777 {{ .OutputDirectory }}/{{ .KubernetesVersion }}_ubuntu_22.04_x86_64.tar.gz
+popd
+rm -rf "${TMP_DIR}"

bundles/ubuntu22.04/packages.txt.gotmpl

@@ -0,0 +1,19 @@
+apt-transport-https
+chrony
+nfs-common
+python3-cryptography
+python3-pip
+libseccomp2
+kubectl={{ .KubernetesVersion }}-1.1
+kubelet={{ .KubernetesVersion }}-1.1
+kubeadm={{ .KubernetesVersion }}-1.1
+cloud-init
+cloud-guest-utils
+cloud-initramfs-copymods
+cloud-initramfs-dyn-netconf
+open-iscsi
+lvm2
+xfsprogs
+ipvsadm
+lsscsi
+sysstat

cmd/konvoy-image-wrapper/cmd/create-package-bundle.go

@@ -47,6 +47,10 @@ var osToConfig = map[string]OSConfig{
 		configDir:      "bundles/ubuntu20.04",
 		containerImage: "docker.io/library/ubuntu:20.04",
 	},
+	"ubuntu-22.04": {
+		configDir:      "bundles/ubuntu22.04",
+		containerImage: "docker.io/library/ubuntu:22.04",
+	},
 	"oracle-9.4": {
 		configDir:      "bundles/oracle9.4",
 		containerImage: "docker.io/library/oraclelinux:9",
@@ -296,7 +300,7 @@ func templateObjects(targetOS, kubernetesVersion, outputDir string, fips, fetchK
 			}
 			var criToolsVersion string
 			var kubernetesMajorMinorVersion string
-			if targetOS == "ubuntu-20.04" {
+			if strings.Contains(targetOS, "ubuntu") {
 				kubernetesMajorMinorVersionNoV := strings.Join(strings.Split(kubernetesVersion, ".")[0:2], ".")
 				// according to ansible.group_vars/all/defaults.yaml L18 this is k8s major minor.1
 				criToolsVersion = fmt.Sprintf("%s.1", kubernetesMajorMinorVersionNoV)