Only print API Gateway url in cluster info if enabled (#1290)

Author: deliahu

cli/cmd/cluster.go

@@ -160,7 +160,7 @@ var _upCmd = &cobra.Command{
 			}
 		}
 
-		out, exitCode, err := runManagerUpdateCommand("/root/install.sh", clusterConfig, awsCreds, _flagClusterEnv)
+		out, exitCode, err := runManagerWithClusterConfig("/root/install.sh", clusterConfig, awsCreds, _flagClusterEnv)
 		if err != nil {
 			if clusterConfig.APIGatewaySetting == clusterconfig.EnabledAPIGatewaySetting {
 				awsClient.DeleteAPIGatewayByTag(clusterconfig.ClusterNameTag, clusterConfig.ClusterName) // best effort deletion
@@ -234,7 +234,7 @@ var _configureCmd = &cobra.Command{
 			exit.Error(err)
 		}
 
-		out, exitCode, err := runManagerUpdateCommand("/root/install.sh --update", clusterConfig, awsCreds, _flagClusterEnv)
+		out, exitCode, err := runManagerWithClusterConfig("/root/install.sh --update", clusterConfig, awsCreds, _flagClusterEnv)
 		if err != nil {
 			exit.Error(err)
 		}
@@ -438,7 +438,7 @@ func cmdInfo(awsCreds AWSCredentials, accessConfig *clusterconfig.AccessConfig,
 
 	clusterConfig := refreshCachedClusterConfig(awsCreds, accessConfig, disallowPrompt)
 
-	out, exitCode, err := runManagerAccessCommand("/root/info.sh", *accessConfig, awsCreds, _flagClusterEnv)
+	out, exitCode, err := runManagerWithClusterConfig("/root/info.sh", &clusterConfig, awsCreds, _flagClusterEnv)
 	if err != nil {
 		exit.Error(err)
 	}

cli/cmd/lib_manager.go

@@ -137,7 +137,7 @@ func runManager(containerConfig *container.Config, addNewLineAfterPull bool) (st
 	return output, &info.State.ExitCode, nil
 }
 
-func runManagerUpdateCommand(entrypoint string, clusterConfig *clusterconfig.Config, awsCreds AWSCredentials, envName string) (string, *int, error) {
+func runManagerWithClusterConfig(entrypoint string, clusterConfig *clusterconfig.Config, awsCreds AWSCredentials, envName string) (string, *int, error) {
 	clusterConfigBytes, err := yaml.Marshal(clusterConfig)
 	if err != nil {
 		return "", nil, errors.WithStack(err)

manager/info.sh

@@ -37,9 +37,13 @@ eksctl utils write-kubeconfig --cluster=$CORTEX_CLUSTER_NAME --region=$CORTEX_RE
 
 operator_endpoint=$(get_operator_endpoint)
 api_load_balancer_endpoint=$(get_api_load_balancer_endpoint)
-api_gateway_endpoint=$(get_api_gateway_endpoint)
+if [ "$CORTEX_API_GATEWAY" == "enabled" ]; then
+  api_gateway_endpoint=$(get_api_gateway_endpoint)
+fi
 
 echo -e "\033[1mendpoints:\033[0m"
 echo "operator:          $operator_endpoint"  # before modifying this, search for this prefix
 echo "api load balancer: $api_load_balancer_endpoint"
-echo "api gateway:       $api_gateway_endpoint"
+if [ "$CORTEX_API_GATEWAY" == "enabled" ]; then
+  echo "api gateway:       $api_gateway_endpoint"
+fi