Skip to content

NE-2510: Remove unused os_wildcard_domain.map - #830

Open
Miciah wants to merge 1 commit into
openshift:masterfrom
redhat-chai-bot:fix-remove-wildcard-domain-map
Open

NE-2510: Remove unused os_wildcard_domain.map#830
Miciah wants to merge 1 commit into
openshift:masterfrom
redhat-chai-bot:fix-remove-wildcard-domain-map

Conversation

@Miciah

@Miciah Miciah commented Jul 30, 2026

Copy link
Copy Markdown
Contributor

The os_wildcard_domain.map file and its associated generation logic have been unused since wildcard route support was integrated directly into the other HAProxy map files (os_http_be.map, os_edge_reencrypt_be.map, os_tcp_be.map, etc.). Remove the dead template definition, map entry generator, helper function, and related test code to reduce maintenance burden and eliminate confusion about the router's active map files.

Follow-up to openshift/origin#12580.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jul 30, 2026
@openshift-ci-robot

openshift-ci-robot commented Jul 30, 2026

Copy link
Copy Markdown
Contributor

@Miciah: This pull request references NE-2510 which is a valid jira issue.

Details

In response to this:

The os_wildcard_domain.map file and its associated generation logic have been unused since wildcard route support was integrated directly into the other HAProxy map files (os_http_be.map, os_edge_reencrypt_be.map, os_tcp_be.map, etc.). Remove the dead template definition, map entry generator, helper function, and related test code to reduce maintenance burden and eliminate confusion about the router's active map files.

Follow-up to openshift/origin#12580.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci
openshift-ci Bot requested review from davidesalerno and rikatz July 30, 2026 02:49
@openshift-ci

openshift-ci Bot commented Jul 30, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign bentito for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@coderabbitai

coderabbitai Bot commented Jul 30, 2026

Copy link
Copy Markdown

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Central YAML (inherited)

Review profile: CHILL

Plan: Enterprise

Run ID: 0d2f8183-4385-400d-93f6-408abf683065

📥 Commits

Reviewing files that changed from the base of the PR and between 03b4cb7 and 8a15b44.

📒 Files selected for processing (10)
  • hack/Dockerfile.debug
  • images/router/haproxy/Dockerfile
  • images/router/haproxy/Dockerfile.ocp
  • images/router/haproxy/Dockerfile.rhel
  • images/router/haproxy/conf/haproxy-config.template
  • pkg/router/template/configmanager/haproxy/manager.go
  • pkg/router/template/template_helper.go
  • pkg/router/template/template_helper_test.go
  • pkg/router/template/util/haproxy/map_entry.go
  • pkg/router/template/util/haproxy/map_entry_test.go
💤 Files with no reviewable changes (4)
  • pkg/router/template/util/haproxy/map_entry.go
  • pkg/router/template/configmanager/haproxy/manager.go
  • pkg/router/template/util/haproxy/map_entry_test.go
  • images/router/haproxy/conf/haproxy-config.template

📝 Walkthrough

Walkthrough

Wildcard-domain HAProxy map generation, associations, template helpers, inline templates, and image initialization were removed. Related tests were deleted or updated to retain HTTP backend map assertions.

Suggested reviewers: rikatz, davidesalerno, stbenjam

🚥 Pre-merge checks | ✅ 15
✅ Passed checks (15 passed)
Check name Status Explanation
Title check ✅ Passed The title accurately summarizes the main change: removing the unused os_wildcard_domain.map artifact.
Description check ✅ Passed The description matches the changeset by explaining the removal of the map, its generation logic, helper, and tests.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Stable And Deterministic Test Names ✅ Passed Changed tests use static table-driven names; no Ginkgo titles or runtime-generated identifiers were added.
Test Structure And Quality ✅ Passed Touched tests are plain testing unit tests; no Ginkgo Describe/It/Eventually blocks or cluster interactions to evaluate.
Microshift Test Compatibility ✅ Passed No new Ginkgo e2e tests were added; the patch only removes unit-test code and adds no MicroShift-unsafe APIs or features.
Single Node Openshift (Sno) Test Compatibility ✅ Passed No new Ginkgo e2e tests were added; the touched tests are unit tests and contain no SNO-sensitive multi-node assumptions.
Topology-Aware Scheduling Compatibility ✅ Passed Only removes unused HAProxy wildcard map/template helpers; no deployments, controllers, replicas, affinity, nodeSelectors, or topology logic changed.
Ote Binary Stdout Contract ✅ Passed Touched files are helper/template/test code only; no main/init/TestMain or stdout writes were added.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed No new Ginkgo e2e tests were added; the touched test files only remove unit-test coverage, so there are no new IPv4 or external-connectivity assumptions to flag.
No-Weak-Crypto ✅ Passed No added MD5/SHA1/DES/RC4/3DES/Blowfish/ECB or secret-comparison code appears in the PR diff; it only removes wildcard map logic.
Container-Privileges ✅ Passed Touched files only remove os_wildcard_domain.map references; no privileged/root/securityContext settings appear in the diff.
No-Sensitive-Data-In-Logs ✅ Passed No new log statements or sensitive-data exposures were added; the only hostname-bearing log line was removed with the wildcard helper.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Comment @coderabbitai help to get the list of available commands.

@openshift-ci openshift-ci Bot added the ready-for-human-review Indicates a PR has been reviewed by automated tools and is ready for human review label Jul 30, 2026
The os_wildcard_domain.map file and its associated generation
logic have been unused since wildcard route support was
integrated directly into the other HAProxy map files
(os_http_be.map, os_edge_reencrypt_be.map, os_tcp_be.map,
etc.). Remove the dead template definition, map entry
generator, helper function, and related test code to reduce
maintenance burden and eliminate confusion about the router's
active map files.

This commit resolves NE-2510.

https://issues.redhat.com/browse/NE-2510

Follow-up to commit
4346b05.

openshift/origin@006bae3

* images/router/haproxy/conf/haproxy-config.template
(conf/os_wildcard_domain.map): Remove template definition.
* pkg/router/template/util/haproxy/map_entry.go
(generateWildcardDomainMapEntry): Remove function.
* pkg/router/template/util/haproxy/map_entry.go
(GenerateMapEntry): Remove os_wildcard_domain.map entry
from generator map.
* pkg/router/template/util/haproxy/map_entry_test.go
(TestGenerateWildcardDomainMapEntry): Remove test.
* pkg/router/template/template_helper.go
(genSubdomainWildcardRegexp): Remove legacy function.
* pkg/router/template/template_helper.go
(helperFunctions): Remove genSubdomainWildcardRegexp entry.
* pkg/router/template/template_helper_test.go
(TestGenerateHAProxyMap): Remove os_wildcard_domain.map
test block.
* pkg/router/template/configmanager/haproxy/manager.go
(BuildMapAssociations): Remove os_wildcard_domain.map
association.
* images/router/haproxy/Dockerfile:
* images/router/haproxy/Dockerfile.rhel:
* images/router/haproxy/Dockerfile.ocp:
* hack/Dockerfile.debug: Remove os_wildcard_domain from
pre-created map files.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@redhat-chai-bot
redhat-chai-bot force-pushed the fix-remove-wildcard-domain-map branch from 03b4cb7 to 8a15b44 Compare July 30, 2026 03:17
@openshift-ci

openshift-ci Bot commented Jul 30, 2026

Copy link
Copy Markdown
Contributor

@Miciah: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-aws-serial-2of2 8a15b44 link true /test e2e-aws-serial-2of2
ci/prow/e2e-agnostic 8a15b44 link true /test e2e-agnostic

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

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

Labels

jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. ready-for-human-review Indicates a PR has been reviewed by automated tools and is ready for human review

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants