Skip to content

Commit 8128456

Browse files
deliahudeliahu
committed
Show cortex configuration during installation
1 parent b0629be commit 8128456

File tree

2 files changed

+65
-53
lines changed

2 files changed

+65
-53
lines changed

‎cortex.sh‎

Lines changed: 65 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,8 @@ set -u
8484
### CONFIGURATION ###
8585
#####################
8686

87+
echo ""
88+
8789
export CORTEX_VERSION_STABLE=master
8890

8991
export CORTEX_CONFIG="${CORTEX_CONFIG:-""}"
@@ -100,6 +102,41 @@ export AWS_SECRET_ACCESS_KEY="${AWS_SECRET_ACCESS_KEY:-""}"
100102
export CORTEX_AWS_ACCESS_KEY_ID="${CORTEX_AWS_ACCESS_KEY_ID:-""}"
101103
export CORTEX_AWS_SECRET_ACCESS_KEY="${CORTEX_AWS_SECRET_ACCESS_KEY:-""}"
102104

105+
export CORTEX_LOG_GROUP="${CORTEX_LOG_GROUP:-cortex}"
106+
export CORTEX_BUCKET="${CORTEX_BUCKET:-""}"
107+
export CORTEX_REGION="${CORTEX_REGION:-us-west-2}"
108+
export CORTEX_ZONES="${CORTEX_ZONES:-""}"
109+
110+
export CORTEX_CLUSTER="${CORTEX_CLUSTER:-cortex}"
111+
export CORTEX_NODE_TYPE="${CORTEX_NODE_TYPE:-t3.large}"
112+
export CORTEX_NODES_MIN="${CORTEX_NODES_MIN:-2}"
113+
export CORTEX_NODES_MAX="${CORTEX_NODES_MAX:-5}"
114+
export CORTEX_NAMESPACE="${CORTEX_NAMESPACE:-cortex}"
115+
116+
export CORTEX_IMAGE_MANAGER="${CORTEX_IMAGE_MANAGER:-cortexlabs/manager:$CORTEX_VERSION_STABLE}"
117+
export CORTEX_IMAGE_FLUENTD="${CORTEX_IMAGE_FLUENTD:-cortexlabs/fluentd:$CORTEX_VERSION_STABLE}"
118+
export CORTEX_IMAGE_STATSD="${CORTEX_IMAGE_STATSD:-cortexlabs/statsd:$CORTEX_VERSION_STABLE}"
119+
export CORTEX_IMAGE_OPERATOR="${CORTEX_IMAGE_OPERATOR:-cortexlabs/operator:$CORTEX_VERSION_STABLE}"
120+
export CORTEX_IMAGE_TF_SERVE="${CORTEX_IMAGE_TF_SERVE:-cortexlabs/tf-serve:$CORTEX_VERSION_STABLE}"
121+
export CORTEX_IMAGE_TF_API="${CORTEX_IMAGE_TF_API:-cortexlabs/tf-api:$CORTEX_VERSION_STABLE}"
122+
export CORTEX_IMAGE_TF_SERVE_GPU="${CORTEX_IMAGE_TF_SERVE_GPU:-cortexlabs/tf-serve-gpu:$CORTEX_VERSION_STABLE}"
123+
export CORTEX_IMAGE_ONNX_SERVE="${CORTEX_IMAGE_ONNX_SERVE:-cortexlabs/onnx-serve:$CORTEX_VERSION_STABLE}"
124+
export CORTEX_IMAGE_ONNX_SERVE_GPU="${CORTEX_IMAGE_ONNX_SERVE_GPU:-cortexlabs/onnx-serve-gpu:$CORTEX_VERSION_STABLE}"
125+
export CORTEX_IMAGE_CLUSTER_AUTOSCALER="${CORTEX_IMAGE_CLUSTER_AUTOSCALER:-cortexlabs/cluster-autoscaler:$CORTEX_VERSION_STABLE}"
126+
export CORTEX_IMAGE_NVIDIA="${CORTEX_IMAGE_NVIDIA:-cortexlabs/nvidia:$CORTEX_VERSION_STABLE}"
127+
export CORTEX_IMAGE_METRICS_SERVER="${CORTEX_IMAGE_METRICS_SERVER:-cortexlabs/metrics-server:$CORTEX_VERSION_STABLE}"
128+
export CORTEX_IMAGE_ISTIO_CITADEL="${CORTEX_IMAGE_ISTIO_CITADEL:-cortexlabs/istio-citadel:$CORTEX_VERSION_STABLE}"
129+
export CORTEX_IMAGE_ISTIO_GALLEY="${CORTEX_IMAGE_ISTIO_GALLEY:-cortexlabs/istio-galley:$CORTEX_VERSION_STABLE}"
130+
export CORTEX_IMAGE_ISTIO_PILOT="${CORTEX_IMAGE_ISTIO_PILOT:-cortexlabs/istio-pilot:$CORTEX_VERSION_STABLE}"
131+
export CORTEX_IMAGE_ISTIO_PROXY="${CORTEX_IMAGE_ISTIO_PROXY:-cortexlabs/istio-proxy:$CORTEX_VERSION_STABLE}"
132+
export CORTEX_IMAGE_DOWNLOADER="${CORTEX_IMAGE_DOWNLOADER:-cortexlabs/downloader:$CORTEX_VERSION_STABLE}"
133+
134+
export CORTEX_ENABLE_TELEMETRY="${CORTEX_ENABLE_TELEMETRY:-""}"
135+
export CORTEX_TELEMETRY_URL="${CORTEX_TELEMETRY_URL:-"https://telemetry.cortexlabs.dev"}"
136+
137+
AWS_KEY_SOURCE_STR=""
138+
OPERATOR_AWS_KEY_SOURCE_STR=""
139+
103140
function set_aws_credentials_from_cli() {
104141
if ! command -v aws >/dev/null; then
105142
return
@@ -114,78 +151,57 @@ function set_aws_credentials_from_cli() {
114151
export AWS_ACCESS_KEY_ID=$(aws --profile default configure get aws_access_key_id)
115152
export AWS_SECRET_ACCESS_KEY=$(aws --profile default configure get aws_secret_access_key)
116153

117-
echo -e "\n✓ Using AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID (from AWS CLI's default profile)"
154+
AWS_KEY_SOURCE_STR=" (from AWS CLI's default profile)"
118155
}
119156

120157
function set_aws_credentials() {
121158
if [ "$AWS_ACCESS_KEY_ID" != "" ] && [ "$AWS_SECRET_ACCESS_KEY" != "" ]; then
122-
echo -e "\n✓ Using AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID (from environment variable)"
123-
return
124-
fi
125-
126-
if [ "$AWS_ACCESS_KEY_ID" == "" ] && [ "$AWS_SECRET_ACCESS_KEY" != "" ]; then
159+
AWS_KEY_SOURCE_STR=" (from environment variable)"
160+
elif [ "$AWS_ACCESS_KEY_ID" == "" ] && [ "$AWS_SECRET_ACCESS_KEY" != "" ]; then
127161
echo -e "\nPlease run \`export AWS_ACCESS_KEY_ID=***\`"
128162
exit 1
129-
fi
130-
131-
if [ "$AWS_ACCESS_KEY_ID" != "" ] && [ "$AWS_SECRET_ACCESS_KEY" == "" ]; then
163+
elif [ "$AWS_ACCESS_KEY_ID" != "" ] && [ "$AWS_SECRET_ACCESS_KEY" == "" ]; then
132164
echo -e "\nPlease run \`export AWS_SECRET_ACCESS_KEY=***\`"
133165
exit 1
166+
else
167+
set_aws_credentials_from_cli
134168
fi
135169

136-
set_aws_credentials_from_cli
137-
138170
if [ "$AWS_ACCESS_KEY_ID" == "" ] || [ "$AWS_SECRET_ACCESS_KEY" == "" ]; then
139171
echo -e "\nPlease run \`export AWS_ACCESS_KEY_ID=***; export AWS_SECRET_ACCESS_KEY=***\`"
140172
exit 1
141173
fi
142-
}
143-
144-
if [ "$arg2" != "cli" ]; then
145-
set_aws_credentials
146174

147175
if [ "$CORTEX_AWS_ACCESS_KEY_ID" != "" ] && [ "$CORTEX_AWS_SECRET_ACCESS_KEY" != "" ]; then
148-
echo "✓ Operator will use AWS_ACCESS_KEY_ID=$CORTEX_AWS_ACCESS_KEY_ID (from environment variable)"
176+
OPERATOR_AWS_KEY_SOURCE_STR=" (from environment variable)"
149177
elif [ "$CORTEX_AWS_ACCESS_KEY_ID" != "" ] || [ "$CORTEX_AWS_SECRET_ACCESS_KEY" != "" ]; then
150178
echo -e "\nPlease export both CORTEX_AWS_ACCESS_KEY_ID and CORTEX_AWS_SECRET_ACCESS_KEY"
151179
exit 1
152180
fi
153-
fi
154-
155-
export CORTEX_AWS_ACCESS_KEY_ID="${CORTEX_AWS_ACCESS_KEY_ID:-$AWS_ACCESS_KEY_ID}"
156-
export CORTEX_AWS_SECRET_ACCESS_KEY="${CORTEX_AWS_SECRET_ACCESS_KEY:-$AWS_SECRET_ACCESS_KEY}"
157-
158-
export CORTEX_LOG_GROUP="${CORTEX_LOG_GROUP:-cortex}"
159-
export CORTEX_BUCKET="${CORTEX_BUCKET:-""}"
160-
export CORTEX_REGION="${CORTEX_REGION:-us-west-2}"
161-
export CORTEX_ZONES="${CORTEX_ZONES:-""}"
162181

163-
export CORTEX_CLUSTER="${CORTEX_CLUSTER:-cortex}"
164-
export CORTEX_NODE_TYPE="${CORTEX_NODE_TYPE:-t3.large}"
165-
export CORTEX_NODES_MIN="${CORTEX_NODES_MIN:-2}"
166-
export CORTEX_NODES_MAX="${CORTEX_NODES_MAX:-5}"
167-
export CORTEX_NAMESPACE="${CORTEX_NAMESPACE:-cortex}"
182+
export CORTEX_AWS_ACCESS_KEY_ID="${CORTEX_AWS_ACCESS_KEY_ID:-$AWS_ACCESS_KEY_ID}"
183+
export CORTEX_AWS_SECRET_ACCESS_KEY="${CORTEX_AWS_SECRET_ACCESS_KEY:-$AWS_SECRET_ACCESS_KEY}"
184+
}
168185

