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.

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: Add osSKU parameter back #3856

Open
wants to merge 5 commits into
base: main
Choose a base branch
from

Conversation

PixelRobots
Copy link
Contributor

@PixelRobots PixelRobots commented Nov 28, 2024

Signed-off-by: PixelRobots [email protected]

Description

Fixes #3595
Fixes #3819

Pipeline Reference

Pipeline
avm.res.container-service.managed-cluster

Type of Change

  • Update to CI Environment or utilities (Non-module affecting changes)
  • Azure Verified Module updates:
    • Bugfix containing backwards-compatible bug fixes, and I have NOT bumped the MAJOR or MINOR version in version.json:
      • Someone has opened a bug report issue, and I have included "Closes #{bug_report_issue_number}" in the PR description.
      • The bug was found by the module author, and no one has opened an issue to report it yet.
    • Feature update backwards compatible feature updates, and I have bumped the MINOR version in version.json.
    • Breaking changes and I have bumped the MAJOR version in version.json.
    • Update to documentation

Checklist

  • I'm sure there are no other open Pull Requests for the same update/change
  • I have run Set-AVMModule locally to generate the supporting module files.
  • My corresponding pipelines / checks run clean and green without any errors or warnings

@PixelRobots PixelRobots requested review from a team as code owners November 28, 2024 20:18
@avm-team-linter avm-team-linter bot added the Needs: Module Owner 📣 This module needs an owner to develop or maintain it label Nov 28, 2024
@microsoft-github-policy-service microsoft-github-policy-service bot added the Needs: Triage 🔍 Maintainers need to triage still label Nov 28, 2024

Important

The "Needs: Triage 🔍" label must be removed once the triage process is complete!

Tip

For additional guidance on how to triage this issue/PR, see the BRM Issue Triage documentation.

@microsoft-github-policy-service microsoft-github-policy-service bot added the Type: AVM 🅰️ ✌️ Ⓜ️ This is an AVM related issue label Nov 28, 2024

Important

If this is a module-related PR, being submitted by the sole owner of the module, the AVM core team must review and approve it (as module owners can't approve their own PRs).

To indicate this PR needs the core team''s attention, apply the "Needs: Core Team 🧞" label!

The core team will only review and approve PRs that have this label applied!

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please note, while this PR looks absolutely fine as far as I'm concerned it will fail in upstream due to: #3646 who's underlying issue needs to be resolved first.
Mind while, while we got merge regardless, this would mean the module would not be published.

@@ -599,6 +599,7 @@ resource managedCluster 'Microsoft.ContainerService/managedClusters@2024-03-02-p
osDiskSizeGB: profile.?osDiskSizeGB
osDiskType: profile.?osDiskType
osType: profile.?osType ?? 'Linux'
osSKU: profile.?osSku ?? 'AzureLinux'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's bring some consistency here and let us always use osSKU.
default value is Ubuntu as per documentation:

Specifies the OS SKU used by the agent pool. If not specified, the default is Ubuntu if OSType=Linux or Windows2019 if OSType=Windows. And the default Windows OSSKU will be changed to Windows2022 after Windows2019 is deprecated.

Suggested change
osSKU: profile.?osSku ?? 'AzureLinux'
osSKU: profile.?osSKU'

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also please update osSku -> osSKU in the type definition, parameter definition and in agentPool.bicep
alternatively, I already have the changes in a branch of mine.
https://github.com/JPEasier/bicep-registry-modules/tree/users/jpeasier/avm-aks

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you have the changes in your Branch already then, we can use that, and I can close this PR. When would you be pushing your branch?

@AlexanderSehr AlexanderSehr requested a review from a team November 29, 2024 11:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Needs: Module Owner 📣 This module needs an owner to develop or maintain it Needs: Triage 🔍 Maintainers need to triage still Type: AVM 🅰️ ✌️ Ⓜ️ This is an AVM related issue
Projects
None yet
3 participants