Skip to content

Add cortex proxy to config reader #2174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 17, 2021
Merged

Add cortex proxy to config reader #2174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/images.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ api_images=(
dev_images=(
"downloader"
"manager"
"request-monitor"
"proxy"
"async-gateway"
"enqueuer"
)
Expand Down
2 changes: 1 addition & 1 deletion docs/clusters/management/create.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ image_operator: quay.io/cortexlabs/operator:master
image_controller_manager: quay.io/cortexlabs/controller-manager:master
image_manager: quay.io/cortexlabs/manager:master
image_downloader: quay.io/cortexlabs/downloader:master
image_request_monitor: quay.io/cortexlabs/request-monitor:master
image_proxy: quay.io/cortexlabs/proxy:master
image_async_gateway: quay.io/cortexlabs/async-gateway:master
image_cluster_autoscaler: quay.io/cortexlabs/cluster-autoscaler:master
image_metrics_server: quay.io/cortexlabs/metrics-server:master
Expand Down
10 changes: 5 additions & 5 deletions pkg/types/clusterconfig/cluster_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ type CoreConfig struct {
ImageManager string `json:"image_manager" yaml:"image_manager"`
ImageDownloader string `json:"image_downloader" yaml:"image_downloader"`
ImageKubexit string `json:"image_kubexit" yaml:"image_kubexit"`
ImageRequestMonitor string `json:"image_request_monitor" yaml:"image_request_monitor"`
ImageProxy string `json:"image_proxy" yaml:"image_proxy"`
ImageAsyncGateway string `json:"image_async_gateway" yaml:"image_async_gateway"`
ImageEnqueuer string `json:"image_enqueuer" yaml:"image_enqueuer"`
ImageClusterAutoscaler string `json:"image_cluster_autoscaler" yaml:"image_cluster_autoscaler"`
Expand Down Expand Up @@ -354,9 +354,9 @@ var CoreConfigStructFieldValidations = []*cr.StructFieldValidation{
},
},
{
StructField: "ImageRequestMonitor",
StructField: "ImageProxy",
StringValidation: &cr.StringValidation{
Default: consts.DefaultRegistry() + "/request-monitor:" + consts.CortexVersion,
Default: consts.DefaultRegistry() + "/proxy:" + consts.CortexVersion,
Validator: validateImageVersion,
},
},
Expand Down Expand Up @@ -1363,8 +1363,8 @@ func (cc *CoreConfig) TelemetryEvent() map[string]interface{} {
if !strings.HasPrefix(cc.ImageKubexit, "cortexlabs/") {
event["image_kubexit._is_custom"] = true
}
if !strings.HasPrefix(cc.ImageRequestMonitor, "cortexlabs/") {
event["image_request_monitor._is_custom"] = true
if !strings.HasPrefix(cc.ImageProxy, "cortexlabs/") {
event["image_proxy._is_custom"] = true
}
if !strings.HasPrefix(cc.ImageAsyncGateway, "cortexlabs/") {
event["image_async_gateway._is_custom"] = true
Expand Down