Skip to content

Conversation

@dekobon
Copy link
Collaborator

@dekobon dekobon commented May 21, 2025

Proposed changes

This change unifies the OSS upstream configuration with the Plus upstream configuration, so that both are using dynamic DNS reconfiguration for upstreams.

Checklist

Before creating a pull request (PR), run through this checklist and mark each as complete:

@dekobon dekobon requested review from alessfg and Copilot May 21, 2025 21:41
@dekobon dekobon requested a review from a team as a code owner May 21, 2025 21:41
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull Request Overview

This PR unifies the upstream configuration for OSS and Plus by switching both to dynamic DNS reconfiguration, ensuring consistent behavior across both editions.

  • Updated the comment in the Plus configuration file to remove specific NGINX Plus references.
  • Modified the OSS configuration file to add a dynamic DNS resolution directive with an upstream zone and a "resolve" modifier.

Reviewed Changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.

File Description
plus/etc/nginx/templates/upstreams.conf.template Removed explicit mention of NGINX Plus in favor of unified config.
oss/etc/nginx/templates/upstreams.conf.template Added an upstream zone directive and the "resolve" parameter to enable dynamic DNS reloading.
Comments suppressed due to low confidence (1)

plus/etc/nginx/templates/upstreams.conf.template:1

  • [nitpick] The removal of 'NGINX Plus' from the comment is intended to unify the configurations; please ensure that any documentation referring to Plus still clarifies the differences, if any, between the OSS and Plus deployments.
# This configuration should dynamically reload S3 backends

@alessfg alessfg changed the title Use dynamic dns resolution for upstreams in oss like plus feat: Use dynamic dns resolution for upstreams in oss like plus May 21, 2025
@dekobon dekobon changed the title feat: Use dynamic dns resolution for upstreams in oss like plus feat: use dynamic dns resolution for upstreams in oss like plus May 21, 2025
@dekobon
Copy link
Collaborator Author

dekobon commented May 21, 2025

recheck

@alessfg alessfg enabled auto-merge (squash) May 21, 2025 21:55
@alessfg alessfg disabled auto-merge May 21, 2025 21:55
@alessfg alessfg merged commit 811c0ed into main May 21, 2025
12 of 13 checks passed
@alessfg alessfg deleted the dekobon/resolver branch May 21, 2025 21:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants