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

fix contour httpproxy annotations overwritten if ingress class selected #1205

Merged
merged 1 commit into from
Jun 21, 2022

Conversation

BrandonCate
Copy link
Contributor

problem: If ingress class is selected for contour flagger install whenever httpproxy is created the annotations are completely overwritten, not allowing for any custom annotations.

fix: change it so the ingress class annotation is added instead of overriding

@BrandonCate BrandonCate force-pushed the bugfix-contour-annotation-override branch from de61531 to 55b1fe3 Compare May 25, 2022 15:43
pkg/router/contour.go Show resolved Hide resolved
@BrandonCate BrandonCate force-pushed the bugfix-contour-annotation-override branch from b3013bf to 7b988bf Compare June 6, 2022 18:43
@codecov-commenter
Copy link

codecov-commenter commented Jun 6, 2022

Codecov Report

Merging #1205 (59959e6) into main (560f884) will decrease coverage by 0.27%.
The diff coverage is 33.33%.

❗ Current head 59959e6 differs from pull request most recent head 0cecab5. Consider uploading reports for the commit 0cecab5 to get more accurate results

@@            Coverage Diff             @@
##             main    #1205      +/-   ##
==========================================
- Coverage   54.96%   54.69%   -0.28%     
==========================================
  Files          79       80       +1     
  Lines        6642     6823     +181     
==========================================
+ Hits         3651     3732      +81     
- Misses       2418     2511      +93     
- Partials      573      580       +7     
Impacted Files Coverage Δ
pkg/router/contour.go 85.71% <33.33%> (-0.64%) ⬇️
pkg/canary/deployment_controller.go 44.87% <0.00%> (-17.88%) ⬇️
pkg/canary/factory.go 0.00% <0.00%> (ø)
pkg/canary/hpa_reconciler.go 79.76% <0.00%> (ø)
pkg/controller/scheduler.go 46.60% <0.00%> (+0.01%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 560f884...0cecab5. Read the comment docs.

@BrandonCate
Copy link
Contributor Author

@aryan9600 updated with your changes

@aryan9600
Copy link
Member

@BrandonCate lint checking is failing CI, could you fix that, squash all your changes into a single commit and push that? Thanks!

@BrandonCate BrandonCate force-pushed the bugfix-contour-annotation-override branch from 59959e6 to 0c57db4 Compare June 14, 2022 17:29
@aryan9600
Copy link
Member

@BrandonCate could you please squash all three commits into one commit with the message fix contour httproxy annotations overwrite and force push? thanks!

Signed-off-by: brandoncate <brandon.cate@shipt.com>
@BrandonCate BrandonCate force-pushed the bugfix-contour-annotation-override branch from 0c57db4 to 0cecab5 Compare June 17, 2022 15:02
@BrandonCate
Copy link
Contributor Author

sasquatched

@aryan9600 aryan9600 merged commit 7b2c005 into fluxcd:main Jun 21, 2022
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