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 way we force es secret reconcile #1374

Merged
merged 2 commits into from
Jan 28, 2021
Merged

Fix way we force es secret reconcile #1374

merged 2 commits into from
Jan 28, 2021

Conversation

kevinearls
Copy link
Contributor

Signed-off-by: Kevin Earls [email protected]

@kevinearls
Copy link
Contributor Author

@jpkrohling Please review

@codecov
Copy link

codecov bot commented Jan 28, 2021

Codecov Report

Merging #1374 (74a0b68) into master (2994530) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #1374   +/-   ##
=======================================
  Coverage   86.22%   86.22%           
=======================================
  Files          90       90           
  Lines        5146     5146           
=======================================
  Hits         4437     4437           
  Misses        539      539           
  Partials      170      170           

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 2994530...74a0b68. Read the comment docs.

Copy link
Contributor

@jpkrohling jpkrohling left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, just a "why" before merging :-)

@@ -209,7 +209,9 @@ function generate_certs() {

# For TRACING-1631 - if we can't find the namespace in the cert it's bad, regenerate everything
if [ $REGENERATE_NEEDED = 0 ] && [ "${component}" == "elasticsearch" ] && [ -f ${WORKING_DIR}/logging-es.crt ] ; then
openssl x509 -in ${WORKING_DIR}/logging-es.crt -text | grep -q "DNS:elasticsearch.${NAMESPACE}.svc"
# Make sure the SAN contains both "DNS:elasticsearch.${NAMESPACE}.svc.cluster.local" AND "DNS:elasticsearch.${NAMESPACE}.svc.
# The latter may be followed by a comma or whitespace
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds strange. Any reasons why?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, let me fix that

Signed-off-by: Kevin Earls <[email protected]>
@mergify mergify bot merged commit 09c0ff9 into jaegertracing:master Jan 28, 2021
@kevinearls kevinearls deleted the force-cert-upgrade branch January 28, 2021 17:33
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.

2 participants