Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: FIPS 2204 definitions #4275

Merged
merged 4 commits into from
Apr 10, 2024
Merged

feat: FIPS 2204 definitions #4275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
577f39c
sig image definition for fips 22.04
Apr 9, 2024
05d4f61
go fmt
Apr 9, 2024
3385a40
revert fmt for templates generated
Apr 9, 2024
86232e6
Merge branch 'master' into artunduman/fips-2204-definitions
artunduman Apr 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions pkg/agent/datamodel/sig_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,8 @@ var AvailableUbuntu2204Distros = []Distro{
AKSUbuntuEdgeZoneContainerd2204Gen2,
AKSUbuntuMinimalContainerd2204,
AKSUbuntuMinimalContainerd2204Gen2,
AKSUbuntuFipsContainerd2204,
AKSUbuntuFipsContainerd2204Gen2,
}

//nolint:gochecknoglobals
Expand All @@ -120,6 +122,8 @@ var AvailableContainerdDistros = []Distro{
AKSUbuntuFipsContainerd1804Gen2,
AKSUbuntuFipsContainerd2004,
AKSUbuntuFipsContainerd2004Gen2,
AKSUbuntuFipsContainerd2204,
AKSUbuntuFipsContainerd2204Gen2,
AKSUbuntuEdgeZoneContainerd1804,
AKSUbuntuEdgeZoneContainerd1804Gen2,
AKSCBLMarinerV1,
Expand Down Expand Up @@ -165,6 +169,7 @@ var AvailableGen2Distros = []Distro{
AKSUbuntuGPUContainerd1804Gen2,
AKSUbuntuFipsContainerd1804Gen2,
AKSUbuntuFipsContainerd2004Gen2,
AKSUbuntuFipsContainerd2204Gen2,
AKSUbuntuEdgeZoneContainerd1804Gen2,
AKSUbuntuArm64Containerd2204Gen2,
AKSUbuntuContainerd2204Gen2,
Expand Down Expand Up @@ -477,6 +482,20 @@ var (
Version: LinuxSIGImageVersion,
}

SIGUbuntuFipsContainerd2204ImageConfigTemplate = SigImageConfigTemplate{
ResourceGroup: AKSUbuntuResourceGroup,
Gallery: AKSUbuntuGalleryName,
Definition: "2204fipscontainerd",
Version: "202404.09.0", // TODO(artunduman): Update version when the image is ready
}

SIGUbuntuFipsContainerd2204Gen2ImageConfigTemplate = SigImageConfigTemplate{
ResourceGroup: AKSUbuntuResourceGroup,
Gallery: AKSUbuntuGalleryName,
Definition: "2204gen2fipscontainerd",
Version: "202404.09.0", // TODO(artunduman): Update version when the image is ready
}

SIGUbuntuArm64Containerd2204Gen2ImageConfigTemplate = SigImageConfigTemplate{
ResourceGroup: AKSUbuntuResourceGroup,
Gallery: AKSUbuntuGalleryName,
Expand Down Expand Up @@ -703,6 +722,8 @@ func getSigUbuntuImageConfigMapWithOpts(opts ...SigImageConfigOpt) map[Distro]Si
AKSUbuntuFipsContainerd1804Gen2: SIGUbuntuFipsContainerd1804Gen2ImageConfigTemplate.WithOptions(opts...),
AKSUbuntuFipsContainerd2004: SIGUbuntuFipsContainerd2004ImageConfigTemplate.WithOptions(opts...),
AKSUbuntuFipsContainerd2004Gen2: SIGUbuntuFipsContainerd2004Gen2ImageConfigTemplate.WithOptions(opts...),
AKSUbuntuFipsContainerd2204: SIGUbuntuFipsContainerd2204ImageConfigTemplate.WithOptions(opts...),
AKSUbuntuFipsContainerd2204Gen2: SIGUbuntuFipsContainerd2204Gen2ImageConfigTemplate.WithOptions(opts...),
AKSUbuntuContainerd2204: SIGUbuntuContainerd2204ImageConfigTemplate.WithOptions(opts...),
AKSUbuntuContainerd2204Gen2: SIGUbuntuContainerd2204Gen2ImageConfigTemplate.WithOptions(opts...),
AKSUbuntuContainerd2004CVMGen2: SIGUbuntuContainerd2004CVMGen2ImageConfigTemplate.WithOptions(opts...),
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/datamodel/sig_config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ var _ = Describe("GetSIGAzureCloudSpecConfig", func() {
Expect(sigConfig.SigTenantID).To(Equal("sometenantid"))
Expect(sigConfig.SubscriptionID).To(Equal("somesubid"))

Expect(len(sigConfig.SigUbuntuImageConfig)).To(Equal(21))
Expect(len(sigConfig.SigUbuntuImageConfig)).To(Equal(23))

aksUbuntuGPU1804Gen2 := sigConfig.SigUbuntuImageConfig[AKSUbuntuGPU1804Gen2]
Expect(aksUbuntuGPU1804Gen2.ResourceGroup).To(Equal("resourcegroup"))
Expand Down
4 changes: 4 additions & 0 deletions pkg/agent/datamodel/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,8 @@ const (
AKSUbuntuFipsContainerd1804Gen2 Distro = "aks-ubuntu-fips-containerd-18.04-gen2"
AKSUbuntuFipsContainerd2004 Distro = "aks-ubuntu-fips-containerd-20.04"
AKSUbuntuFipsContainerd2004Gen2 Distro = "aks-ubuntu-fips-containerd-20.04-gen2"
AKSUbuntuFipsContainerd2204 Distro = "aks-ubuntu-fips-containerd-22.04"
AKSUbuntuFipsContainerd2204Gen2 Distro = "aks-ubuntu-fips-containerd-22.04-gen2"
AKSUbuntuEdgeZoneContainerd1804 Distro = "aks-ubuntu-edgezone-containerd-18.04"
AKSUbuntuEdgeZoneContainerd1804Gen2 Distro = "aks-ubuntu-edgezone-containerd-18.04-gen2"
AKSUbuntuEdgeZoneContainerd2204 Distro = "aks-ubuntu-edgezone-containerd-22.04"
Expand Down Expand Up @@ -246,6 +248,8 @@ var AKSDistrosAvailableOnVHD = []Distro{
AKSUbuntuFipsContainerd1804Gen2,
AKSUbuntuFipsContainerd2004,
AKSUbuntuFipsContainerd2004Gen2,
AKSUbuntuFipsContainerd2204,
AKSUbuntuFipsContainerd2204Gen2,
AKSUbuntuEdgeZoneContainerd1804,
AKSUbuntuEdgeZoneContainerd1804Gen2,
AKSUbuntuEdgeZoneContainerd2204,
Expand Down
Loading