Merge branch 'master' into manikowski-k8s-harbor-03102024

GoogleCloudPlatform · Oct 3, 2024 · ecbf3ab · ecbf3ab
2 parents 8e7bbf2 + ff6ce6c
commit ecbf3ab
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/k8s/consul/Makefile b/k8s/consul/Makefile
@@ -6,15 +6,15 @@ include ../images.Makefile
 CHART_NAME := consul
 APP_ID ?= $(CHART_NAME)
 
-TRACK ?= 1.15
+TRACK ?= 1.19
 
 CONSUL_EXPORTER_TAG ?= exporter
-METRICS_EXPORTER_TAG ?= v0.5.1
+METRICS_EXPORTER_TAG ?= v0.11.1-gke.1
 
 SOURCE_REGISTRY ?= marketplace.gcr.io/google
 IMAGE_CONSUL ?= $(SOURCE_REGISTRY)/consul1:$(TRACK)
 IMAGE_CONSUL_EXPORTER ?= $(SOURCE_REGISTRY)/consul1:$(CONSUL_EXPORTER_TAG)
-IMAGE_PROMETHEUS_TO_SD ?= k8s.gcr.io/prometheus-to-sd:$(METRICS_EXPORTER_TAG)
+IMAGE_PROMETHEUS_TO_SD ?= gke.gcr.io/prometheus-to-sd:$(METRICS_EXPORTER_TAG)
 
 
 # Main image