🐛 Fix OCI client configuration logic #252
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This commit fixes the logic deciding to create a TLS client for OCI charts. The existing code was creating a non-TLS configured client if either the CA file was unspecified or if `insecureSkipTLSVerify` was set to false. If a CA file was specified then `insecureSkipTLSVerify` is false, which meant that a non-TLS client was always created, causing cert validation failures if the OCI registry is served over TLS. This commit changes the logic to create a non-TLS configured client if both CA file is unset and `insecureSkipTLSVerify` is false.
k8s-ci-robot
added
the
cncf-cla: yes
k8s-ci-robot
added
the
size/XS
|
/cc @mboersma |
k8s-ci-robot
added
the
lgtm
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: jimmidyson, mboersma The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
k8s-ci-robot
added
the
approved
faiq
added a commit
to nutanix-cloud-native/cluster-api-runtime-extensions-nutanix
that referenced
this pull request
Jun 12, 2024
**What problem does this PR solve?**: Upgrade CAAPH to 0.2.4 This release includes fixes needed for supporting CAAPH in airgap environment. 🌱 Use upstream cluster RESTConfig utility by @jimmidyson in kubernetes-sigs/cluster-api-addon-provider-helm#248 🐛 Fix OCI client configuration logic by @jimmidyson in kubernetes-sigs/cluster-api-addon-provider-helm#252 🐛 pointer checks if user doesn't specify CASecret by @faiq in kubernetes-sigs/cluster-api-addon-provider-helm#253 **Which issue(s) this PR fixes**: Fixes # **How Has This Been Tested?**: <!-- Please describe the tests that you ran to verify your changes. Provide output from the tests and any manual steps needed to replicate the tests. --> **Special notes for your reviewer**: <!-- Use this to provide any additional information to the reviewers. This may include: - Best way to review the PR. - Where the author wants the most review attention on. - etc. -->
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This commit fixes the logic deciding to create a TLS client for OCI
charts.
The existing code was creating a non-TLS configured client if either the CA file
was unspecified or if
insecureSkipTLSVerifywas set to false. If a CAfile was specified then
insecureSkipTLSVerifyis always false, which meantthat a non-TLS client was always created, causing cert validation
failures if the OCI registry is served over TLS.
This commit changes the logic to create a non-TLS configured client if
both CA file is unset AND
insecureSkipTLSVerifyis false.