From 271ce76c18d7faeac6bcc53d2312a14ffd5e43aa Mon Sep 17 00:00:00 2001 From: Miguel Varela Ramos Date: Mon, 17 May 2021 17:28:36 +0100 Subject: [PATCH] Replace request-monitor with cortex proxy --- build/images.sh | 2 +- docs/clusters/management/create.md | 2 +- pkg/types/clusterconfig/cluster_config.go | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build/images.sh b/build/images.sh index 6e6e069f2d..96a7d75088 100644 --- a/build/images.sh +++ b/build/images.sh @@ -29,7 +29,7 @@ api_images=( dev_images=( "downloader" "manager" - "request-monitor" + "proxy" "async-gateway" "enqueuer" ) diff --git a/docs/clusters/management/create.md b/docs/clusters/management/create.md index 53a3bd6a18..5a79091710 100644 --- a/docs/clusters/management/create.md +++ b/docs/clusters/management/create.md @@ -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 diff --git a/pkg/types/clusterconfig/cluster_config.go b/pkg/types/clusterconfig/cluster_config.go index 0bac1e602d..ce36dd5eef 100644 --- a/pkg/types/clusterconfig/cluster_config.go +++ b/pkg/types/clusterconfig/cluster_config.go @@ -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"` @@ -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, }, }, @@ -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