Fix way we force es secret reconcile (jaegertracing#1374)

Signed-off-by: Kevin Earls <kearls@redhat.com>
elkh510 · Jan 28, 2021 · 09c0ff9 · 09c0ff9
1 parent 2994530
commit 09c0ff9
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/scripts/cert_generation.sh b/scripts/cert_generation.sh
@@ -209,7 +209,8 @@ 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.
+    openssl x509 -in ${WORKING_DIR}/logging-es.crt -text | grep "DNS:elasticsearch.${NAMESPACE}.svc.cluster.local" | grep -E -q "DNS:elasticsearch.${NAMESPACE}.svc,"
     REGENERATE_NEEDED=$?
   fi