fix tests

Azure · Oct 22, 2024 · 5c894c2 · 5c894c2
1 parent 47cbaa9
commit 5c894c2
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 21 deletions.
diff --git a/e2e/config/vhd.go b/e2e/config/vhd.go
@@ -7,6 +7,7 @@ import (
 	"sync"
 	"testing"
 
+	"github.com/Azure/agentbaker/pkg/agent/datamodel"
 	"github.com/Azure/azure-sdk-for-go/sdk/azcore/arm"
 	"github.com/Azure/azure-sdk-for-go/sdk/azcore/to"
 	"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v6"
@@ -29,9 +30,10 @@ var (
 		Arch: "arm64",
 	}
 	VHDUbuntu2204Gen2Containerd = &Image{
-		Name: "2204gen2containerd",
-		OS:   "ubuntu",
-		Arch: "amd64",
+		Name:   "2204gen2containerd",
+		OS:     "ubuntu",
+		Arch:   "amd64",
+		Distro: datamodel.AKSUbuntuContainerd2404Gen2,
 	}
 	VHDAzureLinuxV2Gen2Arm64 = &Image{
 		Name: "AzureLinuxV2gen2arm64",
@@ -78,6 +80,7 @@ type Image struct {
 	Name    string
 	OS      string
 	Version string
+	Distro  datamodel.Distro
 
 	vhd     VHDResourceID
 	vhdOnce sync.Once

diff --git a/e2e/node_bootstrapper_test.go b/e2e/node_bootstrapper_test.go
@@ -12,6 +12,7 @@ import (
 	"os/exec"
 	"testing"
 
+	"github.com/Azure/agentbaker/pkg/agent"
 	"github.com/Azure/agentbaker/pkg/agent/datamodel"
 	"github.com/Azure/agentbakere2e/config"
 	"github.com/barkimedes/go-deepcopy"
@@ -52,14 +53,6 @@ func Test_ubuntu2204NodeBootstrapper(t *testing.T) {
 			},
 			CSEOverride:       CSENodeBootstrapper(ctx, t, cluster),
 			DisableCustomData: true,
-			BootstrapConfigMutator: func(nbc *datamodel.NodeBootstrappingConfiguration) {
-				nbc.ContainerService.Properties.AgentPoolProfiles[0].Distro = "aks-ubuntu-containerd-22.04-gen2"
-				nbc.AgentPoolProfile.Distro = "aks-ubuntu-containerd-22.04-gen2"
-				// Check that we don't leak these secrets if they're
-				// set (which they mostly aren't in these scenarios).
-				nbc.ContainerService.Properties.CertificateProfile.ClientPrivateKey = "client cert private key"
-				nbc.ContainerService.Properties.ServicePrincipalProfile.Secret = "SP secret"
-			},
 		},
 		Tags: Tags{Scriptless: true},
 	})
@@ -69,12 +62,7 @@ func CSENodeBootstrapper(ctx context.Context, t *testing.T, cluster *Cluster) st
 	nbcAny, err := deepcopy.Anything(cluster.NodeBootstrappingConfiguration)
 	require.NoError(t, err)
 	nbc := nbcAny.(*datamodel.NodeBootstrappingConfiguration)
-	nbc.ContainerService.Properties.AgentPoolProfiles[0].Distro = "aks-ubuntu-containerd-22.04-gen2"
-	nbc.AgentPoolProfile.Distro = "aks-ubuntu-containerd-22.04-gen2"
-	// Check that we don't leak these secrets if they're
-	// set (which they mostly aren't in these scenarios).
-	nbc.ContainerService.Properties.CertificateProfile.ClientPrivateKey = "client cert private key"
-	nbc.ContainerService.Properties.ServicePrincipalProfile.Secret = "SP secret"
+	agent.ValidateAndSetLinuxNodeBootstrappingConfiguration(nbc)
 
 	configContent := nbcToNbcContractV1(nbc)
 

diff --git a/e2e/scenario_test.go b/e2e/scenario_test.go
@@ -577,7 +577,7 @@ func Test_ubuntu2204ScriptlessInstaller(t *testing.T) {
 			LiveVMValidators: []*LiveVMValidator{
 				FileHasContentsValidator("/var/log/azure/node-bootstrapper.log", "node-bootstrapper finished successfully"),
 			},
-			// TODO: add support for nbccontract instead
+			// TODO: replace it with nbccontract
 			BootstrapConfigMutator: func(nbc *datamodel.NodeBootstrappingConfiguration) {
 				nbc.ContainerService.Properties.AgentPoolProfiles[0].Distro = "aks-ubuntu-containerd-22.04-gen2"
 				nbc.AgentPoolProfile.Distro = "aks-ubuntu-containerd-22.04-gen2"

diff --git a/e2e/vmss.go b/e2e/vmss.go
@@ -37,7 +37,8 @@ func createVMSS(ctx context.Context, t *testing.T, vmssName string, opts *scenar
 	ab, err := agent.NewAgentBaker()
 	require.NoError(t, err)
 	if opts.scenario.Tags.Scriptless {
-		nodeBootstrapping, err = ab.GetNodeBootstrappingForScriptless(ctx, nbcToNbcContractV1(opts.nbc), opts.scenario.Config.Distro, datamodel.AzurePublicCloud)
+		agent.ValidateAndSetLinuxNodeBootstrappingConfiguration(opts.nbc)
+		nodeBootstrapping, err = ab.GetNodeBootstrappingForScriptless(ctx, nbcToNbcContractV1(opts.nbc), opts.scenario.VHD.Distro, datamodel.AzurePublicCloud)
 		require.NoError(t, err)
 	} else {
 		nodeBootstrapping, err = ab.GetNodeBootstrapping(ctx, opts.nbc)

diff --git a/pkg/agent/baker.go b/pkg/agent/baker.go
@@ -269,7 +269,8 @@ func normalizeResourceGroupNameForLabel(resourceGroupName string) string {
 	return truncated
 }
 
-func validateAndSetLinuxNodeBootstrappingConfiguration(config *datamodel.NodeBootstrappingConfiguration) {
+// ValidateAndSetLinuxNodeBootstrappingConfiguration is exported only for temporary usage in e2e testing of new config.
+func ValidateAndSetLinuxNodeBootstrappingConfiguration(config *datamodel.NodeBootstrappingConfiguration) {
 	if config.KubeletConfig == nil {
 		return
 	}

diff --git a/pkg/agent/bakerapi.go b/pkg/agent/bakerapi.go
@@ -42,7 +42,7 @@ func (agentBaker *agentBakerImpl) GetNodeBootstrapping(ctx context.Context, conf
 	if config.AgentPoolProfile.IsWindows() {
 		validateAndSetWindowsNodeBootstrappingConfiguration(config)
 	} else {
-		validateAndSetLinuxNodeBootstrappingConfiguration(config)
+		ValidateAndSetLinuxNodeBootstrappingConfiguration(config)
 	}
 
 	templateGenerator := InitializeTemplateGenerator()