Skip to content

Commit

Permalink
Fetches secret data for createArgs verification
Browse files Browse the repository at this point in the history 
Instead of waiting till doBootstrap to pull the secret data for inline
sysprep, this patch adds the secret data to the BootstrapArgs earlier
for verification purposes.

Signed-off-by: Sagar Muchhal <muchhals@vmware.com>
  • Loading branch information
@srm09
srm09 committed Dec 13, 2023
1 parent 7435195 commit 8e4f8b5
Show file tree
Hide file tree
Showing 5 changed files with 244 additions and 47 deletions.
14 changes: 9 additions & 5 deletions pkg/vmprovider/providers/vsphere2/vmlifecycle/bootstrap_sysprep.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ func BootstrapSysPrep(
Value: data,
}
} else if sysPrep := sysPrepSpec.Sysprep; sysPrep != nil {
identity = ConvertTo(sysPrep, bsArgs.BootstrapData)
identity = convertTo(sysPrep, bsArgs.BootstrapData)
}

nicSettingMap, err := network.GuestOSCustomization(bsArgs.NetworkResults)
Expand Down Expand Up @@ -85,7 +85,7 @@ func BootstrapSysPrep(
return configSpec, customSpec, nil
}

func ConvertTo(from *vmopv1_prep.Sysprep, bootstrapData BootstrapData) *vimTypes.CustomizationSysprep {
func convertTo(from *vmopv1_prep.Sysprep, bootstrapData BootstrapData) *vimTypes.CustomizationSysprep {
sysprepCustomization := &vimTypes.CustomizationSysprep{}

if from.GUIUnattended != nil {
Expand All @@ -102,9 +102,13 @@ func ConvertTo(from *vmopv1_prep.Sysprep, bootstrapData BootstrapData) *vimTypes

if from.UserData != nil {
sysprepCustomization.UserData = vimTypes.CustomizationUserData{
FullName: from.UserData.FullName,
OrgName: from.UserData.OrgName,
ProductId: *bootstrapData.SysprepProductID,
FullName: from.UserData.FullName,
OrgName: from.UserData.OrgName,
}
// In the case of a VMI with volume license key, this might not be set.
// Hence add a check to see if the productID is set to empty.
if bootstrapData.SysprepProductID != nil {
sysprepCustomization.UserData.ProductId = *bootstrapData.SysprepProductID
}
}

Expand Down
10 changes: 4 additions & 6 deletions pkg/vmprovider/providers/vsphere2/vmlifecycle/bootstrap_sysprep_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import (

. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"

"github.com/vmware/govmomi/vim25/types"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/utils/pointer"
Expand Down Expand Up @@ -106,18 +105,17 @@ var _ = Describe("SysPrep Bootstrap", func() {
GUIUnattended: &sysprep.GUIUnattended{
AutoLogon: true,
AutoLogonCount: 2,
Password: corev1.SecretKeySelector{
Password: &common.SecretKeySelector{
// omitting the name of the secret, since it does not get used
// in this function
LocalObjectReference: corev1.LocalObjectReference{},
Key: "pwd_key",
Key: "pwd_key",
},
TimeZone: 4,
},
UserData: &sysprep.UserData{
FullName: "foo-bar",
OrgName: "foo-org",
ProductID: corev1.SecretKeySelector{Key: "product_id_key"},
ProductID: &common.SecretKeySelector{Key: "product_id_key"},
},
GUIRunOnce: sysprep.GUIRunOnce{
Commands: []string{"blah", "boom"},
Expand All @@ -126,7 +124,7 @@ var _ = Describe("SysPrep Bootstrap", func() {
DomainAdmin: "[Foo/Administrator]",
JoinDomain: "foo.local",
JoinWorkgroup: "foo.local.wg",
DomainAdminPassword: corev1.SecretKeySelector{Key: "admin_pwd_key"},
DomainAdminPassword: &common.SecretKeySelector{Key: "admin_pwd_key"},
},
LicenseFilePrintData: &sysprep.LicenseFilePrintData{
AutoMode: sysprep.CustomizationLicenseDataModePerServer,
Expand Down
60 changes: 29 additions & 31 deletions pkg/vmprovider/providers/vsphere2/vmprovider_vm_utils.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"

vmopv1 "github.com/vmware-tanzu/vm-operator/api/v1alpha2"
vmopv1common "github.com/vmware-tanzu/vm-operator/api/v1alpha2/common"
"github.com/vmware-tanzu/vm-operator/api/v1alpha2/sysprep"
conditions "github.com/vmware-tanzu/vm-operator/pkg/conditions2"
"github.com/vmware-tanzu/vm-operator/pkg/context"
"github.com/vmware-tanzu/vm-operator/pkg/util"
Expand Down Expand Up @@ -163,30 +163,32 @@ func GetVirtualMachineBootstrap(
return bootstrapData, nil
}

var secretSelector *vmopv1common.SecretKeySelector
var data, vAppData map[string]string
var vAppExData map[string]map[string]string

if cloudInit := bootstrapSpec.CloudInit; cloudInit != nil {
secretSelector = cloudInit.RawCloudConfig
} else if sysprep := bootstrapSpec.Sysprep; sysprep != nil {
secretSelector = sysprep.RawSysprep
}

if secretSelector != nil {
var err error
data, err = getSecretData(vmCtx, k8sClient, secretSelector.Name, secretSelector.Key, true)
if err != nil {
reason, msg := errToConditionReasonAndMessage(err)
conditions.MarkFalse(vmCtx.VM, vmopv1.VirtualMachineConditionBootstrapReady, reason, msg)
return bootstrapData, err
if v := bootstrapSpec.CloudInit; v != nil {
if cooked := v.CloudConfig; cooked != nil {
_ = cooked
// TODO
} else if raw := v.RawCloudConfig; raw != nil {
var err error
data, err = getSecretData(vmCtx, k8sClient, raw.Name, raw.Key, true)
if err != nil {
return bootstrapData, err
}
}
} else if v := bootstrapSpec.Sysprep; v != nil {
if cooked := v.Sysprep; cooked != nil {
if err := fetchInlineSysprepSecretData(vmCtx, *cooked, k8sClient, &bootstrapData); err != nil {
return bootstrapData, err
}
} else if raw := v.RawSysprep; raw != nil {
var err error
data, err = getSecretData(vmCtx, k8sClient, raw.Name, raw.Key, true)
if err != nil {
return bootstrapData, err
}
}
}

if err := fetchInlineSysprepSecretData(vmCtx, k8sClient, &bootstrapData); err != nil {
reason, msg := errToConditionReasonAndMessage(err)
conditions.MarkFalse(vmCtx.VM, vmopv1.VirtualMachineConditionBootstrapReady, reason, msg)
return bootstrapData, err
}

// vApp bootstrap can be used alongside LinuxPrep/Sysprep.
Expand Down Expand Up @@ -246,17 +248,13 @@ func GetVirtualMachineBootstrap(
// secrets specified the Sysprep field.
func fetchInlineSysprepSecretData(
vmCtx context.VirtualMachineContextA2,
sysprep sysprep.Sysprep,
k8sClient ctrlclient.Client,
bootstrapData *vmlifecycle.BootstrapData) error {

if vmCtx.VM.Spec.Bootstrap.Sysprep == nil ||
vmCtx.VM.Spec.Bootstrap.Sysprep.Sysprep == nil {
return nil
}

sysprep := vmCtx.VM.Spec.Bootstrap.Sysprep.Sysprep
if userData := sysprep.UserData; userData != nil {
productIDData, err := getSecretData(vmCtx, &userData.ProductID, false, k8sClient)
if userData := sysprep.UserData; userData != nil && userData.ProductID != nil {
// this is an optional secret key selector even when FullName or OrgName are set.
productIDData, err := getSecretData(vmCtx, k8sClient, userData.ProductID.Name, userData.ProductID.Key, false)
if err != nil {
return err
}
Expand All @@ -265,7 +263,7 @@ func fetchInlineSysprepSecretData(
}

if guiUnattended := sysprep.GUIUnattended; guiUnattended != nil && guiUnattended.AutoLogon {
passwordData, err := getSecretData(vmCtx, &guiUnattended.Password, false, k8sClient)
passwordData, err := getSecretData(vmCtx, k8sClient, guiUnattended.Password.Name, guiUnattended.Password.Key, false)
if err != nil {
return err
}
Expand All @@ -274,7 +272,7 @@ func fetchInlineSysprepSecretData(
}

if identification := sysprep.Identification; identification != nil && identification.JoinDomain != "" {
domainPwdData, err := getSecretData(vmCtx, &identification.DomainAdminPassword, false, k8sClient)
domainPwdData, err := getSecretData(vmCtx, k8sClient, identification.DomainAdminPassword.Name, identification.DomainAdminPassword.Key, false)
if err != nil {
return err
}
Expand Down
Loading

0 comments on commit 8e4f8b5

Please sign in to comment.