Changelog fixes

[alinabuzachis]

SUMMARY

Changelog fixes

ISSUE TYPE

• Docs Pull Request

[softwarefactory-project-zuul]

Build succeeded.
https://ansible.softwarefactory-project.io/zuul/buildset/81392eff8c7c4ba4bc56d0ae54f4cbf8

✔️ ansible-galaxy-importer SUCCESS in 3m 58s
✔️ build-ansible-collection SUCCESS in 5m 41s

[softwarefactory-project-zuul]

Build succeeded (gate pipeline).
https://ansible.softwarefactory-project.io/zuul/buildset/6a7622be11b94600821855737c581c78

✔️ ansible-galaxy-importer SUCCESS in 3m 41s
✔️ build-ansible-collection SUCCESS in 7m 31s

[patchback]

Backport to stable-5: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 6158300 on top of patchback/backports/stable-5/61583000621c5abe9a6d3a21385413a3e7d4c832/pr-989

Backporting merged PR #989 into main

1. Ensure you have a local repo clone of your fork. Unless you cloned it
   from the upstream, this would be your origin remote.
2. Make sure you have an upstream repo added as a remote too. In these
   instructions you'll refer to it by the name upstream. If you don't
   have it, here's how you can add it:

   $ git remote add upstream https://github.com/ansible-collections/kubernetes.core.git

3. Ensure you have the latest copy of upstream and prepare a branch
   that will hold the backported code:

   $ git fetch upstream
   $ git checkout -b patchback/backports/stable-5/61583000621c5abe9a6d3a21385413a3e7d4c832/pr-989 upstream/stable-5

4. Now, cherry-pick PR Changelog fixes #989 contents into that branch:

   $ git cherry-pick -x 61583000621c5abe9a6d3a21385413a3e7d4c832

   If it'll yell at you with something like fatal: Commit 61583000621c5abe9a6d3a21385413a3e7d4c832 is a merge but no -m option was given., add -m 1 as follows instead:

   $ git cherry-pick -m1 -x 61583000621c5abe9a6d3a21385413a3e7d4c832

5. At this point, you'll probably encounter some merge conflicts. You must
   resolve them in to preserve the patch from PR Changelog fixes #989 as close to the
   original as possible.
6. Push this branch to your fork on GitHub:

   $ git push origin patchback/backports/stable-5/61583000621c5abe9a6d3a21385413a3e7d4c832/pr-989

7. Create a PR, ensure that the CI is green. If it's not — update it so that
   the tests and any other checks pass. This is it!
   Now relax and wait for the maintainers to process your pull request
   when they have some cycles to do reviews. Don't worry — they'll tell you if
   any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

[patchback]

Backport to stable-6: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-6/61583000621c5abe9a6d3a21385413a3e7d4c832/pr-989

Backported as #990

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

[beeankha]

It looks like stable-5 only needs the change from changelog.yaml, the CHANGELOG.rst file is formatted properly on that branch:

I can make a quick small PR for stable-5 so that everything matches up and we don't have to worry about manual backporting/conflicts since it's just one file that needs updating.