Merge pull request #459 from jetstack/fix-venafi-config

Allow server to be configured even with `--venafi-cloud` present

Author: tfadeyi

pkg/agent/config.go

@@ -177,7 +177,7 @@ func ParseConfig(data []byte, isVenafiCloudMode bool) (Config, error) {
 
 	if config.Server == "" && config.Endpoint.Host == "" && config.Endpoint.Path == "" {
 		config.Server = "https://preflight.jetstack.io"
-		if config.VenafiCloud != nil {
+		if config.VenafiCloud != nil || isVenafiCloudMode {
 			config.Server = client.VenafiCloudProdURL
 		}
 	}

pkg/agent/run.go

@@ -203,11 +203,6 @@ func getConfiguration() (Config, client.Client) {
 		log.Fatalf("Failed to parse config file: %s", err)
 	}
 
-	if VenafiCloudMode {
-		// if the venafi-cloud mode is enabled override config.Server
-		config.Server = client.VenafiCloudProdURL
-	}
-
 	baseURL := config.Server
 	if baseURL == "" {
 		log.Printf("Using deprecated Endpoint configuration. User Server instead.")