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

Jump to bottom

refactor: remove edgezone config #4548

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

refactor: remove edgezone config #4548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 0 additions & 4 deletions e2e/template.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,10 +432,6 @@ func baseTemplate(location string) *datamodel.NodeBootstrappingConfiguration {
GalleryName: "AKSWindows",
ResourceGroup: "AKS-Windows",
},
"AKSUbuntuEdgeZone": {
GalleryName: "AKSUbuntuEdgeZone",
ResourceGroup: "AKS-Ubuntu-EdgeZone",
},
},
},
IsARM64: false,
Expand Down
4 changes: 0 additions & 4 deletions e2e/windows/e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,6 @@ func TestE2EWindows(t *testing.T) {
GalleryName: "AKSWindows",
ResourceGroup: "AKS-Windows",
},
"AKSUbuntuEdgeZone": datamodel.SIGGalleryConfig{
GalleryName: "AKSUbuntuEdgeZone",
ResourceGroup: "AKS-Ubuntu-EdgeZone",
},
},
}

Expand Down
8 changes: 0 additions & 8 deletions pkg/agent/baker_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,10 +202,6 @@ var _ = Describe("Assert generated customData and cseCmd", func() {
GalleryName: "AKSWindows",
ResourceGroup: "AKS-Windows",
},
"AKSUbuntuEdgeZone": {
GalleryName: "AKSUbuntuEdgeZone",
ResourceGroup: "AKS-Ubuntu-EdgeZone",
},
},
},
}
Expand Down Expand Up @@ -1528,10 +1524,6 @@ var _ = Describe("Assert generated customData and cseCmd for Windows", func() {
GalleryName: "AKSWindows",
ResourceGroup: "AKS-Windows",
},
"AKSUbuntuEdgeZone": {
GalleryName: "AKSUbuntuEdgeZone",
ResourceGroup: "AKS-Ubuntu-EdgeZone",
},
},
},
}
Expand Down
10 changes: 0 additions & 10 deletions pkg/agent/bakerapi.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,13 +147,6 @@ func (agentBaker *agentBakerImpl) GetDistroSigImageConfig(
allDistros[distro] = sigConfig
}

for distro, sigConfig := range allAzureSigConfig.SigUbuntuEdgeZoneImageConfig {
if version, ok := linuxImageVersionOverrides[string(distro)]; ok {
sigConfig.Version = version
}
allDistros[distro] = sigConfig
}

return allDistros, nil
}