169-
export CORTEX_IMAGE_MANAGER="${CORTEX_IMAGE_MANAGER:-cortexlabs/manager:$CORTEX_VERSION_STABLE}"
170-
export CORTEX_IMAGE_FLUENTD="${CORTEX_IMAGE_FLUENTD:-cortexlabs/fluentd:$CORTEX_VERSION_STABLE}"
171-
export CORTEX_IMAGE_STATSD="${CORTEX_IMAGE_STATSD:-cortexlabs/statsd:$CORTEX_VERSION_STABLE}"
172-
export CORTEX_IMAGE_OPERATOR="${CORTEX_IMAGE_OPERATOR:-cortexlabs/operator:$CORTEX_VERSION_STABLE}"
173-
export CORTEX_IMAGE_TF_SERVE="${CORTEX_IMAGE_TF_SERVE:-cortexlabs/tf-serve:$CORTEX_VERSION_STABLE}"
174-
export CORTEX_IMAGE_TF_API="${CORTEX_IMAGE_TF_API:-cortexlabs/tf-api:$CORTEX_VERSION_STABLE}"
175-
export CORTEX_IMAGE_TF_SERVE_GPU="${CORTEX_IMAGE_TF_SERVE_GPU:-cortexlabs/tf-serve-gpu:$CORTEX_VERSION_STABLE}"
176-
export CORTEX_IMAGE_ONNX_SERVE="${CORTEX_IMAGE_ONNX_SERVE:-cortexlabs/onnx-serve:$CORTEX_VERSION_STABLE}"
177-
export CORTEX_IMAGE_ONNX_SERVE_GPU="${CORTEX_IMAGE_ONNX_SERVE_GPU:-cortexlabs/onnx-serve-gpu:$CORTEX_VERSION_STABLE}"
178-
export CORTEX_IMAGE_CLUSTER_AUTOSCALER="${CORTEX_IMAGE_CLUSTER_AUTOSCALER:-cortexlabs/cluster-autoscaler:$CORTEX_VERSION_STABLE}"
179-
export CORTEX_IMAGE_NVIDIA="${CORTEX_IMAGE_NVIDIA:-cortexlabs/nvidia:$CORTEX_VERSION_STABLE}"
180-
export CORTEX_IMAGE_METRICS_SERVER="${CORTEX_IMAGE_METRICS_SERVER:-cortexlabs/metrics-server:$CORTEX_VERSION_STABLE}"
181-
export CORTEX_IMAGE_ISTIO_CITADEL="${CORTEX_IMAGE_ISTIO_CITADEL:-cortexlabs/istio-citadel:$CORTEX_VERSION_STABLE}"
182-
export CORTEX_IMAGE_ISTIO_GALLEY="${CORTEX_IMAGE_ISTIO_GALLEY:-cortexlabs/istio-galley:$CORTEX_VERSION_STABLE}"
183-
export CORTEX_IMAGE_ISTIO_PILOT="${CORTEX_IMAGE_ISTIO_PILOT:-cortexlabs/istio-pilot:$CORTEX_VERSION_STABLE}"
184-
export CORTEX_IMAGE_ISTIO_PROXY="${CORTEX_IMAGE_ISTIO_PROXY:-cortexlabs/istio-proxy:$CORTEX_VERSION_STABLE}"
185-
export CORTEX_IMAGE_DOWNLOADER="${CORTEX_IMAGE_DOWNLOADER:-cortexlabs/downloader:$CORTEX_VERSION_STABLE}"
186+
if [ "$arg2" != "cli" ]; then
187+
set_aws_credentials
188+
fi
186189

187-
export CORTEX_ENABLE_TELEMETRY="${CORTEX_ENABLE_TELEMETRY:-""}"
188-
export CORTEX_TELEMETRY_URL="${CORTEX_TELEMETRY_URL:-"https://telemetry.cortexlabs.dev"}"
190+
if [ "$arg1" = "install" ] && [ "$arg2" = "" ] && [ "$arg3" = "" ]; then
191+
echo "Configuration"
192+
echo " ￮ cluster name: $CORTEX_CLUSTER"
193+
echo " ￮ region: $CORTEX_REGION"
194+
echo " ￮ instance type: $CORTEX_NODE_TYPE"
195+
echo " ￮ min nodes: $CORTEX_NODES_MIN"
196+
echo " ￮ max nodes: $CORTEX_NODES_MAX"
197+
echo " ￮ bucket: $CORTEX_BUCKET"
198+
echo " ￮ log group: $CORTEX_LOG_GROUP"
199+
echo " ￮ AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID}${AWS_KEY_SOURCE_STR}"
200+
201+
if [ "$CORTEX_AWS_ACCESS_KEY_ID" != "$AWS_ACCESS_KEY_ID" ]; then
202+
echo " ￮ Operator AWS_ACCESS_KEY_ID: ${CORTEX_AWS_ACCESS_KEY_ID}${OPERATOR_AWS_KEY_SOURCE_STR}"
203+
fi
204+
fi
189205

190206
##########################
191207
### TOP-LEVEL COMMANDS ###

‎manager/install_cortex.sh‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,13 @@ function setup_bucket() {
3939
echo "error: a bucket named \"${CORTEX_BUCKET}\" already exists, but you do not have access to it"
4040
exit 1
4141
fi
42-
else
43-
echo "✓ Using existing S3 bucket: $CORTEX_BUCKET"
4442
fi
4543
}
4644

4745
function setup_cloudwatch_logs() {
4846
if ! aws logs list-tags-log-group --log-group-name $CORTEX_LOG_GROUP --region $CORTEX_REGION --output json 2>&1 | grep -q "\"tags\":"; then
4947
aws logs create-log-group --log-group-name $CORTEX_LOG_GROUP --region $CORTEX_REGION
5048
echo "✓ Created CloudWatch log group: $CORTEX_LOG_GROUP"
51-
else
52-
echo "✓ Using existing CloudWatch log group: $CORTEX_LOG_GROUP"
5349
fi
5450
}
5551

0 commit comments

Comments
 (0)