-
Notifications
You must be signed in to change notification settings - Fork 23
fix: Set default rustls provider #1301
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
Conversation
Cargo.toml
Outdated
@@ -51,6 +51,10 @@ hostname-validator = "1.1.1" | |||
reqwest = { version = "0", default-features = false, features = [ | |||
"rustls-tls-native-roots", | |||
] } | |||
rustls = { version = "0.23", default-features = false, features = [ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe it's better to re-export on policy-fetcher and consume it that way.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fine by me. One less dependency to keep on sync among our code.
tests/e2e.rs
Outdated
.arg(&deployment_yaml); | ||
cmd.assert().success(); | ||
|
||
// Fail if deployment.yaml test data file was changed |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
test will fail until rebased on top of #1300.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's wait to rebase it before merge it then.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Rebased onto main, the e2e test was copied to the other PR and merged already.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We need to wait the rebase to see if the tests are green. So far, LGTM
tests/e2e.rs
Outdated
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ouch, I've already provided a e2e test for that inside of the other PR... I think we can drop this one
Cargo.toml
Outdated
rustls = { version = "0.23", default-features = false, features = [ | ||
"std", | ||
"tls12", | ||
] } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
rustls = { version = "0.23", default-features = false, features = [ | |
"std", | |
"tls12", | |
] } | |
# We will use the same version of rustls used by policy-fetcher | |
rustls = { version = "0", default-features = false, features = [ | |
"std", | |
"tls12", | |
] } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Changing that inside of policy-fetcher and exporting it will be quite a pain. This should be enough.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done.
756007d
to
a5d7eec
Compare
Signed-off-by: Víctor Cuadrado Juan <vcuadradojuan@suse.de>
This fixes error on creating the resource catalog for the first time. Signed-off-by: Víctor Cuadrado Juan <vcuadradojuan@suse.de>
a5d7eec
to
c9ce0c9
Compare
Rebased on top of main, after merging the other PR and the e2e test there. |
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #1301 +/- ##
==========================================
+ Coverage 87.46% 87.47% +0.01%
==========================================
Files 34 34
Lines 4932 4936 +4
==========================================
+ Hits 4314 4318 +4
Misses 618 618 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
Signed-off-by: Víctor Cuadrado Juan <vcuadradojuan@suse.de>
@@ -51,6 +51,7 @@ hostname-validator = "1.1.1" | |||
reqwest = { version = "0", default-features = false, features = [ | |||
"rustls-tls-native-roots", | |||
] } | |||
rustls = { version = "0.23", default-features = false } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Have you tried to relax that even more, like version = "0"
. This should avoid any complication with the next minor release of rustls
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I prefer to leave it as is, we will get the bot to bump anyways.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM, I'm fine merging it as it is. You can ignore the last comment I wrote if you want
Description
Fix #1298
This fixes error on creating the resource catalog for the first time.
The rustls dependency is configured exactly as we do in policy-fetcher.
Test
Added new e2e test for
kwctl scaffold admission-request
. Doubles as e2e test for #1300.Additional Information
Tradeoff
Potential improvement