Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: retain TLS configuration for canary ingresses in the nginx integration. Fixes #1134 #2679

Merged
merged 8 commits into from
May 30, 2023

Conversation

pfyod
Copy link
Contributor

@pfyod pfyod commented Mar 24, 2023

For some reason (there's a comment but not explanation as to why), nginx integration does not copy TLS configuration from the stable ingress when creating canary ingresses (see issue #1134). This PR fixes that.

Checklist:

  • Either (a) I've created an enhancement proposal and discussed it with the community, (b) this is a bug fix, or (c) this is a chore.
  • The title of the PR is (a) conventional with a list of types and scopes found here, (b) states what changed, and (c) suffixes the related issues number. E.g. "fix(controller): Updates such and such. Fixes #1234".
  • I've signed my commits with DCO
  • I have written unit and/or e2e tests for my change. PRs without these are unlikely to be merged.
  • My builds are green. Try syncing with master if they are not.
  • My organization is added to USERS.md.

@github-actions
Copy link
Contributor

github-actions bot commented Mar 24, 2023

Go Published Test Results

1 988 tests   1 988 ✔️  2m 35s ⏱️
   118 suites         0 💤
       1 files           0

Results for commit 5cb1621.

♻️ This comment has been updated with latest results.

@codecov
Copy link

codecov bot commented Mar 24, 2023

Codecov Report

Patch coverage: 100.00% and no project coverage change.

Comparison is base (c4b48f0) 81.68% compared to head (5cb1621) 81.69%.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #2679   +/-   ##
=======================================
  Coverage   81.68%   81.69%           
=======================================
  Files         133      133           
  Lines       20178    20184    +6     
=======================================
+ Hits        16483    16489    +6     
  Misses       2843     2843           
  Partials      852      852           
Impacted Files Coverage Δ
rollout/trafficrouting/nginx/nginx.go 78.99% <100.00%> (+0.59%) ⬆️

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@github-actions
Copy link
Contributor

github-actions bot commented Mar 24, 2023

E2E Tests Published Test Results

    4 files      4 suites   3h 23m 8s ⏱️
  96 tests   83 ✔️   5 💤   8
394 runs  364 ✔️ 20 💤 10

For more details on these failures, see this check.

Results for commit 5cb1621.

♻️ This comment has been updated with latest results.

@zachaller zachaller added this to the v1.6 milestone Mar 28, 2023
pfyod and others added 5 commits March 30, 2023 08:59
@zachaller
Copy link
Collaborator

LGTM

@sonarcloud
Copy link

sonarcloud bot commented May 30, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 6 Code Smells

No Coverage information No Coverage information
6.1% 6.1% Duplication

@zachaller zachaller merged commit 6cc4d2a into argoproj:master May 30, 2023
@pfyod pfyod deleted the nginx-tls branch June 2, 2023 09:16
@andyliuliming
Copy link
Contributor

when will this be released?

@andyliuliming
Copy link
Contributor

may @zachaller knows?

1 similar comment
@andyliuliming
Copy link
Contributor

may @zachaller knows?

andyliuliming pushed a commit to andyliuliming/argo-rollouts that referenced this pull request Jun 11, 2023
…gration. Fixes argoproj#1134 (argoproj#2679)

* Retain TLS configuration for canary ingresses in the nginx integration

Signed-off-by: Pavels Fjodorovs <pavels.fjodorovs@hotelplan.com>

* Retain TLS configuration for canary ingresses in the nginx integration

Signed-off-by: Pavels Fjodorovs <pavels.fjodorovs@hotelplan.com>

* fixed tests after multiple nginx ingress merge

Signed-off-by: Pavels Fjodorovs <me@pfyod.com>

---------

Signed-off-by: Pavels Fjodorovs <pavels.fjodorovs@hotelplan.com>
Signed-off-by: Pavels Fjodorovs <me@pfyod.com>
andyliuliming pushed a commit to andyliuliming/argo-rollouts that referenced this pull request Jul 22, 2023
…gration. Fixes argoproj#1134 (argoproj#2679)

* Retain TLS configuration for canary ingresses in the nginx integration

Signed-off-by: Pavels Fjodorovs <pavels.fjodorovs@hotelplan.com>

* Retain TLS configuration for canary ingresses in the nginx integration

Signed-off-by: Pavels Fjodorovs <pavels.fjodorovs@hotelplan.com>

* fixed tests after multiple nginx ingress merge

Signed-off-by: Pavels Fjodorovs <me@pfyod.com>

---------

Signed-off-by: Pavels Fjodorovs <pavels.fjodorovs@hotelplan.com>
Signed-off-by: Pavels Fjodorovs <me@pfyod.com>
Signed-off-by: Liming Liu <andyliuliming@outlook.com>
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