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

Ubuntu/devel #5527

Merged
merged 76 commits into from
Jul 19, 2024
Merged

Ubuntu/devel #5527

merged 76 commits into from
Jul 19, 2024

Conversation

aciba90
Copy link
Contributor

@aciba90 aciba90 commented Jul 19, 2024

new upstream snapshot release

  • build-package
  • sbuild

blackboxsw and others added 30 commits June 26, 2024 21:03
…onical#5450)

Avoid integration test dependencies on PPAs that we don't own.

The canonical-kernel-team PPA will trail publication of packages
to the devel series sometimes by many weeks. Also, their process
may change in the future and the daily canonical-kernel-team PPA
may not be used at some point in the future.

Some of our apt-related integration tests are only asserting that
different formats of user-data can setup and assert valid PPA
signing keys to 3 separate PPAs on a single instance launch to avoid
the costs of launching three separate instances to test different
user-data formats.

For these tests, we can hard-code a known series and PPA without
degrading the value of the simple test.

Shift our canonical-kernel-team PPA reference to curtin-dev daily
PPA for two reasons:
- we have tighter coupling with the curtin dev team to keep in step
  with any process changes
- ppa:curtin-dev/daily already has a 4096-bit signing key instead of
  the stale 1024-bit key in canonical-kernel-team's PPA which may
  change in the near future.
'metalink' config can be specified instead or along with 'baseurl' in the yum
repository config. Add support for specifying metalink instead of 'baseurl'.

Fixes canonicalGH-5359

Signed-off-by: Ani Sinha <[email protected]>
Co-authored-by: Ben Gray <[email protected]>
klibc's ipconfig format [1] states that PROTO values 'none', 'off',
'static' and blank all mean no autoconfiguration, but cloud-init parser
is too strict and accepts only the first.

LP: #2065787

[1] https://git.kernel.org/pub/scm/libs/klibc/klibc.git/plain/usr/kinit/ipconfig/README.ipconfig
…nical#5435)

get_connection() is deprecated in requests 2.32.2+ so this will
allow for the LXDSocketAdapter to avoid using a deprecated api.

Fixes canonicalGH-5434

Signed-off-by: eaglegai <[email protected]>
LXD instances don't have a defined datasource_list and therefore
implicitly exercise ds-identify. Add coverage for all other platforms.
Do not raise an error when userdata files are missing
in cloud-init query operations.

Fixes canonicalGH-5396
This will all stable distros to define whether a key is deprecated
based on the version of cloud-init which deprecated the key.
…#5411)

This will all stable distros to define whether a key is deprecated
based on the version of cloud-init which deprecated the key.
Convert the remaining half of the module docs to be rendered by the new template
system.

Includes the documentation on how to document modules under this system.

Add additional developer script tools/format_yaml_doc to reformat either
data.yaml or example.yaml cloud-config files for module documentation.

Co-authored-by: Chad Smith <[email protected]>
…nical#5365)

This field is required by the OpenStack network_data.json parsing code
but is not supported by the VLAN object in the cloudinit network schema v1.

Fixes canonicalGH-5364
…ical#5456)

Both hyphenated and underscore delimited key names are permitted
by cloudinit/distros/ug_util.py#L114 due to magic replacement
of key names.

Since this is still valid json schema, add the necessary hyphenated
aliases for all users/groups keys. Because the goal in the future is
to only support one config key for a given configuraion option, add
deprecated keys to those schema definitions.

Also drop the description key from the deprecates lock-passwd schema
key.

Any deprecated schema key which provides a suggested replacement should
not provide duplicated key descriptions as the preferred replacement
will provided the necessary context.

Fixes canonicalGH-5454
…anonical#5367)

There is a discrepancy between the properties key name formatting in
the OpenStack network_data.json and cloudinit network-config.json
specifications. Ensure `bond_` is translated to `bond-` when the
OpenStack configuration is parsed by cloudinit.

Fixes canonicalGH-5366

Co-authored-by: Alberto Contreras <[email protected]>
After 70f7e78, mac_address is not
rendered for in openstack for network config v1. Fix the unit test to
reflect that.
8906e17 is causing some test failures on older releases.
Fix them
Commit 8470af0 changes the integration test keyserver PPA to
ppa:curtin-dev/daily. Update the assertion key fingerprint.
Adapt util.should_log_deprecation to expect two params:
- version: where the key/feature was deprecated
- boundary_version: at which deprecation level logs occur
…anonical#5475)

The ubuntu_advantage key is deprecated in 24.1 in favor of ubuntu_pro.

Any version less than 24.1 will have only an info level log resulting in
no DEPRECATED keys from cloud-init status --format=yaml.

Parse log level messages in /var/log/cloud-init.log instead.
- Update deprecation test to include focal.
- Update test using `cloud-id` appropriately
Remove code for detecting a virtualenv. This has been broken since ~3.7.
blackboxsw and others added 16 commits July 10, 2024 13:25
…anonical#5209)

Ensure ignore_warnings=True or ignore_errors=True is honored and
not overridden by supplemental warning texts appended.
…l#5209)

Avoid using warning level messages as there may be some
use-cases in the wild that need to invoke cloud-init boot
stages after boot for some reason unknown to upstream.

Provide a detailed warning message informing admins to file
issues against cloud-init to better represent those feature
needs before dropping this feature altogether.
…onical#5504)

Commit 604d80e introduced assertions expecting exit 2 from the
CLI when calling cloud-init init --local. Revert this test assertion
as only cloud-init status command exits (2) on deprecations/warnings.

Invoking cloud-init's boot stages on the commmand line will only exit
1 if critical errors are encountered to avoid degrading overall
systemd health as seen from cloud-init systemd units. When cloud-init
boot stages encounter recoverable_errors of any type, there is no
need to exit non-zero as those deprecation logs are not-critical to
the health of the system as a whole.
It is pretty consistently failing due to canonical#5373 with no fix in
sight.
Ensure DNS server addresses are parsed from the proper location
of network_data.json

Fixes canonical#5386

Co-authored-by: Alberto Contreras <[email protected]>
If DNS information is added to a NetworkManager managed interface where
the given protocol family is disabled, NetworkManager will be unable to
activate the interface.

canonical#5387
'mirrorlist' config can be specified instead or along with 'baseurl' in the yum
repository config. Add support for specifying mirrorlist instead of 'baseurl'.

Fixes canonicalGH-5520
Signed-off-by: Ani Sinha <[email protected]>
9929a00 added the ability to used a cached datasource when none is
found. This was supposed to be per-datasource, but the lack of cache
cleaning got applied universally. This commit makes it so cache will be
cleaned as it was before if fallback isn't implemented in datasource.

Fixes canonicalGH-5486
This is useful for logs we want hidden by default but can be turned
on via configuration.
Switch to pathlib where appropriate and call consistently
@aciba90 aciba90 requested a review from blackboxsw July 19, 2024 15:14
@aciba90
Copy link
Contributor Author

aciba90 commented Jul 19, 2024

I get this lintian error:

E: cloud-init: alien-tag package-supports-alternative-init-but-no-init.d-script [usr/share/lintian/overrides/cloud-init:7]

We can probably drop:

cloud-init binary: package-supports-alternative-init-but-no-init.d-script

It sounds like that lintian check got removed.

@aciba90 aciba90 changed the base branch from ubuntu/devel to ubuntu/devel-23.1.x July 19, 2024 15:20
@aciba90 aciba90 changed the base branch from ubuntu/devel-23.1.x to ubuntu/devel July 19, 2024 15:20
debian/changelog Outdated
@@ -1,3 +1,10 @@
cloud-init (24.3~6g6e4153b3-0ubuntu1) oracular; urgency=medium
Copy link
Collaborator

Choose a reason for hiding this comment

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

In devel series we run with the development version format <UNRELEASED_MAJOR>.<UNRELEASED_MINOR>~<NUM_OF_DEVEL_PUBLISHES>g<UPSTREAM_GIT_HASH> to ensure that devel series package version always remains greater than any 24.2-XX release that we push to stable series as part of an SRU. This greater sort order allows the package to remain a viable "upgrade" for images performing dist-upgrade from a stable series to oracular. The tilde ~ makes this package sort lower than the official 24.3-<something> that we will eventually release to oracular when upstream cuts the official 24.3 release and we package it as 24.3-0ubuntu1

Since this is the first upload post 24.2 upstream release we have content greater than 24.2, so we need to manually bump this version to 24.3~ based... Since it's the first upload as 24.3~X the X should be 1 not 6.

Suggested change
cloud-init (24.3~6g6e4153b3-0ubuntu1) oracular; urgency=medium
cloud-init (24.3~1g6e4153b3-0ubuntu1) oracular; urgency=medium

@blackboxsw blackboxsw marked this pull request as ready for review July 19, 2024 16:43
Copy link
Collaborator

@blackboxsw blackboxsw left a comment

Choose a reason for hiding this comment

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

  • Jenkins integration runners healthy on major platforms
  • build-package and sbuild success, no new lintian errors/warnings
  • same snapshot locally vs proposed branch.

@blackboxsw blackboxsw merged commit 87c915f into canonical:ubuntu/devel Jul 19, 2024
20 checks passed
@aciba90 aciba90 deleted the ubuntu/devel branch July 24, 2024 15:16
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.