Merge pull request #19 from oscp/feature/internal-registry-fix

The registry service ip parameter is now optional.
oscp · Jul 3, 2019 · 954314c · 954314c
2 parents 7565ca2 + fe51763
commit 954314c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/daemon/client/checks/openshift.go b/daemon/client/checks/openshift.go
@@ -274,6 +274,10 @@ func CheckHttpHaProxy(publicUrl string, slow bool) error {
 }
 
 func CheckRegistryHealth(ip string) error {
+	if len(ip) == 0 {
+		return nil
+	}
+
 	log.Println("Checking registry health")
 
 	if err := checkHttp("http://" + ip + ":5000/healthz"); err != nil {

diff --git a/daemon/client/handlers/major.go b/daemon/client/handlers/major.go
@@ -47,8 +47,8 @@ func HandleMajorChecks(daemonType string, w http.ResponseWriter, r *http.Request
 		routerIps := os.Getenv("ROUTER_IPS")
 		certUrls := os.Getenv("CHECK_CERTIFICATE_URLS")
 
-		if len(etcdIps) == 0 || len(registryIp) == 0 || len(routerIps) == 0 || len(certUrls) == 0 {
-			log.Fatal("env variables 'ETCD_IPS', 'REGISTRY_SVC_IP', 'ROUTER_IPS', 'CHECK_CERTIFICATE_URLS' must be specified on type 'MASTER'")
+		if len(etcdIps) == 0 || len(routerIps) == 0 || len(certUrls) == 0 {
+			log.Fatal("env variables 'ETCD_IPS', 'ROUTER_IPS', 'CHECK_CERTIFICATE_URLS' must be specified on type 'MASTER'")
 		}
 
 		// boolean false means exclude buildnodes