Merge pull request #7701 from barbacbd/OCPBUGS-23022

OCPBUGS-23022: Installer should not complain when API and API-INT are resolved.

Author: openshift-merge-bot[bot]

data/data/bootstrap/files/usr/local/bin/bootkube.sh.template

@@ -459,13 +459,22 @@ then
     record_service_stage_success
 fi
 
-# Check if the API and API_INT Server URLs can be resolved.
-echo "Check if API and API-Int URLs are resolvable during bootstrap"
 API_SERVER_URL="{{.APIServerURL}}"
-API_INT_SERVER_URL="{{.APIIntServerURL}}" 
+API_INT_SERVER_URL="{{.APIIntServerURL}}"
+if [ ! -f api-dns-resolved.done ]; then
+  echo "Check if API URL is resolvable during bootstrap"
 
-resolve_url "API_URL" "${API_SERVER_URL}"
-resolve_url "API_INT_URL" "${API_INT_SERVER_URL}"
+  if resolve_url "API_URL" "${API_SERVER_URL}"; then
+    touch api-dns-resolved.done
+  fi
+fi
+
+if [ ! -f api-int-dns-resolved.done ]; then
+  echo "Check if API-Int URL is resolvable during bootstrap"
+  if resolve_url "API_INT_URL" "${API_INT_SERVER_URL}"; then
+    touch api-int-dns-resolved.done
+  fi
+fi
 
 if [ ! -f cco-bootstrap.done ]
 then
@@ -578,11 +587,20 @@ else
     fi
 fi
 
-# Check if the API and API_INT Server URLs can be reached.
-echo "Check if API and API-Int URLs are reachable during bootstrap"
+if [ ! -f api-dns-check.done ]; then
+  echo "Check if API URL is reachable during bootstrap"
 
-check_url "API_URL" "${API_SERVER_URL}"
-check_url "API_INT_URL" "${API_INT_SERVER_URL}"
+  if check_url "API_URL" "${API_SERVER_URL}"; then
+    touch api-dns-check.done
+  fi
+fi
+
+if [ ! -f api-int-dns-check.done ]; then
+  echo "Check if API-Int URL is reachable during bootstrap"
+  if check_url "API_INT_URL" "${API_INT_SERVER_URL}"; then
+    touch api-int-dns-check.done
+  fi
+fi
 
 # Workaround for https://github.com/opencontainers/runc/pull/1807
 touch /opt/openshift/.bootkube.done

data/data/bootstrap/files/usr/local/bin/bootstrap-verify-api-server-urls.sh

@@ -35,15 +35,15 @@ function validate_url() {
 function resolve_url() {
     if [[ -z "${1}" ]] || [[ -z "${2}" ]]; then
         echo "Usage: resolve_url <API_URL or API_INT URL> <URL that needs to be verified>"
-        return
+        return 1
     fi
 
     local URL_TYPE=${1}
     local SERVER_URL=${2}
 
     if [[ ${URL_TYPE} != API_URL ]] && [[ ${URL_TYPE} != API_INT_URL ]]; then
         echo "Usage: resolve_url <API_URL or API_INT URL> <URL that needs to be verified>"
-        return
+        return 1
     fi
 
     echo "Checking if ${SERVER_URL} of type ${URL_TYPE} is resolvable"
@@ -58,26 +58,27 @@ function resolve_url() {
     record_service_stage_start ${URL_STAGE_NAME}
     if lookup_url "$URL_TYPE" "$SERVER_URL"; then
         record_service_stage_success
+        return 0
     else
         record_service_stage_failure
         # We do not want to stop bootkube service due to this failure.
         # So not returning failure at this point.
-        return
+        return 1
     fi
 }
 
 function check_url() {
     if [[ -z "${1}" ]] || [[ -z "${2}" ]]; then
         echo "Usage: check_url <API_URL or API_INT URL> <URL that needs to be verified>"
-        return
+        return 1
     fi
 
     local URL_TYPE=${1}
     local SERVER_URL=${2}
 
     if [[ ${URL_TYPE} != API_URL ]] && [[ ${URL_TYPE} != API_INT_URL ]]; then
         echo "Usage: check_url <API_URL or API_INT URL> <URL that needs to be verified>"
-        return
+        return 1
     fi
 
     echo "Checking if ${SERVER_URL} of type ${URL_TYPE} reachable"
@@ -93,11 +94,13 @@ function check_url() {
     record_service_stage_start ${URL_STAGE_NAME}
     if validate_url "$URL_TYPE" "$CURL_URL"; then
         record_service_stage_success
+        # Return the value from the validate_url- even on success
+        return 0
     else
         echo "Unable to validate. ${CURL_URL} is currently unreachable."
         record_service_stage_failure
         # We do not want to stop bootkube service due to this failure.
         # So not returning failure at this point.
-	return
+        return 1
     fi
 }

pkg/gather/service/analyze.go

@@ -77,7 +77,7 @@ func analyzeGatherBundle(bundleFile io.Reader) error {
 		optional bool
 	}{
 		{name: "release-image", check: checkReleaseImageDownload, optional: false},
-		{name: "bootkube", check: checkAPIURLs, optional: false},
+		{name: "bootkube", check: checkBootkubeService, optional: false},
 	}
 	for _, check := range analysisChecks {
 		a := serviceAnalyses[check.name]
@@ -112,13 +112,12 @@ func checkReleaseImageDownload(a analysis) bool {
 // failure to resolve either the API URL or API-Int URL or both. If that changes and if
 // any other stage in the bootkube service starts reporting a failure, we need to revisit
 // this. At that point verification of the URLs could be moved to its own service.
-func checkAPIURLs(a analysis) bool {
+func checkBootkubeService(a analysis) bool {
 	if a.successful {
 		return true
 	}
 	// Note: Even when there is a stage failure, we are not returning false here. That is
 	// intentional because we donot want to report this as an error in the "analyze" output.
-	logrus.Warn("The bootstrap machine is unable to resolve API and/or API-Int Server URLs")
 	a.logLastError()
 	return true
 }

pkg/gather/service/analyze_test.go

@@ -39,7 +39,6 @@ func failedReleaseImage() []logrus.Entry {
 
 func failedURLChecks() []logrus.Entry {
 	return []logrus.Entry{
-		{Level: logrus.WarnLevel, Message: "The bootstrap machine is unable to resolve API and/or API-Int Server URLs"},
 		{Level: logrus.InfoLevel, Message: "Line 1"},
 		{Level: logrus.InfoLevel, Message: "Line 2"},
 		{Level: logrus.InfoLevel, Message: "Line 3"},