Simplify generateCertConfigMapEntry #137
Merged
Conversation
This file contains 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
Delete superfluous conditions in the cert_config.map generation logic. Commit bf8bdff modified the logic that generates entries in cert_config.map in order to add "[alpn h2,http/1.1]" stanzas, with the condition that the stanza was only added if the backend the corresponded to an entry had a certificate and specified edge or reencrypt termination. However, the generation logic already only adds entries for backends that have certificates and specify either edge or reencrypt termination, so the additional condition is superfluous. * pkg/router/template/template_helper.go (generateHAProxyCertConfigMap): Replace use of SSLBindConfig with a string literal. * pkg/router/template/util/haproxy/map_entry.go (generateCertConfigMapEntry): * pkg/router/template/util/haproxy/map_entry_test.go (TestGenerateCertConfigMapEntry): Delete initialization of SSLBindConfig. * pkg/router/template/util/haproxy/types.go (HAProxyMapEntry): Delete SSLBindConfig.
openshift-ci-robot
added
the
approved
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: frobware, Miciah 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 |
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.
Delete superfluous conditions in the
cert_config.mapgeneration logic.#125 modified the logic that generates entries in
cert_config.mapin order to add[alpn h2,http/1.1]stanzas, with the condition that the stanza was only added if the backend the corresponded to an entry had a certificate and specified edge or reencrypt termination. However, the generation logic already only adds entries for backends that have certificates and specify either edge or reencrypt termination, so the additional condition is superfluous.pkg/router/template/template_helper.go(generateHAProxyCertConfigMap): Replace use ofSSLBindConfigwith a string literal.pkg/router/template/util/haproxy/map_entry.go(generateCertConfigMapEntry):pkg/router/template/util/haproxy/map_entry_test.go(TestGenerateCertConfigMapEntry): Delete initialization ofSSLBindConfig.pkg/router/template/util/haproxy/types.go(HAProxyMapEntry): DeleteSSLBindConfig.@frobware, this PR reverts some of the changes you made in #125. If you look at
generateCertConfigMapEntryin its entirety, you can see that the logic is redundant. Sorry I missed this during review!