Sync upstream (387f79be) — needs conflict resolution - #74
Sync upstream (387f79be) — needs conflict resolution#74cloud-api-adaptor-upstream-sync[bot] wants to merge 185 commits into
Conversation
Move the cluster provisioning to BYOM to remove the dependency on the deprecated Docker provider. Signed-off-by: Amulyam24 <amulmek1@in.ibm.com>
This commit adds extensive unit test coverage for the libvirt cloud provider, while preserving all existing tests from the main branch. New unit tests added (using mocks): - TestGetGuestForArchType (6 subtests) - TestLookupMachine (5 subtests) - TestGetCanonicalMachineName (7 subtests) - TestCreateCloudInitISO (3 subtests) - TestGetLaunchSecurityTypeInvalidURI - TestCreateDomainXMLs390xWithMocks (mock-based unit test) - TestCreateDomainXMLaarch64WithMocks (mock-based unit test) - TestCreateDomainXMLx86_64 (3 subtests) - TestCreateDomainXML (3 subtests) - TestVerifyDomainXMLIOMMU (4 subtests) - Combined TestCreateDomainXMLs390x and TestCreateDomainXMLaarch64 into TestCreateDomainXMLArchitectures - Combined TestCreateDomainXMLs390xWithMocks and TestCreateDomainXMLaarch64WithMocks into TestCreateDomainXMLArchitecturesWithMocks - Improves code maintainability and reduces duplication Signed-off-by: Chathurya Adapa <Adapa.Chathurya1@ibm.com> Assisted-by: IBM Bob <noreply@ibm.com>
- Refactor TestCloudInit to use verifyISOContents helper and tabular format - Combined TestCreateCloudInitWithEmptyData, TestCreateCloudInitWithLargeData, TestCreateCloudInitWithSpecialCharacters, and TestCreateCloudInitVerifyVendorData into TestCreateCloudInitVariations - Add TestCreateCloudInitErrorHandling for boundary condition testing - All tests now use verifyISOContents helper for consistent ISO validation - Improves code maintainability and reduces duplication Signed-off-by: Chathurya Adapa <Adapa.Chathurya1@ibm.com> Assisted-by: IBM Bob <noreply@ibm.com>
- Add tests for Manager.ParseCmd() flag registration - Add tests for Manager configuration with values - Add tests for Manager.LoadEnv() and GetConfig() - Add tests for Manager.NewProvider() with valid/invalid configs - Add tests for default constants validation - Add tests for launch security, firmware, and data directory configuration - Covers all Manager initialization and configuration scenarios Signed-off-by: Chathurya Adapa <Adapa.Chathurya1@ibm.com> Assisted-by: IBM Bob <noreply@ibm.com>
Bumps [github.com/containerd/containerd](https://github.com/containerd/containerd) from 1.7.29 to 1.7.32. - [Release notes](https://github.com/containerd/containerd/releases) - [Changelog](https://github.com/containerd/containerd/blob/main/RELEASES.md) - [Commits](containerd/containerd@v1.7.29...v1.7.32) --- updated-dependencies: - dependency-name: github.com/containerd/containerd dependency-version: 1.7.32 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>
Now that agent-ctl tags based on sha, we can switch to use the main kata-containers version, rather than having a separate one. Signed-off-by: stevenhorsman <steven@uk.ibm.com>
Bump components to match the kata 3.31.0 release Assisted-by: IBM Bob Signed-off-by: stevenhorsman <steven@uk.ibm.com>
Update to pick up the 3.31.0 release Assisted-by: IBM Bob Signed-off-by: stevenhorsman <steven@uk.ibm.com>
Pin kata-deploy to the 3.31.0 version in prep of the 0.21.0 release Assisted-by: IBM Bob Signed-off-by: stevenhorsman <steven@uk.ibm.com>
Bumps [zizmorcore/zizmor-action](https://github.com/zizmorcore/zizmor-action) from 0.5.3 to 0.5.6. - [Release notes](https://github.com/zizmorcore/zizmor-action/releases) - [Commits](zizmorcore/zizmor-action@b1d7e1f...5f14fd0) --- updated-dependencies: - dependency-name: zizmorcore/zizmor-action dependency-version: 0.5.6 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
Bump the go module to remediate CVEs: - GO-2026-5026 - GO-2026-4883 Signed-off-by: stevenhorsman <steven@uk.ibm.com>
Bump the go module to remediate CVEs: - GO-2026-5013 - GO-2026-5017 - GO-2026-5018 - GO-2026-5019 - GO-2026-5020 Signed-off-by: stevenhorsman <steven@uk.ibm.com>
Update the helm charts with the latest image of CAA Signed-off-by: stevenhorsman <steven@uk.ibm.com>
But the appVersion to 0.21 to match the release and bump the version in peer-pods, peerpod-ctrl and webhook Signed-off-by: stevenhorsman <steven@uk.ibm.com>
The `kubectl apply` of the cert-manager manifest occasionally fails with an etcd timeout: ``` Error from server: error when creating ".../cert-manager.yaml": etcdserver: request timed out. ``` The manifest creates a large batch of resources (6 CRDs, RBAC, deployments, webhook configs) in a single apply, and individual writes can occasionally exceed the API server's request timeout under transient cluster load. Wrap the apply in a retry loop (3 attempts, 10s backoff). `kubectl apply` is idempotent, so retrying after a partial failure simply creates the missing resources without disturbing the ones already applied. On the observed failing run, everything except (likely) the last webhook config got created, and the retry will fill in the gap. For `kubectl wait`, the Endpoints object isn't created by the cert-manager manifest directly. It's created by the kube-controller-manager's endpoints controller after the Service is created and once matching pods exist. Right after `kubectl apply` returns, there's a brief window where the Service exists but its Endpoints object hasn't been populated yet. The apply just finished, so `kubectl wait` raced ahead of the controller. Assisted-by: IBM Bob Signed-off-by: Hyounggyu Choi <Hyounggyu.Choi@ibm.com>
The podvm-ubuntu-mkosi job calls podvm_mkosi_ubuntu.yaml which requires artifact-metadata: write permission for the actions/attest@v4.1.0 action to write attestation metadata. Without this permission, the workflow fails with "The nested job 'build-image' is requesting 'artifact-metadata: write', but is only allowed 'artifact-metadata: none'." This matches the permission already granted to the podvm-mkosi job on line 84. Signed-off-by: stevenhorsman <steven@uk.ibm.com> Generated-By: IBM Bob Signed-off-by: stevenhorsman <steven@uk.ibm.com>
Also added MKOSI_VERSION environment variable to image build steps in both podvm_mkosi.yaml and podvm_mkosi_ubuntu.yaml workflows to ensure the mkosi version from versions.yaml is explicitly passed to make commands, maintaining consistency with the binaries build step. Signed-off-by: stevenhorsman <steven@uk.ibm.com> Generated-By: IBM Bob
The image target was calling mkosi with '--image system' argument which is not supported in mkosi v26, causing build failures with: "mkosi: error: argument verb: invalid Verb value: 'system'" This argument was a remnant from mkosi v22 that wasn't removed during the v26 upgrade. The image-debug and image-sftp targets were already correct, so this change aligns the image target with them. Fixes the s390x production image builds. Signed-off-by: stevenhorsman <steven@uk.ibm.com> Generated-By: IBM Bob
The cross-build script was failing on ARM64 native builds because it compared ARCH=arm64 with uname -m=aarch64, which didn't match, causing it to incorrectly attempt cross-compilation and fail with: "E: Unable to locate package qemu-system-aarch64" Added replacement pattern to handle this Co-authored-by: Magnus Kulke <magnuskulke@microsoft.com> Signed-off-by: stevenhorsman <steven@uk.ibm.com> Generated-By: IBM Bob
Implement IRSA support for the AWS provider to enable workload identity authentication on EKS, eliminating the need for static credentials stored in Kubernetes secrets. NewEC2Client now supports three authentication methods: 1. Static credentials (AWS_ACCESS_KEY_ID + AWS_SECRET_ACCESS_KEY) 2. Shared AWS profile (AWS_PROFILE, currently, only non-containerized CAA binary execution is supported) 3. Default credential chain (for IRSA support) The default credential chain automatically supports IRSA via AWS_WEB_IDENTITY_TOKEN_FILE and AWS_ROLE_ARN Entrypoint validation updated to accept either: - Both AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY (static credentials) - AWS_WEB_IDENTITY_TOKEN_FILE and AWS_ROLE_ARN (IRSA) Fixes: confidential-containers#3027 Signed-off-by: Snir Schreiber <ssheribe@redhat.com> Assisted-by: Claude AI
Add unit tests to verify the two authentication paths in NewEC2Client: 1. Static credentials (AWS_ACCESS_KEY_ID + AWS_SECRET_ACCESS_KEY) 2. Default credential chain (IRSA, IMDS, environment variables, etc.) Tests cover: - Static credentials path with both access key and secret key - Default credential chain path when no static credentials provided - Partial credentials (only access key) falls through to default chain Assisted-by: Claude AI Signed-off-by: Snir Schreiber <ssheribe@redhat.com>
Added comprehensive guide for configuring IRSA with cloud-api-adaptor and peerpod-ctrl on Amazon EKS. The guide covers: - IAM trust policy configuration - Kubernetes service account annotations - Deployment configuration examples - Troubleshooting steps Assisted-by: Claude AI Signed-off-by: Snir Schreiber <ssheribe@redhat.com>
It looks like when the arm "support" for podvm builds was added, it wasn't updated to use the native arm runner, so update this, for simpler workflows Signed-off-by: stevenhorsman <steven@uk.ibm.com>
In case we want to support cross-compilation in future e.g. for local dev, fix up the logic. The cross-build script was using architecture names directly as QEMU package names, but Debian/Ubuntu package names don't always match: - x86_64 → qemu-system-x86 (not qemu-system-x86_64) - aarch64 → qemu-system-arm (not qemu-system-aarch64) - s390x → qemu-system-s390x (matches) Added architecture-to-package mapping for Debian/Ubuntu systems to use correct package names. Package names verified against Ubuntu 24.04. Signed-off-by: stevenhorsman <steven@uk.ibm.com> Assisted-by: IBM Bob
As we are doing a 0.21.1 release, we should update the charts to match this version. Signed-off-by: stevenhorsman <steven@uk.ibm.com>
This reverts commit a1633eb. Signed-off-by: stevenhorsman <steven@uk.ibm.com>
This reverts commit 02bb592. Signed-off-by: stevenhorsman <steven@uk.ibm.com>
Update the CITATION.cff for the 0.21.1 release Signed-off-by: stevenhorsman <steven@uk.ibm.com>
debian:trixie-slim ships without CA certificates. The dev build got them transitively via openssh-client, but the release build only installed iptables, causing Go TLS verification to fail against ec2.<region>.amazonaws.com with x509: certificate signed by unknown authority. Signed-off-by: Pradipta Banerjee <pradipta.banerjee@gmail.com>
Bumps [actions/stale](https://github.com/actions/stale) from 10.2.0 to 10.3.0. - [Release notes](https://github.com/actions/stale/releases) - [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md) - [Commits](actions/stale@b5d41d4...eb5cf3a) --- updated-dependencies: - dependency-name: actions/stale dependency-version: 10.3.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
This reverts commit 60e2f0d. Signed-off-by: stevenhorsman <steven@uk.ibm.com>
This reverts commit 6a8a61a. Signed-off-by: stevenhorsman <steven@uk.ibm.com>
Update the CITATION.cff for the 0.22.0 release Signed-off-by: stevenhorsman <steven@uk.ibm.com>
Debugging the smoke tests can be tricky when different ones are cancelled depending on the order of failure, so just disable fail-fast, so that they both run to completion and give better results. Signed-off-by: stevenhorsman <steven@uk.ibm.com>
Updated mkosi configuration and documentation to support Ubuntu 26.04 (Resolute) as the base image for podvm builds. This enables building podvm images on the latest Ubuntu LTS release. Generated-By: IBM Bob Signed-off-by: stevenhorsman <steven@uk.ibm.com>
mkosi v26 removed automatic kernel module inclusion via KernelModulesInitrdInclude. While Ubuntu 24.04 worked with mkosi v26's defaults, Ubuntu 26.04 requires explicit module configuration. Without explicit dm-verity module inclusion, the initrd lacks the dm-verity kernel module, causing boot failures with "unknown target type" errors when systemd-veritysetup tries to set up the root device. Changes: - Add KernelInitrdModules=default and dm-verity to initrd config - Add systemd-cryptsetup package to base initrd (provides generators) - Add cryptsetup and systemd-cryptsetup to Ubuntu initrd - Increase root-verity partition from 64M to 72M for Ubuntu 26.04 The partition size increase is needed because Ubuntu 26.04's verity data (66.1M) exceeds the previous 64M limit. Signed-off-by: stevenhorsman <steven@uk.ibm.com> Generated-By: IBM Bob
The systemd-cryptsetup and tpm2-tools packages are not available in Ubuntu repositories for the s390x architecture. Rather than trying to exclude packages (which mkosi doesn't support cleanly), restructure the configuration to use architecture-specific package lists. Move systemd-cryptsetup and tpm2-tools from base and Ubuntu configs into a new ubuntu-amd64.conf file that only applies to x86-64 builds. Signed-off-by: stevenhorsman <steven@uk.ibm.com> Generated-By: IBM Bob
The scratch-space setup requires dm-crypt, dm-mod and dm-bufio kernel modules for LUKS encryption. Generated-By: IBM Bob Signed-off-by: stevenhorsman <steven@uk.ibm.com>
Add libseccomp2 package to Ubuntu system and initrd configurations to fix systemd boot hangs on Ubuntu 24.04 hosts. Ubuntu 26.04 guests running on Ubuntu 24.04 hosts experience libseccomp warnings during boot, causing systemd to hang when parsing service files with SystemCallFilter= directives. Generated-by: IBM Bob Signed-off-by: stevenhorsman <steven@uk.ibm.com>
- Increase guest RAM from 1024 MiB to 2048 MiB. The Ubuntu 26.04
debug image embeds a ~66 MiB initramfs in the UKI. Under the
i440FX QEMU machine type used by virt-install on ubuntu-24.04
runners, 1024 MiB is insufficient for the kernel to decompress
the initramfs during early boot, resulting in:
Initramfs unpacking failed: write error
This prevented dm-verity from loading its kernel module and left
the VM stuck waiting for /dev/mapper/root. The scratch-space test
was most affected because it runs second (after the basic test),
when host memory pressure is higher. 2048 MiB gives sufficient
headroom; GitHub Actions ubuntu-24.04 runners have 16 GiB RAM.
Generated-by: IBM Bob
Signed-off-by: stevenhorsman <steven@uk.ibm.com>
As part of the migration from Ubuntu 24.04 to 26.04, systemd-repart is now required as an explicit package dependency. The scratch-space feature relies on systemd-repart to create the trusted_store partition (defined in usr/lib/repart.d/30-scratch.conf) in the free disk space added at boot. Without the package, the binary and service unit are absent from the image, so no partition is ever created, /dev/disk/by-label/trusted_store never appears, and scratch-storage.service fails with "Device for label trusted_store not found". In Ubuntu 24.04 images this was provided transitively; in 26.04 it must be listed explicitly. Generated-by: IBM Bob Signed-off-by: stevenhorsman <steven@uk.ibm.com>
qemu-img resize +1G leaves the GPT backup header at the wrong position. systemd-repart reads the GPT to find unpartitioned free space; with a corrupt backup header it sees only 3.5 KiB free (instead of 1 GiB) and skips partition creation entirely. The trusted_store partition (/dev/disk/by-label/trusted_store) never appears and scratch-storage.service fails. Fix: after the resize, expose the qcow2 image via qemu-nbd and run sgdisk -e to relocate the GPT backup header to the new end of disk. Add gdisk to the CI test runner apt-get install step to satisfy the sgdisk dependency (qemu-nbd is already provided by qemu-utils). Generated-by: IBM Bob Signed-off-by: stevenhorsman <steven@uk.ibm.com>
GetCloudProvisioner only reads from the TOML properties file, so the CAA_IMAGE env var was never reaching the provisioner. Write it to libvirt.properties alongside container_runtime. Signed-off-by: Thejas N <thn@redhat.com>
Bumps [actions/checkout](https://github.com/actions/checkout) from 7.0.0 to 7.0.1. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@9c091bb...3d3c42e) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: 7.0.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [actions/attest](https://github.com/actions/attest) from 4.1.0 to 4.2.0. - [Release notes](https://github.com/actions/attest/releases) - [Changelog](https://github.com/actions/attest/blob/main/RELEASE.md) - [Commits](actions/attest@59d8942...f7c74d2) --- updated-dependencies: - dependency-name: actions/attest dependency-version: 4.2.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
With recent PR confidential-containers#3221, remove the redundant check for the kata-runtime label in byom provisioner. Signed-off-by: Amulyam24 <amulmek1@in.ibm.com>
The env var PUSH could be confusing as if set, it suppresses local export of binaries rather than pushing to a registry, contrary to what the name implies. Rename to EXPORT_BINARIES with inverted logic. Signed-off-by: Amulyam24 <amulmek1@in.ibm.com>
The byom binaries image uses the podvm binaries image as the base. As we do not push the podvm binaries image or have it available locally during the mkosi builds, build it explicitly for byom binaries image. Signed-off-by: Amulyam24 <amulmek1@in.ibm.com>
During a CAA DaemonSet rolling update, the old pod's Shutdown() removes the kata.peerpods.io/vm extended resource from the node after the new pod has already re-advertised it. This leaves the node with no peer pod capacity even when no workloads are running, breaking pod scheduling until CAA is manually restarted. Introduce a kata.peerpods.io/caa-owner annotation on the node that records the UID of the pod that last advertised the resource. RemoveExtendedResources reads this annotation and skips removal when a newer instance has already taken ownership. Inject POD_UID via the downward API and add a node-annotation-patcher ClusterRole to permit metadata patches. Add e2e test TestLibvirtExtendedResourcesAfterRollout to verify the resource is preserved and ownership is handed off after a rollout, and that a peer pod can be scheduled immediately after. Signed-off-by: Thejas N <thn@redhat.com> Assisted-by: Claude Sonnet <noreply@anthropic.com>
After a CAA restart, the new process cannot bind the probe port because the old socket lingers in TIME_WAIT. Set SO_REUSEPORT so the new process can bind immediately. The previous implementation also leaked the probe goroutine on context cancellation because http.ListenAndServe ignores cancellation. Use a context-aware listener so the probe server stops with the main process. Signed-off-by: Thejas N <thn@redhat.com> Assisted-by: Claude Sonnet <noreply@anthropic.com>
During a rolling update, the old and new CAA pods share the same hostPath (/run/peerpod/). When the old pod's ttrpc.Shutdown() calls listener.Close(), it unlinks the socket file that the new pod already created, leaving the shim unable to connect. Set SetUnlinkOnClose(false) on the Unix listener so the old pod's listener.Close() does not automatically remove the socket inode. Add an explicit owner-checked cleanup that runs after ttrpc shuts down: the socket is removed only when this instance still holds the kata.peerpods.io/caa-owner annotation, which means no newer pod has taken over. This ensures the socket is cleaned up on uninstall (no new pod, annotation still ours) but left intact during a rolling restart (new pod has already updated the annotation). Signed-off-by: Thejas N <thn@redhat.com> Assisted-by: Claude Sonnet <noreply@anthropic.com>
The TEE platform input is wired through Makefiles and Dockerfiles to pull the correct guest-component artifacts. Currently we default to 'none' in the Dockerfile, for Azure CVMs we need to set it to 'az-cvm-vtpm' to pull the correct attestation-agent binary. We add the tee-platform to the image name. If tee-platform is 'none' we omit a suffix on the oci image. Signed-off-by: Magnus Kulke <magnuskulke@microsoft.com>
The image is not generic really, we still need a discrete image per TEE, and the distro is an implementation detail. Signed-off-by: Magnus Kulke <magnuskulke@microsoft.com>
We've been not requiring this one for a while and the unit currently fails b/c we do not have /kata-containes in the ubuntu podvm tree. Signed-off-by: Magnus Kulke <magnuskulke@microsoft.com>
We use ttyS0, mkosi --autologin will only apply that to other tty's. Signed-off-by: Magnus Kulke <magnuskulke@microsoft.com>
Signed-off-by: Ruslan Timofieiev <rtim0905@gmail.com>
libvirtClient.volName was overwritten on every CreateInstance call based on spec.Image. With concurrent pod creates, the last write won — a VM could boot from a different image than requested. volName is now resolved per-request via resolveVolName() and stored on vmConfig. libvirtClient.volName is read-only after initialisation. TestVolNameResolution exercises resolveVolName() directly. Assisted-by: IBM Bob <noreply@ibm.com> Signed-off-by: Ajay Victor <ajvictor@in.ibm.com>
Run protoc against the existing confidential_data_hub.proto definition (kata-containers/src/libs/protocols/protos/) to produce Go types that properly implement proto.Message. These are needed by the ttrpc v1.2.7 codec for wire-compatible serialization of SecureMount RPC calls. Signed-off-by: Mohammed Adnan <muhammedadnan50007@gmail.com>
Integrate with CDH's secure_mount TTRPC API to support LUKS2 encrypted block volumes in Peer Pods. When a StorageClass specifies encrypt-type and kbs-key-id, the interceptor inside the PodVM delegates to CDH which handles LUKS formatting/opening with keys fetched from KBS after remote attestation. Changes: - Extend CloudVolumeAnnotation with EncryptType and KeyID fields - Proxy reads encrypt-type/kbs-key-id from mountInfo.json metadata - Add CDH TTRPC client using generated proto types, with context-aware connection retry logic (10 attempts, respects CreateContainer cancel) - Interceptor branches on EncryptType: CDH path vs plain formatAndMount - Pass predictable mapperName to CDH for reliable cryptsetup cleanup; fallback to /proc/mounts lookup if name is unavailable - Validate encrypt type (only luks/luks2 accepted, always send luks2 to CDH since that is what CDH accepts) - isLuks detection via magic-byte read distinguishes fresh disks from existing LUKS volumes; errors are hard failures to prevent CDH from reformatting an encrypted disk due to a transient read error - Resolve mapper name before unmount and skip cryptsetup close if unmount fails - unmountCloudVolumes handles cryptsetup close for encrypted mounts - Unit tests for annotation flow, proto round-trip, encrypt type validation, CDH request format, encrypted mount tracking Signed-off-by: Mohammed Adnan <muhammedadnan50007@gmail.com>
There was a problem hiding this comment.
Cursor Bugbot has reviewed your changes using default effort and found 2 potential issues.
❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, have a team admin enable autofix in the Cursor dashboard.
Reviewed by Cursor Bugbot for commit 387f79b. Configure here.
| groups: | ||
| codeql: | ||
| patterns: | ||
| - "github/codeql-action*" |
There was a problem hiding this comment.
Stale Dependabot module path
Medium Severity
Dependabot still lists src/csi-wrapper under gomod directories, but that module was removed in this sync. Update checks for that ecosystem will fail or warn on a missing path, so Go dependency updates for the remaining modules can be disrupted.
Reviewed by Cursor Bugbot for commit 387f79b. Configure here.
| run: | | ||
| tag=$(git rev-parse --short HEAD) | ||
| PODVM_TAG=${tag} make image-byom-e2e-container | ||
| echo "BYOM_PODVM_IMAGE=quay.io/confidential-containers/podvm-byom-e2e-image-amd64:${tag}" >> "$GITHUB_ENV" |
There was a problem hiding this comment.
Unused BYOM image input
Medium Severity
The podvm_image input is documented as optional with a local-build fallback, but the workflow never reads inputs.podvm_image. It always builds a local image and hardcodes BYOM_PODVM_IMAGE, so a provided image is silently ignored and CI always pays for a full rebuild.
Reviewed by Cursor Bugbot for commit 387f79b. Configure here.


Upstream sync — manual merge needed
Upstream has new commits to merge into
cohere, but there are conflicts.Upstream HEAD:
387f79beHow to resolve
The sync branch already contains the upstream commits (it points at
origin/main). To make it mergeable intocohere,merge cohere into the sync branch and resolve conflicts there:
Your IDE will show the native merge conflict UI with accept-theirs /
accept-ours / accept-both options for each conflict. Once the push
succeeds, the PR will become mergeable.
Review checklist
Note
High Risk
Large CI and build-path changes remove Azure/docker/CSI automation and shift all podvm/e2e image sources; missed fork-specific wiring could break releases or e2e until conflicts and CI are verified.
Overview
This PR merges upstream cloud-api-adaptor changes (release 0.22.0) into the fork. The headline shift is PodVM: builds move from
podvm-mkositopodvm/(mkosi), with Ubuntu as the primary image; Packer-based podvm builder/binaries/image workflows and AWS packer image assets are removed.CI and release automation are trimmed: deleted workflows include Azure e2e, Azure podvm build/release, docker e2e, CSI wrapper image builds, podvm_builder/binaries/podvm.yaml, and podvm_mkosi_ubuntu. E2E orchestration (
e2e_run_all) drops Ubuntu mkosi libvirt matrix jobs and docker tests; AWS and libvirt use mkosi amd64 qcow2 oras images; BYOM builds podvm/BYOM images in-job instead of requiring a prebuilt input. podvm_mkosi gainstee-platform, publishes qcow2 only (no docker OCI side-build), and uses unified oras naming. Newpodvm_byom_binaries_publishand release wiring for BYOM binaries.Tooling: root
Makefiledrops packer-check;hack/packer-check.shremoved;govulncheckadds.govulncheck-ignore.tomland a JSON filter for containerd CRI checkpoint vulns. Dependabot groups CodeQL; many workflows bump checkout v7, setup-go v6.5, docker/build-push actions,allow-unsafe-pr-checkouton PR-target flows, and permission comment cleanup.Product/docs:
dockerdropped from default BUILTIN_CLOUD_PROVIDERS in dev builds; README/release docs no longer reference CSI-wrapper or docker provider charts;.gitignore/ golangci CSI paths cleaned. CITATION.cff and container base images (Go 1.25.12, Debian slim) updated.Reviewed by Cursor Bugbot for commit 387f79b. Bugbot is set up for automated code reviews on this repo. Configure here.