Expand All @@ -170,9 +163,6 @@ func findSIGImageConfig(sigConfig datamodel.SIGAzureEnvironmentSpecConfig, distr
if imageConfig, ok := sigConfig.SigWindowsImageConfig[distro]; ok {
return &imageConfig
}
if imageConfig, ok := sigConfig.SigUbuntuEdgeZoneImageConfig[distro]; ok {
return &imageConfig
}

return nil
}
Expand Down
4 changes: 0 additions & 4 deletions pkg/agent/bakerapi_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,10 +126,6 @@ var _ = Describe("AgentBaker API implementation tests", func() {
GalleryName: "akswindows",
ResourceGroup: "resourcegroup",
},
"AKSUbuntuEdgeZone": {
GalleryName: "AKSUbuntuEdgeZone",
ResourceGroup: "AKS-Ubuntu-EdgeZone",
},
}
sigConfig = &datamodel.SIGConfig{
TenantID: "sometenantid",
Expand Down
112 changes: 23 additions & 89 deletions pkg/agent/datamodel/sig_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,13 @@ const (
/* TODO(tonyxu) merge this with AzureEnvironmentSpecConfig from aks-engine(pkg/api/azenvtypes.go) once
it's moved into AKS RP. */
type SIGAzureEnvironmentSpecConfig struct {
CloudName string `json:"cloudName,omitempty"`
SigTenantID string `json:"sigTenantID,omitempty"`
SubscriptionID string `json:"subscriptionID,omitempty"`
SigUbuntuImageConfig map[Distro]SigImageConfig `json:"sigUbuntuImageConfig,omitempty"`
SigCBLMarinerImageConfig map[Distro]SigImageConfig `json:"sigCBLMarinerImageConfig,omitempty"`
SigAzureLinuxImageConfig map[Distro]SigImageConfig `json:"sigAzureLinuxImageConfig,omitempty"`
SigWindowsImageConfig map[Distro]SigImageConfig `json:"sigWindowsImageConfig,omitempty"`
SigUbuntuEdgeZoneImageConfig map[Distro]SigImageConfig `json:"sigUbuntuEdgeZoneImageConfig,omitempty"`
// TODO(adadilli) add PIR constants as well
CloudName string `json:"cloudName,omitempty"`
SigTenantID string `json:"sigTenantID,omitempty"`
SubscriptionID string `json:"subscriptionID,omitempty"`
SigUbuntuImageConfig map[Distro]SigImageConfig `json:"sigUbuntuImageConfig,omitempty"`
SigCBLMarinerImageConfig map[Distro]SigImageConfig `json:"sigCBLMarinerImageConfig,omitempty"`
SigAzureLinuxImageConfig map[Distro]SigImageConfig `json:"sigAzureLinuxImageConfig,omitempty"`
SigWindowsImageConfig map[Distro]SigImageConfig `json:"sigWindowsImageConfig,omitempty"`
}

// EnvironmentInfo represents the set of required fields to determine specifics
Expand Down Expand Up @@ -87,8 +85,6 @@ var AvailableUbuntu1804Distros = []Distro{
AKSUbuntuGPUContainerd1804Gen2,
AKSUbuntuFipsContainerd1804,
AKSUbuntuFipsContainerd1804Gen2,
AKSUbuntuEdgeZoneContainerd1804,
AKSUbuntuEdgeZoneContainerd1804Gen2,
}

//nolint:gochecknoglobals
Expand All @@ -104,8 +100,6 @@ var AvailableUbuntu2204Distros = []Distro{
AKSUbuntuContainerd2204Gen2,
AKSUbuntuArm64Containerd2204Gen2,
AKSUbuntuContainerd2204TLGen2,
AKSUbuntuEdgeZoneContainerd2204,
AKSUbuntuEdgeZoneContainerd2204Gen2,
AKSUbuntuMinimalContainerd2204,
AKSUbuntuMinimalContainerd2204Gen2,
AKSUbuntuFipsContainerd2204,
Expand All @@ -131,8 +125,6 @@ var AvailableContainerdDistros = []Distro{
AKSUbuntuFipsContainerd2004Gen2,
AKSUbuntuFipsContainerd2204,
AKSUbuntuFipsContainerd2204Gen2,
AKSUbuntuEdgeZoneContainerd1804,
AKSUbuntuEdgeZoneContainerd1804Gen2,
AKSCBLMarinerV1,
AKSCBLMarinerV2,
AKSAzureLinuxV2,
Expand All @@ -155,8 +147,6 @@ var AvailableContainerdDistros = []Distro{
AKSUbuntuContainerd2204Gen2,
AKSUbuntuContainerd2004CVMGen2,
AKSUbuntuContainerd2204TLGen2,
AKSUbuntuEdgeZoneContainerd2204,
AKSUbuntuEdgeZoneContainerd2204Gen2,
AKSUbuntuMinimalContainerd2204,
AKSUbuntuMinimalContainerd2204Gen2,
AKSUbuntuContainerd2404,
Expand All @@ -180,13 +170,11 @@ var AvailableGen2Distros = []Distro{
AKSUbuntuFipsContainerd1804Gen2,
AKSUbuntuFipsContainerd2004Gen2,
AKSUbuntuFipsContainerd2204Gen2,
AKSUbuntuEdgeZoneContainerd1804Gen2,
AKSUbuntuArm64Containerd2204Gen2,
AKSUbuntuArm64Containerd2404Gen2,
AKSUbuntuContainerd2204Gen2,
AKSUbuntuContainerd2004CVMGen2,
AKSUbuntuContainerd2204TLGen2,
AKSUbuntuEdgeZoneContainerd2204Gen2,
AKSUbuntuMinimalContainerd2204Gen2,
AKSUbuntuContainerd2404Gen2,
AKSCBLMarinerV2Gen2,
Expand Down Expand Up @@ -332,17 +320,15 @@ var AvailableWindowsPIRDistros = []Distro{

// SIG const.
const (
AKSSIGImagePublisher string = "microsoft-aks"
AKSWindowsGalleryName string = "AKSWindows"
AKSWindowsResourceGroup string = "AKS-Windows"
AKSUbuntuGalleryName string = "AKSUbuntu"
AKSUbuntuResourceGroup string = "AKS-Ubuntu"
AKSCBLMarinerGalleryName string = "AKSCBLMariner"
AKSCBLMarinerResourceGroup string = "AKS-CBLMariner"
AKSAzureLinuxGalleryName string = "AKSAzureLinux"
AKSAzureLinuxResourceGroup string = "AKS-AzureLinux"
AKSUbuntuEdgeZoneGalleryName string = "AKSUbuntuEdgeZone"
AKSUbuntuEdgeZoneResourceGroup string = "AKS-Ubuntu-EdgeZone"
AKSSIGImagePublisher string = "microsoft-aks"
AKSWindowsGalleryName string = "AKSWindows"
AKSWindowsResourceGroup string = "AKS-Windows"
AKSUbuntuGalleryName string = "AKSUbuntu"
AKSUbuntuResourceGroup string = "AKS-Ubuntu"
AKSCBLMarinerGalleryName string = "AKSCBLMariner"
AKSCBLMarinerResourceGroup string = "AKS-CBLMariner"
AKSAzureLinuxGalleryName string = "AKSAzureLinux"
AKSAzureLinuxResourceGroup string = "AKS-AzureLinux"
)

const (
Expand Down Expand Up @@ -810,47 +796,6 @@ func getSigWindowsImageConfigMapWithOpts(opts ...SigImageConfigOpt) map[Distro]S
}
}

func getSigUbuntuEdgeZoneImageConfigMapWithOpts(opts ...SigImageConfigOpt) map[Distro]SigImageConfig {
// This image is using a specific resource group and gallery name for edge zone scenario.
sigUbuntuEdgeZoneContainerd1804ImageConfigTemplate := SigImageConfigTemplate{
ResourceGroup: AKSUbuntuEdgeZoneResourceGroup,
Gallery: AKSUbuntuEdgeZoneGalleryName,
Definition: "1804containerd",
Version: LinuxSIGImageVersion,
}

// This image is using a specific resource group and gallery name for edge zone scenario.
sigUbuntuEdgeZoneContainerd1804Gen2ImageConfigTemplate := SigImageConfigTemplate{
ResourceGroup: AKSUbuntuEdgeZoneResourceGroup,
Gallery: AKSUbuntuEdgeZoneGalleryName,
Definition: "1804gen2containerd",
Version: LinuxSIGImageVersion,
}

// This image is using a specific resource group and gallery name for edge zone scenario.
sigUbuntuEdgeZoneContainerd2204ImageConfigTemplate := SigImageConfigTemplate{
ResourceGroup: AKSUbuntuEdgeZoneResourceGroup,
Gallery: AKSUbuntuEdgeZoneGalleryName,
Definition: "2204containerd",
Version: LinuxSIGImageVersion,
}

// This image is using a specific resource group and gallery name for edge zone scenario.
sigUbuntuEdgeZoneContainerd2204Gen2ImageConfigTemplate := SigImageConfigTemplate{
ResourceGroup: AKSUbuntuEdgeZoneResourceGroup,
Gallery: AKSUbuntuEdgeZoneGalleryName,
Definition: "2204gen2containerd",
Version: LinuxSIGImageVersion,
}

return map[Distro]SigImageConfig{
AKSUbuntuEdgeZoneContainerd1804: sigUbuntuEdgeZoneContainerd1804ImageConfigTemplate.WithOptions(opts...),
AKSUbuntuEdgeZoneContainerd1804Gen2: sigUbuntuEdgeZoneContainerd1804Gen2ImageConfigTemplate.WithOptions(opts...),
AKSUbuntuEdgeZoneContainerd2204: sigUbuntuEdgeZoneContainerd2204ImageConfigTemplate.WithOptions(opts...),
AKSUbuntuEdgeZoneContainerd2204Gen2: sigUbuntuEdgeZoneContainerd2204Gen2ImageConfigTemplate.WithOptions(opts...),
}
}

// GetSIGAzureCloudSpecConfig get cloud specific sig config.
func GetSIGAzureCloudSpecConfig(sigConfig SIGConfig, region string) (SIGAzureEnvironmentSpecConfig, error) {
if sigConfig.Galleries == nil || strings.EqualFold(sigConfig.SubscriptionID, "") || strings.EqualFold(sigConfig.TenantID, "") {
Expand Down Expand Up @@ -886,8 +831,6 @@ func GetSIGAzureCloudSpecConfig(sigConfig SIGConfig, region string) (SIGAzureEnv
}
c.SigWindowsImageConfig = getSigWindowsImageConfigMapWithOpts(fromACSWindows)

fromACSUbuntuEdgeZone := withEdgeZoneConfig(sigConfig)
c.SigUbuntuEdgeZoneImageConfig = getSigUbuntuEdgeZoneImageConfigMapWithOpts(fromACSUbuntuEdgeZone)
return *c, nil
}

Expand All @@ -897,14 +840,13 @@ unit tests and e2es.
*/
func GetAzurePublicSIGConfigForTest() SIGAzureEnvironmentSpecConfig {
return SIGAzureEnvironmentSpecConfig{
CloudName: AzurePublicCloud,
SigTenantID: AzurePublicCloudSigTenantID,
SubscriptionID: AzurePublicCloudSigSubscription,
SigUbuntuImageConfig: getSigUbuntuImageConfigMapWithOpts(withSubscription(AzurePublicCloudSigSubscription)),
SigCBLMarinerImageConfig: getSigCBLMarinerImageConfigMapWithOpts(withSubscription(AzurePublicCloudSigSubscription)),
SigAzureLinuxImageConfig: getSigAzureLinuxImageConfigMapWithOpts(withSubscription(AzurePublicCloudSigSubscription)),
SigWindowsImageConfig: getSigWindowsImageConfigMapWithOpts(withSubscription(AzurePublicCloudSigSubscription)),
SigUbuntuEdgeZoneImageConfig: getSigUbuntuEdgeZoneImageConfigMapWithOpts(withSubscription(AzurePublicCloudSigSubscription)),
CloudName: AzurePublicCloud,
SigTenantID: AzurePublicCloudSigTenantID,
SubscriptionID: AzurePublicCloudSigSubscription,
SigUbuntuImageConfig: getSigUbuntuImageConfigMapWithOpts(withSubscription(AzurePublicCloudSigSubscription)),
SigCBLMarinerImageConfig: getSigCBLMarinerImageConfigMapWithOpts(withSubscription(AzurePublicCloudSigSubscription)),
SigAzureLinuxImageConfig: getSigAzureLinuxImageConfigMapWithOpts(withSubscription(AzurePublicCloudSigSubscription)),
SigWindowsImageConfig: getSigWindowsImageConfigMapWithOpts(withSubscription(AzurePublicCloudSigSubscription)),
}
}

Expand All @@ -920,14 +862,6 @@ func withACSSIGConfig(acsSigConfig SIGConfig, osSKU string) (SigImageConfigOpt,
}, nil
}

func withEdgeZoneConfig(acsSigConfig SIGConfig) SigImageConfigOpt {
return func(c *SigImageConfig) {
c.Gallery = AKSUbuntuEdgeZoneGalleryName
c.SubscriptionID = acsSigConfig.SubscriptionID
c.ResourceGroup = AKSUbuntuEdgeZoneResourceGroup
}
}

//nolint:unparam //subscriptionID only receives AzurePublicCloudSigSubscription
func withSubscription(subscriptionID string) SigImageConfigOpt {
return func(c *SigImageConfig) {
Expand Down
30 changes: 0 additions & 30 deletions pkg/agent/datamodel/sig_config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@ var _ = Describe("GetSIGAzureCloudSpecConfig", func() {
GalleryName: "AKSWindows",
ResourceGroup: "AKS-Windows",
},
"AKSUbuntuEdgeZone": SIGGalleryConfig{
GalleryName: "AKSUbuntuEdgeZone",
ResourceGroup: "AKS-Ubuntu-EdgeZone",
},
}
config = SIGConfig{
TenantID: "sometenantid",
Expand Down Expand Up @@ -157,32 +153,6 @@ var _ = Describe("GetSIGAzureCloudSpecConfig", func() {
Expect(aksUbuntu2204TLGen2Containerd.Definition).To(Equal("2204gen2TLcontainerd"))
Expect(aksUbuntu2204TLGen2Containerd.Version).To(Equal(LinuxSIGImageVersion))

Expect(len(sigConfig.SigUbuntuEdgeZoneImageConfig)).To(Equal(4))

aksUbuntuEdgeZoneContainerd1804 := sigConfig.SigUbuntuEdgeZoneImageConfig[AKSUbuntuEdgeZoneContainerd1804]
Expect(aksUbuntuEdgeZoneContainerd1804.ResourceGroup).To(Equal("AKS-Ubuntu-EdgeZone"))
Expect(aksUbuntuEdgeZoneContainerd1804.Gallery).To(Equal("AKSUbuntuEdgeZone"))
Expect(aksUbuntuEdgeZoneContainerd1804.Definition).To(Equal("1804containerd"))
Expect(aksUbuntuEdgeZoneContainerd1804.Version).To(Equal(LinuxSIGImageVersion))

aksUbuntuEdgeZoneContainerd1804Gen2 := sigConfig.SigUbuntuEdgeZoneImageConfig[AKSUbuntuEdgeZoneContainerd1804Gen2]
Expect(aksUbuntuEdgeZoneContainerd1804Gen2.ResourceGroup).To(Equal("AKS-Ubuntu-EdgeZone"))
Expect(aksUbuntuEdgeZoneContainerd1804Gen2.Gallery).To(Equal("AKSUbuntuEdgeZone"))
Expect(aksUbuntuEdgeZoneContainerd1804Gen2.Definition).To(Equal("1804gen2containerd"))
Expect(aksUbuntuEdgeZoneContainerd1804Gen2.Version).To(Equal(LinuxSIGImageVersion))

aksUbuntuEdgeZoneContainerd2204 := sigConfig.SigUbuntuEdgeZoneImageConfig[AKSUbuntuEdgeZoneContainerd2204]
Expect(aksUbuntuEdgeZoneContainerd2204.ResourceGroup).To(Equal("AKS-Ubuntu-EdgeZone"))
Expect(aksUbuntuEdgeZoneContainerd2204.Gallery).To(Equal("AKSUbuntuEdgeZone"))
Expect(aksUbuntuEdgeZoneContainerd2204.Definition).To(Equal("2204containerd"))
Expect(aksUbuntuEdgeZoneContainerd2204.Version).To(Equal(LinuxSIGImageVersion))

aksUbuntuEdgeZoneContainerd2204Gen2 := sigConfig.SigUbuntuEdgeZoneImageConfig[AKSUbuntuEdgeZoneContainerd2204Gen2]
Expect(aksUbuntuEdgeZoneContainerd2204Gen2.ResourceGroup).To(Equal("AKS-Ubuntu-EdgeZone"))
Expect(aksUbuntuEdgeZoneContainerd2204Gen2.Gallery).To(Equal("AKSUbuntuEdgeZone"))
Expect(aksUbuntuEdgeZoneContainerd2204Gen2.Definition).To(Equal("2204gen2containerd"))
Expect(aksUbuntuEdgeZoneContainerd2204Gen2.Version).To(Equal(LinuxSIGImageVersion))

marinerV2Gen2TL := sigConfig.SigCBLMarinerImageConfig[AKSCBLMarinerV2Gen2TL]
Expect(marinerV2Gen2TL.ResourceGroup).To(Equal("resourcegroup"))
Expect(marinerV2Gen2TL.Gallery).To(Equal("akscblmariner"))
Expand Down
Loading
Loading