Merge pull request #719 from Comcast/external-URL-fix

Fixes variable assignment to allow use of custom external reporting U…
kuberhealthy · Nov 5, 2020 · 1050686 · 1050686
2 parents 53208d2 + 333af2a
commit 1050686
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/cmd/kuberhealthy/main.go b/cmd/kuberhealthy/main.go
@@ -102,11 +102,17 @@ func init() {
 		log.Println("WARNING: Failed to read configuration file from disk:", err)
 	}
 
-	// set env variables into config if specified
+	// set env variables into config if specified. otherwise set external check URL to default
 	externalCheckURL, err := getEnvVar(KHExternalReportingURL)
 	if err != nil {
-		cfg.ExternalCheckReportingURL = externalCheckURL
+		if len(podNamespace) == 0 {
+			log.Fatalln("KH_EXTERNAL_REPORTING_URL environment variable not set and POD_NAMESPACE environment variable was blank.  Could not determine Kuberhealthy callback URL.")
+		}
+		log.Infoln("KH_EXTERNAL_REPORTING_URL environment variable not set, using default value")
+		externalCheckURL = "http://kuberhealthy." + podNamespace + ".svc.cluster.local/externalCheckStatus"
 	}
+	cfg.ExternalCheckReportingURL = externalCheckURL
+	log.Infoln("External check reporting URL set to:", cfg.ExternalCheckReportingURL)
 
 	// parse and set logging level
 	parsedLogLevel, err := log.ParseLevel(cfg.LogLevel)
@@ -125,15 +131,6 @@ func init() {
 		log.SetLevel(log.DebugLevel)
 	}
 
-	// parse external check URL configuration
-	if len(cfg.ExternalCheckReportingURL) == 0 {
-		if len(podNamespace) == 0 {
-			log.Fatalln("KH_EXTERNAL_REPORTING_URL environment variable not set and POD_NAMESPACE environment variable was blank.  Could not determine Kuberhealthy callback URL.")
-		}
-		cfg.ExternalCheckReportingURL = "http://kuberhealthy." + podNamespace + ".svc.cluster.local/externalCheckStatus"
-	}
-	log.Infoln("External check reporting URL set to:", cfg.ExternalCheckReportingURL)
-
 	// Handle force master mode
 	if cfg.EnableForceMaster == true {
 		log.Infoln("Enabling forced master mode")

diff --git a/deploy/helm/kuberhealthy/values.yaml b/deploy/helm/kuberhealthy/values.yaml
@@ -11,7 +11,7 @@ prometheus:
 
 image:
   repository: kuberhealthy/kuberhealthy
-  tag: v2.3.0
+  tag: v2.3.1
 
 resources:
   requests: