Add custom static IP key for Geo NGINX controller
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
, duration10s
, URIscheme://user:passwd@host:port
may require quotation or other special handling when rendered in a template and written to a configuration file.
Test Plan
-
Install a release and set
global.hosts.externalIP
.Expectation: The NGINX LB service is rendered with
global.hosts.externalIP
as LB IP. -
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. - the Geo controller (
Merge request reports
Activity
assigned to @clemensbeck
changed milestone to %16.5
- Resolved by Dmytro Makovey
1 Message If this is a wider community contribution, the Community contribution label should be added. Once your MR is ready for review you can comment
@gitlab-bot ready <@user>
to request the first review to someone. It's recommended that you pick the one suggested by the reviewer roulette. But you can ignore it and assign it to someone else if you see fit.Merge requests are handled according to the workflow documented in our handbook and should receive a response within the limit documented in our First-response SLO.
If you don't receive a response from the reviewer within the SLO, please mention
@gitlab-org/distribution
, or one of our Project MaintainersReviewer roulette
Changes that require review have been detected! A merge request is normally reviewed by both a reviewer and a maintainer in its primary category and by a maintainer in all other categories.
To spread load more evenly across eligible reviewers, Danger has picked a candidate for each review slot. Feel free to override these selections if you think someone else would be better-suited or use the GitLab Review Workload Dashboard to find other available reviewers.
To read more on how to use the reviewer roulette, please take a look at the Engineering workflow and code review guidelines. Please consider assigning a reviewer or maintainer who is a domain expert in the area of the merge request.
Once you've decided who will review this merge request, mention them as you normally would! Danger does not automatically notify them for you.
Reviewer Maintainer Dmitry Makovey (
@dmakovey
) (UTC-6, 8 hours behind@clemensbeck
)Mitch Nielsen (
@mnielsen
) (UTC-5, 7 hours behind@clemensbeck
)If needed, you can retry the
danger-review
job that generated this comment.Generated by
Danger
- Resolved by Clemens Beck
- Resolved by Dmytro Makovey
mentioned in issue #5006 (closed)
added QA:verified label
added workflowin dev label
added workflowready for review label and removed workflowin dev label
requested review from @dmakovey
added workflowin review label and removed workflowready for review label
added 1 commit
- cbc598b2 - Source global LoadBalancer IP from configurable template
added 1 commit
- 962b6ab4 - Source global LoadBalancer IP from configurable template
Allure report
allure-report-publisher
generated test report!e2e-test-report:
test report for 55fa03f3expand 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 | ✅ | +------------------+--------+--------+---------+-------+-------+--------+
- Resolved by Dmytro Makovey
- Resolved by Mitchell Nielsen
code inspection done. Will do quick testing before passing over to maintainer.
requested review from @mnielsen
changed milestone to %16.6
added missed:16.5 label
- Resolved by Clemens Beck
- Resolved by Clemens Beck
requested review from @WarheadsSE
- Resolved by Clemens Beck
mentioned in commit 1f308453
mentioned in merge request gitlab-com/gl-infra/k8s-mgmt/components!169 (merged)
mentioned in merge request gitlab-com/gl-infra/k8s-workloads/gitlab-helmfiles!3678 (merged)