fix: post-merge cleanup from upstream sync

- Restore kata-deploy subchart pin to 3.28.0 (upstream reverted to
  0.0.0-dev dev placeholder, which doesn't resolve from OCI registry).
- Drop redundant resolv.conf symlink in mkosi.finalize.chroot;
  upstream now handles it in mkosi.postinst.
- Remove orphan 'golang.org/x/oauth2/google' import after upstream
  migrated to cloud.google.com/go/auth/credentials.
- go mod tidy.

Author: yousef-cohere

src/cloud-api-adaptor/install/charts/peerpods/Chart.lock

@@ -0,0 +1,12 @@
+dependencies:
+- name: kata-deploy
+  repository: oci://ghcr.io/kata-containers/kata-deploy-charts
+  version: 3.28.0
+- name: peerpodctrl
+  repository: file://../../../../peerpod-ctrl/chart
+  version: 0.1.0
+- name: peerpods-webhook
+  repository: file://../../../../webhook/chart
+  version: 0.1.0
+digest: sha256:eb2cd7fd9b9393724b926bdd28b552324880f499e0d51a0ed16ad554c5fd28bf
+generated: "2026-04-16T17:42:32.599141-04:00"

src/cloud-api-adaptor/install/charts/peerpods/Chart.yaml

@@ -21,7 +21,7 @@ maintainers:
 
 dependencies:
   - name: kata-deploy
-    version: "0.0.0-dev"
+    version: "3.28.0"
     repository: "oci://ghcr.io/kata-containers/kata-deploy-charts"
     condition: kata-deploy.enabled
   - name: peerpodctrl

src/cloud-api-adaptor/podvm-mkosi/mkosi.presets/system/mkosi.finalize.chroot

@@ -17,13 +17,6 @@ fi
 
 # Conditional SFTP support: enable process-user-data.path only if ENABLE_SFTP is set
 
-# On Ubuntu, mkosi installs systemd-resolved but doesn't create the resolv.conf
-# symlink (the Ubuntu installer normally does). Wire it up explicitly.
-source /etc/os-release
-if [[ "${ID}" == "ubuntu" ]]; then
-    ln -sf /run/systemd/resolve/stub-resolv.conf /etc/resolv.conf
-fi
-
 # NVIDIA GPU support: enable services and ensure check script is executable.
 # Services gate themselves at runtime via ExecCondition=/usr/local/bin/check-nvidia-gpu
 # so they're harmless on non-GPU VMs.

src/cloud-providers/gcp/provider.go

@@ -20,7 +20,6 @@ import (
 	provider "github.com/confidential-containers/cloud-api-adaptor/src/cloud-providers"
 	"github.com/confidential-containers/cloud-api-adaptor/src/cloud-providers/util"
 	"github.com/confidential-containers/cloud-api-adaptor/src/cloud-providers/util/cloudinit"
-	"golang.org/x/oauth2/google"
 	"google.golang.org/api/googleapi"
 	"google.golang.org/api/option"
 	proto "google.golang.org/protobuf/proto"

src/cloud-providers/go.mod

@@ -28,7 +28,6 @@ require (
 	github.com/kdomanski/iso9660 v0.4.0
 	github.com/stretchr/testify v1.11.1
 	golang.org/x/crypto v0.49.0
-	golang.org/x/oauth2 v0.36.0
 	google.golang.org/api v0.273.1
 	google.golang.org/protobuf v1.36.11
 	gopkg.in/yaml.v2 v2.4.0
@@ -63,6 +62,7 @@ require (
 	github.com/x448/float16 v0.8.4 // indirect
 	go.yaml.in/yaml/v2 v2.4.3 // indirect
 	go.yaml.in/yaml/v3 v3.0.4 // indirect
+	golang.org/x/oauth2 v0.36.0 // indirect
 	gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	sigs.k8s.io/randfill v1.0.0 // indirect