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

Release.toml: fix reference to kubelet-config-settings migration #3048

Conversation

markusboehme
Copy link
Member

Issue number: n/a

Description of changes: Fix a typo in Release.toml for the recent kubelet settings PR introducing CPU manager policy options.

Testing done: Manual migration and rollback testing.

On 1.13.0:

[ec2-user@admin]$ apiclient get os
{
  "os": {
    "arch": "x86_64",
    "build_id": "f7a2e3cc-dirty",
    "pretty_name": "Bottlerocket OS 1.13.0 (aws-k8s-1.23)",
    "variant_id": "aws-k8s-1.23",
    "version_id": "1.13.0"
  }
}
[ec2-user@admin]$ apiclient get settings.kubernetes.cpu-manager
{}

After migration to 1.14.0:

[ec2-user@admin]$ apiclient get os
{
  "os": {
    "arch": "x86_64",
    "build_id": "abfb51be-dirty",
    "pretty_name": "Bottlerocket OS 1.14.0 (aws-k8s-1.23)",
    "variant_id": "aws-k8s-1.23",
    "version_id": "1.14.0"
  }
}
[ec2-user@admin]$ apiclient apply                                                 
[settings.kubernetes]
cpu-manager-policy = "static"
cpu-manager-policy-options = ["full-pcpus-only"]
[ec2-user@admin]$ apiclient get settings.kubernetes.cpu-manager                   
{
  "settings": {
    "kubernetes": {
      "cpu-manager-policy": "static",
      "cpu-manager-policy-options": [
        "full-pcpus-only"
      ]
    }
  }
}

After rollback to 1.13.0:

[ec2-user@admin]$ apiclient get os
{
  "os": {
    "arch": "x86_64",
    "build_id": "f7a2e3cc-dirty",
    "pretty_name": "Bottlerocket OS 1.13.0 (aws-k8s-1.23)",
    "variant_id": "aws-k8s-1.23",
    "version_id": "1.13.0"
  }
}
[ec2-user@admin]$ apiclient get settings.kubernetes.cpu-manager
{
  "settings": {
    "kubernetes": {
      "cpu-manager-policy": "static"
    }
  }
}

Terms of contribution:

By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.

Signed-off-by: Markus Boehme <markubo@amazon.com>
Copy link
Contributor

@stmcginnis stmcginnis left a comment

Choose a reason for hiding this comment

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

Thanks for getting this right away. Wish we had a better way to enforce these things.

@markusboehme markusboehme merged commit 88e12bd into bottlerocket-os:develop Apr 25, 2023
@markusboehme
Copy link
Member Author

Wish we had a better way to enforce these things.

Agreed, it's easy to miss trivial things (and having to redo testing because the migration isn't being run--been there, done that). I hacked something up in #3051. Let me know what you think!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants