From 9afdbb32b5652e9e4ac19ff5d916cbf05817bcd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= Date: Fri, 20 Sep 2024 20:41:48 +0800 Subject: [PATCH] fix(region): kvm user-data (#21240) --- pkg/compute/guestdrivers/kvm.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkg/compute/guestdrivers/kvm.go b/pkg/compute/guestdrivers/kvm.go index a6e414daaa..2e99a9c91c 100644 --- a/pkg/compute/guestdrivers/kvm.go +++ b/pkg/compute/guestdrivers/kvm.go @@ -16,6 +16,7 @@ package guestdrivers import ( "context" + "encoding/base64" "fmt" "net/http" "strconv" @@ -282,6 +283,10 @@ func (self *SKVMGuestDriver) RequestUndeployGuestOnHost(ctx context.Context, gue func (self *SKVMGuestDriver) GetJsonDescAtHost(ctx context.Context, userCred mcclient.TokenCredential, guest *models.SGuest, host *models.SHost, params *jsonutils.JSONDict) (jsonutils.JSONObject, error) { desc := guest.GetJsonDescAtHypervisor(ctx, host) + if len(desc.UserData) > 0 { + // host 需要加密后的user-data以提供 http://169.254.169.254/latest/user-data 解密访问 + desc.UserData = base64.StdEncoding.EncodeToString([]byte(desc.UserData)) + } return jsonutils.Marshal(desc), nil }