Skip to content
Snippets Groups Projects

Add custom static IP key for Geo NGINX controller

Merged Clemens Beck requested to merge 5006-fix-geo-ingress-load-balancer-ip into master

What does this MR do?

Add custom static IP key for Geo NGINX controller

Adds `global.hosts.externalGeoIP` to set a static IP for the
Geo NGINX LoadBalancer, which previously used `global.hosts.externalIP`
like the default NGINX controller.

This allows to configure distinct static IPs for both NGINX subcharts.

Fixes https://gitlab.com/gitlab-org/charts/gitlab/-/issues/5006

Changelog: fixed

Background

In #4532 (closed), a second instance of the NGINX subchart for customized HTTP header handling for internal Geo traffic (needed for unified URLs). Both chart instances try pull their LoadBalancer IP from global.hosts.externalIP, resulting in only one LB remaining in Pending since its IP address is already bound.

Related issues

Closes #5006 (closed)

Author checklist

See Definition of done.

For anything in this list which will not be completed, please provide a reason in the MR discussion.

Required

  • Merge Request Title and Description are up to date, accurate, and descriptive
  • MR targeting the appropriate branch
  • MR has a green pipeline on GitLab.com
  • When ready for review, follow the instructions in the "Reviewer Roulette" section of the Danger Bot MR comment, as per the Distribution experimental MR workflow

Expected (please provide an explanation if not completing)

  • Test plan indicating conditions for success has been posted and passes
  • Documentation created/updated
  • Tests added/updated
  • Integration tests added to GitLab QA
  • Equivalent MR/issue for omnibus-gitlab opened
  • Equivalent MR/issue for Gitlab Operator project opened (see Operator documentation on impact of Charts changes)
  • Validate potential values for new configuration settings. Formats such as integer 10, duration 10s, URI scheme://user:passwd@host:port may require quotation or other special handling when rendered in a template and written to a configuration file.

Test Plan

  1. Install a release and set global.hosts.externalIP.

    Expectation: The NGINX LB service is rendered with global.hosts.externalIP as LB IP.

  2. Upgrade a release and enable:

    • the Geo controller (nginx-ingress-geo.enabled=true), and
    • set global.hosts.externalGeoIP.

    Expectation: The Geo NGINX LB service is rendered with global.hosts.externalGeoIP as LB IP.

Edited by Clemens Beck

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Clemens Beck resolved all threads

    resolved all threads

  • Clemens Beck added 1 commit

    added 1 commit

    Compare with previous version

  • Clemens Beck added 1 commit

    added 1 commit

    Compare with previous version

  • mentioned in issue #5006 (closed)

  • Clemens Beck marked the checklist item MR has a green pipeline on GitLab.com as completed

    marked the checklist item MR has a green pipeline on GitLab.com as completed

  • Clemens Beck marked the checklist item Test plan indicating conditions for success has been posted and passes as completed

    marked the checklist item Test plan indicating conditions for success has been posted and passes as completed

  • Clemens Beck marked this merge request as ready

    marked this merge request as ready

  • requested review from @dmakovey

  • Clemens Beck added 1 commit

    added 1 commit

    • cbc598b2 - Source global LoadBalancer IP from configurable template

    Compare with previous version

  • Clemens Beck added 1 commit

    added 1 commit

    • 962b6ab4 - Source global LoadBalancer IP from configurable template

    Compare with previous version

  • Clemens Beck added 1 commit

    added 1 commit

    Compare with previous version

  • Contributor

    Allure report

    allure-report-publisher generated test report!

    e2e-test-report: :white_check_mark: test report for 55fa03f3

    expand test summary
    +-----------------------------------------------------------------------+
    |                            suites summary                             |
    +------------------+--------+--------+---------+-------+-------+--------+
    |                  | passed | failed | skipped | flaky | total | result |
    +------------------+--------+--------+---------+-------+-------+--------+
    | Govern           | 72     | 0      | 3       | 0     | 75    | ✅     |
    | Create           | 135    | 0      | 6       | 0     | 141   | ✅     |
    | Manage           | 6      | 0      | 0       | 0     | 6     | ✅     |
    | Data Stores      | 63     | 0      | 3       | 0     | 66    | ✅     |
    | Plan             | 165    | 0      | 0       | 0     | 165   | ✅     |
    | Monitor          | 12     | 0      | 0       | 0     | 12    | ✅     |
    | Verify           | 24     | 0      | 0       | 0     | 24    | ✅     |
    | Framework sanity | 0      | 0      | 3       | 0     | 3     | ➖     |
    | Package          | 0      | 0      | 3       | 0     | 3     | ➖     |
    +------------------+--------+--------+---------+-------+-------+--------+
    | Total            | 477    | 0      | 18      | 0     | 495   | ✅     |
    +------------------+--------+--------+---------+-------+-------+--------+
  • Dmytro Makovey
  • Dmytro Makovey approved this merge request

    approved this merge request

  • while I'm sorting out more precise testing methodology, lets engage maintainer to get this over the finish line.

  • Dmytro Makovey requested review from @mnielsen

    requested review from @mnielsen

  • 🤖 GitLab Bot 🤖 changed milestone to %16.6

    changed milestone to %16.6

  • Mitchell Nielsen approved this merge request

    approved this merge request

  • Looks good from my side, just a couple non-blocking suggestions.

    Given the nature of the change I'm going to hand this over to Jason for final review and merge.

  • Mitchell Nielsen requested review from @WarheadsSE

    requested review from @WarheadsSE

  • Clemens Beck added 1 commit

    added 1 commit

    Compare with previous version

  • Clemens Beck resolved all threads

    resolved all threads

  • Clemens Beck added 1 commit

    added 1 commit

    • 02cf4624 - Fix global values markdown table

    Compare with previous version

  • Clemens Beck changed the description

    changed the description

  • Mitchell Nielsen approved this merge request

    approved this merge request

  • Jason Plum approved this merge request

    approved this merge request

  • merged

  • Jason Plum mentioned in commit 1f308453

    mentioned in commit 1f308453

  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Please register or sign in to reply
    Loading