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

shared-defaults: add missing updog to list of network-affected services #3578

Merged
merged 1 commit into from
Nov 7, 2023

Conversation

etungsten
Copy link
Contributor

@etungsten etungsten commented Nov 7, 2023

Issue number:

Resolves #3577

Description of changes:
For aws-* variants, we need to regenerate updog's config when the network proxy setting changes.

Testing done:
Before updating network.no-proxy setting

[root@admin]# sudo sheltie                                                                                                                                                                                        
bash-5.1# cat /etc/updog.toml 
metadata_base_url = "https://updates.bottlerocket.aws/2020-07-07/aws-k8s-1.28/x86_64/"
targets_base_url = "https://updates.bottlerocket.aws/targets/"
seed = 492
version_lock = "latest"
ignore_waves = true

After:

bash-5.1# apiclient set -j '{"settings": {"network":{"no-proxy": ["testing"]}}}' 
bash-5.1# cat /etc/updog.toml 
metadata_base_url = "https://updates.bottlerocket.aws/2020-07-07/aws-k8s-1.28/x86_64/"
targets_base_url = "https://updates.bottlerocket.aws/targets/"
seed = 492
version_lock = "latest"
ignore_waves = true
no_proxy=["testing"]

Migration tested:
On 1.16.0

bash-5.1# cat /var/lib/bottlerocket/datastore/current/live/settings/network.affected-services 
["containerd","kubernetes","host-containerd","host-containers"]

After upgrade to 1.16.1:

bash-5.1# cat /var/lib/bottlerocket/datastore/current/live/settings/network.affected-services 
["containerd","kubernetes","host-containerd","host-containers","updog"]

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.

@etungsten etungsten marked this pull request as ready for review November 7, 2023 01:43
Copy link
Contributor

@yeazelm yeazelm left a comment

Choose a reason for hiding this comment

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

LGTM!

@etungsten etungsten marked this pull request as draft November 7, 2023 17:14
@etungsten etungsten force-pushed the wassupdog branch 3 times, most recently from b780668 to 123ab87 Compare November 7, 2023 17:39
We need to regenerate updog's config when the network proxy setting
changes.

Includes the migration for network's affected-services metadata.
@etungsten etungsten marked this pull request as ready for review November 7, 2023 18:00
@etungsten etungsten merged commit dbf9ed1 into bottlerocket-os:develop Nov 7, 2023
46 checks passed
@etungsten etungsten deleted the wassupdog branch November 7, 2023 18:28
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.

updog.toml not rendered after changing network settings
5 participants