Skip to content

Fix SUSE Linux Micro 6+ - #628

Merged
google-oss-prow[bot] merged 2 commits into
GoogleCloudPlatform:mainfrom
rjschwei:slMicro
Aug 7, 2026
Merged

Fix SUSE Linux Micro 6+#628
google-oss-prow[bot] merged 2 commits into
GoogleCloudPlatform:mainfrom
rjschwei:slMicro

Conversation

@rjschwei

@rjschwei rjschwei commented Aug 5, 2026

Copy link
Copy Markdown
Contributor

SUSE Linux Micro 6+ is based on the SLES 16 code base and we need to account for the same semantics as in SLES 16. Recognize SL Micro and handle it appropriately. Thanks to @lidong Zhong from the SUSE L3 team.

@google-oss-prow

Copy link
Copy Markdown

Hi @rjschwei. Thanks for your PR.

I'm waiting for a GoogleCloudPlatform member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@ChaitanyaKulkarni28

Copy link
Copy Markdown
Member

/ok-to-test

Comment thread google_guest_agent/oslogin.go Outdated
isSles16 := strings.Contains(osInfo.OS, "sles") || strings.Contains(osInfo.OS, "opensuse")
if !isSles16 || osInfo.Version.Major != 16 {
isSles16 := strings.Contains(osInfo.OS, "sles") || strings.Contains(osInfo.OS, "opensuse")
isSLMicro := := strings.Contains(osInfo.OS, "sl-micro")

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks for the PR @rjschwei

There seems to build failure due to duplicate :=.

Also, while we're modifying this do you mind changing this to something like this for readabilit

isSles := strings.Contains(osInfo.OS, "sles") || strings.Contains(osInfo.OS, "opensuse") || strings.Contains(osInfo.OS, "sl-micro")

if !isSles || osInfo.Version.Major != 16 {
    return nil
}

Based on this major version from VERSION_ID for sl-micro is also 16

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

@ChaitanyaKulkarni28 I fixed the fat finger issue with the double ":=" The table you reference is not relevant to this. The table was created after Micro 6.2 was released and os-release will not change retroactively. Meaning the versions for micro 6+ are 6.0, 6.1 and 6.2. There will not be a Micro 6.3. Going forward starting with SLES 16.1 there will be an "immutable" mode that replaces the Micro product.

@rjschwei
rjschwei force-pushed the slMicro branch 2 times, most recently from f4d57da to 60d4b36 Compare August 6, 2026 11:34
SUSE Linux Micro 6+ is based on the SLES 16 code base and we need to account
for the same semantics as in SLES 16. Recognize SL Micro and handle it
appropriately. Thanks to @lidong Zhong from the SUSE L3 team.
@google-oss-prow google-oss-prow Bot added size/S and removed size/XS labels Aug 6, 2026
@rjschwei
rjschwei force-pushed the slMicro branch 2 times, most recently from 1c54c71 to 8f67452 Compare August 6, 2026 12:23
@rjschwei

rjschwei commented Aug 6, 2026

Copy link
Copy Markdown
Contributor Author

@ChaitanyaKulkarni28 sorry need help with the tests, could you please take a look. I added tests to check Micro. Thanks

@google-oss-prow

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ChaitanyaKulkarni28, rjschwei

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:
  • OWNERS [ChaitanyaKulkarni28]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@google-oss-prow
google-oss-prow Bot merged commit 2d087e9 into GoogleCloudPlatform:main Aug 7, 2026
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants