docs: Update min requirements by joestringer · Pull Request #49496 · cilium/cilium · GitHub
Skip to content

docs: Update min requirements - #49496

Draft
joestringer wants to merge 8 commits into
mainfrom
pr/joe/docs-dependencies+test
Draft

joestringer wants to merge 8 commits into
mainfrom
pr/joe/docs-dependencies+test

Conversation

@joestringer

Copy link
Copy Markdown
Member

Apply 'pur -r Documentation/requirements-min/requirements.txt' to update
the docs dependencies.

This PR also helps to test the changes proposed in #49482.

joestringer and others added 7 commits October 20, 2026 09:10
The docs-builder image build workflows have created some pain during
maintenance due to the way that the files have been managed, including:

* docs-builder image tag was calculated from all Documentation/ content.
  This means that _any_ change to Documentation files would cause the
  builder to need to be rebuilt.
* Documentation/Makefile contains the docs-builder image tag, meaning
  that any time we update the docs-builder tag, it updates the input
  used to calculate the docs-builder tag. As soon as you make one change
  to any docs file dependency, the docs-builder update GitHub workflows
  would always trigger the deployment to rebuild the docs-builder image,
  even if all changes to the docs-builder have been accounted for.
* Due to these discrepancies, there has been no way to detect whether
  the docs-builder needs updating, so the regular Documentation build
  did not depend on building a docs-builder image with the latest
  dependencies. This lead to cases where we would review and merge docs
  dependency updates without actually building the docs using the new
  dependencies.

Move all of the build infrastructure for creating the docs-builder
images under the images/ directory. By reducing the set of input files
for calculating the builder sha to only the minimal dependencies under
images/docs-builder directory, we can update the docs-builder only when
the dependencies update, rather than any time there is any change in the
documentation.

Co-authored-by: André Martins <andre@cilium.io>
Signed-off-by: Joe Stringer <joestringernz@gmail.com>
Mount the original host copy of the git repository into the docker
containers when generating the requirements.txt so that a full build can
be performed from a git worktree.

Signed-off-by: Joe Stringer <joe@cilium.io>
This new make target will check the docker tag for the docs-builder
image based on dependencies in the images/docs-builder/ directory, and
update the tag in all relevant locations if the tag would differ.

This target is only intended to create the diff so that there is a hard
dependency on the new builder image tag value, but it will not update
the $DOCS_BUILDER_IMG variable to the new fully specified image.

Add this new target to the 'builder-image' target so that any time the
builder image is updated, the files in the tree are also updated. This
should help to signal when the docs-builder references need to be
updated.

Signed-off-by: Joe Stringer <joe@cilium.io>
To ensure that the documentation directory is built against the latest
copy of the docs-builder dependencies, add a check which updates the
docs-builder image tag based on the docs-builder dependencies in the git
tree, and then fail out with a message requiring the user to update the
docs-builder image if the local tree is out of sync.

This should ensure that renovate docs-builder updates are tested before
we merge the changes, by virtue of being run from the standard GitHub
workflow for documentation checks.

Signed-off-by: Joe Stringer <joe@cilium.io>
Bump these to versions that have been released relatively recently.
Readthedocs lists Python 3.14 as a supported build dependency, so pick
that over more recent releases that are not yet listed on their site.

Signed-off-by: Joe Stringer <joe@cilium.io>
Signed-off-by: Joe Stringer <joe@cilium.io>
Signed-off-by: Joe Stringer <joe@cilium.io>
@maintainer-s-little-helper maintainer-s-little-helper Bot added the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Oct 20, 2026
@joestringer
joestringer added this pull request to stack #49497 October 20, 2026 16:26
@joestringer joestringer added release-note/misc This PR makes changes that have no direct user impact. needs-backport/1.18 This PR / issue needs backporting to the v1.18 branch needs-backport/1.19 This PR / issue needs backporting to the v1.19 branch needs-backport/1.20 This PR / issue needs backporting to the v1.20 branch ail:0 Human Created, No AI Involved. labels Oct 20, 2026
@maintainer-s-little-helper maintainer-s-little-helper Bot removed the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Oct 20, 2026
Update the documentation dependencies:

  $ pur -r Documentation/requirements-min/requirements.txt
  ...
  $ make -C Documentation update-requirements
  ...

Signed-off-by: Joe Stringer <joe@cilium.io>
@joestringer
joestringer force-pushed the pr/joe/docs-dependencies+test branch from 5ae4fbc to bb72be3 Compare October 20, 2026 16:32
Base automatically changed from pr/joe/docs-dependencies to main October 22, 2026 18:13

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ail:0 Human Created, No AI Involved. needs-backport/1.18 This PR / issue needs backporting to the v1.18 branch needs-backport/1.19 This PR / issue needs backporting to the v1.19 branch needs-backport/1.20 This PR / issue needs backporting to the v1.20 branch release-note/misc This PR makes changes that have no direct user impact.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant