Skip to content

Commit e834763

Browse files
committed
feat: add TL FIPS e2e
1 parent f87e140 commit e834763

File tree

3 files changed

+37
-0
lines changed

3 files changed

+37
-0
lines changed

e2e/config/vhd.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,16 @@ var (
8484
// Secure TLS Bootstrapping isn't currently supported on FIPS-enabled VHDs
8585
UnsupportedSecureTLSBootstrapping: true,
8686
}
87+
VHDUbuntu2204Gen2FIPSTLContainerd = &Image{
88+
Name: "2204gen2fipstlcontainerd",
89+
OS: OSUbuntu,
90+
Arch: "amd64",
91+
Distro: datamodel.AKSUbuntuFipsTLContainerd2204Gen2,
92+
Gallery: imageGalleryLinux,
93+
UnsupportedLocalDns: true,
94+
// Secure TLS Bootstrapping isn't currently supported on FIPS-enabled VHDs
95+
UnsupportedSecureTLSBootstrapping: true,
96+
}
8797
VHDAzureLinuxV2Gen2Arm64 = &Image{
8898
Name: "AzureLinuxV2gen2arm64",
8999
OS: OSAzureLinux,

e2e/scenario_test.go

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -438,6 +438,32 @@ func Test_Ubuntu2204Gen2FIPS(t *testing.T) {
438438
})
439439
}
440440

441+
func Test_Ubuntu2204Gen2FIPSTL(t *testing.T) {
442+
RunScenario(t, &Scenario{
443+
Description: "Tests that a node using the Ubuntu 2204 FIPS Gen2 VHD can be properly bootstrapped",
444+
Config: Config{
445+
Cluster: ClusterKubenet,
446+
VHD: config.VHDUbuntu2204Gen2FIPSContainerd,
447+
BootstrapConfigMutator: func(nbc *datamodel.NodeBootstrappingConfiguration) {
448+
},
449+
VMConfigMutator: func(vmss *armcompute.VirtualMachineScaleSet) {
450+
vmss.Properties = addTrustedLaunchToVMSS(vmss.Properties)
451+
vmss.Properties.AdditionalCapabilities = &armcompute.AdditionalCapabilities{
452+
EnableFips1403Encryption: to.Ptr(true),
453+
}
454+
settings := vmss.Properties.VirtualMachineProfile.ExtensionProfile.Extensions[0].Properties.ProtectedSettings
455+
vmss.Properties.VirtualMachineProfile.ExtensionProfile.Extensions[0].Properties.Settings = settings
456+
vmss.Properties.VirtualMachineProfile.ExtensionProfile.Extensions[0].Properties.ProtectedSettings = nil
457+
},
458+
Validator: func(ctx context.Context, s *Scenario) {
459+
ValidateInstalledPackageVersion(ctx, s, "moby-containerd", components.GetExpectedPackageVersions("containerd", "ubuntu", "r2204")[0])
460+
ValidateInstalledPackageVersion(ctx, s, "moby-runc", components.GetExpectedPackageVersions("runc", "ubuntu", "r2204")[0])
461+
ValidateSSHServiceEnabled(ctx, s)
462+
},
463+
},
464+
})
465+
}
466+
441467
func Test_Ubuntu2204_EntraIDSSH(t *testing.T) {
442468
RunScenario(t, &Scenario{
443469
Description: "Tests that a node using Ubuntu 2204 VHD with Entra ID SSH can be properly bootstrapped and SSH private key authentication is disabled",

pkg/agent/datamodel/types.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,7 @@ const (
168168
AKSUbuntuFipsContainerd2004Gen2 Distro = "aks-ubuntu-fips-containerd-20.04-gen2"
169169
AKSUbuntuFipsContainerd2204 Distro = "aks-ubuntu-fips-containerd-22.04"
170170
AKSUbuntuFipsContainerd2204Gen2 Distro = "aks-ubuntu-fips-containerd-22.04-gen2"
171+
AKSUbuntuFipsTLContainerd2204Gen2 Distro = "aks-ubuntu-fips-tl-containerd-22.04-gen2"
171172
AKSUbuntuEdgeZoneContainerd2204 Distro = "aks-ubuntu-edgezone-containerd-22.04"
172173
AKSUbuntuEdgeZoneContainerd2204Gen2 Distro = "aks-ubuntu-edgezone-containerd-22.04-gen2"
173174
AKSUbuntuContainerd2204 Distro = "aks-ubuntu-containerd-22.04"

0 commit comments

Comments
 (0)