Skip to content

Improve API server HTTPRoute config based on review feedback#68552

Merged
Miretpl merged 4 commits into
apache:mainfrom
somaz94:feat/httproute-apiserver-followup
Jul 1, 2026
Merged

Improve API server HTTPRoute config based on review feedback#68552
Miretpl merged 4 commits into
apache:mainfrom
somaz94:feat/httproute-apiserver-followup

Conversation

@somaz94

@somaz94 somaz94 commented Jun 15, 2026

Copy link
Copy Markdown
Contributor

Follow-up to #67675 addressing post-merge review feedback from @Miretpl. The
original PR has not been released yet, so these refinements land before the
upcoming chart release as requested.

Changes:

  • Move the HTTPRoute config from top-level httpRoute.apiServer.* to
    apiServer.httpRoute.* — it is an API-server setting, not a global one
    (values.yaml, values.schema.json, template, docs, tests).
  • Fail template rendering with a clear message when apiServer.httpRoute.enabled
    is true but the Gateway API HTTPRoute CRD is not installed (via
    .Capabilities.APIVersions.Has).
  • Fail when both ingress.apiServer.enabled and apiServer.httpRoute.enabled
    are set — HTTPRoute is an alternative to the API server Ingress.
  • Strengthen tests: assert full spec.parentRefs / spec.rules structures, add
    asserts to the validation test, inline a single-use variable, and split the
    parametrized creation test into separate cases (no inner if).
  • Add an api_versions parameter to the render_chart helper so
    Capabilities-gated templates render offline.

Validation:

  • 48 apiserver helm unit tests pass (incl. new CRD-missing and ingress-conflict cases)
  • helm template renders for enabled/disabled and fails as expected for both guards
  • chart-quality (values↔schema) test passes; ruff clean

related: #67675


Was generative AI tooling used to co-author this PR?
  • Yes — Claude Code (Opus 4.8)

Generated-by: Claude Code (Opus 4.8) following the guidelines

@somaz94 somaz94 marked this pull request as ready for review June 15, 2026 05:08
@potiuk potiuk added the ready for maintainer review Set after triaging when all criteria pass. label Jun 17, 2026
Comment thread chart/values.yaml
Comment thread chart/values.yaml
Comment thread chart/values.schema.json
Comment thread chart/tests/chart_utils/helm_template_generator.py Outdated
Comment thread chart/templates/api-server/api-server-httproute.yaml
Comment thread chart/values.schema.json

@Miretpl Miretpl left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Nice work, thanks!

@Miretpl Miretpl added the backport-to-chart/v1-2x-test Automatic backport to chart 1.2x maintenance branch label Jul 1, 2026
@Miretpl Miretpl merged commit d2d9f4c into apache:main Jul 1, 2026
102 checks passed
@github-actions

github-actions Bot commented Jul 1, 2026

Copy link
Copy Markdown
Contributor

Backport failed to create: chart/v1-2x-test. View the failure log Run details

Note: As of Merging PRs targeted for Airflow 3.X
the committer who merges the PR is responsible for backporting the PRs that are bug fixes (generally speaking) to the maintenance branches.

In matter of doubt please ask in #release-management Slack channel.

Status Branch Result
chart/v1-2x-test Commit Link

You can attempt to backport this manually by running:

cherry_picker d2d9f4c chart/v1-2x-test

This should apply the commit to the chart/v1-2x-test branch and leave the commit in conflict state marking
the files that need manual conflict resolution.

After you have resolved the conflicts, you can continue the backport process by running:

cherry_picker --continue

If you don't have cherry-picker installed, see the installation guide.

@Miretpl

Miretpl commented Jul 1, 2026

Copy link
Copy Markdown
Contributor

@somaz94 could you do manual backport to chart/v1-2x-test branch?

potiuk pushed a commit to steveahnahn/airflow that referenced this pull request Jul 8, 2026
* Move API server HTTPRoute under apiServer and add config guards

* Require HTTPRoute parentRefs and document API server Ingress mutual exclusivity

* Fail fast on empty HTTPRoute parentRefs via schema minItems

* Apply pretty-format-json formatting to values.schema.json

(cherry picked from commit d2d9f4c)
@Miretpl Miretpl added this to the Airflow Helm Chart 1.23.0 milestone Jul 8, 2026
Miretpl pushed a commit that referenced this pull request Jul 9, 2026
* Move API server HTTPRoute under apiServer and add config guards

* Require HTTPRoute parentRefs and document API server Ingress mutual exclusivity

* Fail fast on empty HTTPRoute parentRefs via schema minItems

* Apply pretty-format-json formatting to values.schema.json

(cherry picked from commit d2d9f4c)

Co-authored-by: somaz <112675579+somaz94@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:helm-chart Airflow Helm Chart backport-to-chart/v1-2x-test Automatic backport to chart 1.2x maintenance branch kind:documentation ready for maintainer review Set after triaging when all criteria pass.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants