Update to Prometheus Rsocket Proxy 2.0.0-M2 (#6070)

This commit updates the Prometheus Rsocket Proxy dependency and Docker images used in the installers to 2.0.0-M2. See #6069 Signed-off-by: Chris Bono <[email protected]>
spring-cloud · Nov 14, 2024 · 464868b · 464868b
1 parent 07166df
commit 464868b
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 11 deletions.
diff --git a/spring-cloud-dataflow-build/spring-cloud-dataflow-build-dependencies/pom.xml b/spring-cloud-dataflow-build/spring-cloud-dataflow-build-dependencies/pom.xml
@@ -32,7 +32,7 @@
 		<commons-compress.version>1.26.2</commons-compress.version>
 		<!-- Specific version overrides to deal w/ CVEs -->
 		<nimbus-jose-jwt.version>9.39.3</nimbus-jose-jwt.version>
-		<prometheus-rsocket.version>2.0.0-M1</prometheus-rsocket.version>
+		<prometheus-rsocket.version>2.0.0-M2</prometheus-rsocket.version>
 		<java-cfenv.version>2.3.0</java-cfenv.version>
 		<spring-cloud-services-starter-config-client.version>3.5.4</spring-cloud-services-starter-config-client.version>
 		<kubernetes-fabric8-client.version>5.12.4</kubernetes-fabric8-client.version>

diff --git a/src/carvel/config/values/values.yml b/src/carvel/config/values/values.yml
@@ -112,5 +112,5 @@ scdf:
         enabled: false
         image:
           repository: micrometermetrics/prometheus-rsocket-proxy
-          tag: 2.0.0-M1
+          tag: 2.0.0-M2
           digest: ""
diff --git a/src/carvel/docs/configuration-options.adoc b/src/carvel/docs/configuration-options.adoc
@@ -597,7 +597,7 @@ No
   Type:::
 String
    Default Value:::
-1.0.0
+2.0.0-M2
 
 [[configuration-options-scdf.feature.monitoring.prometheusRsocketProxy.image.digest]]`scdf.feature.monitoring.prometheusRsocketProxy.image.digest`::
   Description:::
@@ -618,4 +618,3 @@ No
 Boolean
    Default Value:::
 False
-
diff --git a/src/deploy/carvel/load-images.sh b/src/deploy/carvel/load-images.sh
@@ -67,7 +67,7 @@ else
     sh "$K8S/load-image.sh" "springcloud/spring-cloud-dataflow-server" "$DATAFLOW_VERSION" true
 fi
 if [ "$PROMETHEUS" = "true" ]; then
-    sh "$K8S/load-image.sh" "micrometermetrics/prometheus-rsocket-proxy" "2.0.0-M1" false
+    sh "$K8S/load-image.sh" "micrometermetrics/prometheus-rsocket-proxy" "2.0.0-M2" false
 fi
 if [ "$REGISTRY" = "" ]; then
     REGISTRY=springcloud

diff --git a/src/deploy/images/pull-prometheus-rsocket-proxy.sh b/src/deploy/images/pull-prometheus-rsocket-proxy.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-docker pull "micrometermetrics/prometheus-rsocket-proxy:2.0.0-M1"
+docker pull "micrometermetrics/prometheus-rsocket-proxy:2.0.0-M2"
diff --git a/src/deploy/k8s/deploy-scdf.sh b/src/deploy/k8s/deploy-scdf.sh
@@ -171,7 +171,7 @@ if [ "$PROMETHEUS" = "true" ] || [ "$METRICS" = "prometheus" ]; then
     if [ "$K8S_DRIVER" != "tmc" ] && [ "$K8S_DRIVER" != "gke" ]; then
         sh "$SCDIR/load-image.sh" "springcloud/spring-cloud-dataflow-grafana-prometheus:$DATAFLOW_VERSION" false
         sh "$SCDIR/load-image.sh" "prom/prometheus:v2.37.8"
-        sh "$SCDIR/load-image.sh" "micrometermetrics/prometheus-rsocket-proxy:2.0.0-M1"
+        sh "$SCDIR/load-image.sh" "micrometermetrics/prometheus-rsocket-proxy:2.0.0-M2"
     fi
     set +e
     kubectl create --namespace "$NS" serviceaccount prometheus-rsocket-proxy

diff --git a/src/docker-compose/docker-compose-prometheus.yml b/src/docker-compose/docker-compose-prometheus.yml
@@ -20,7 +20,7 @@ services:
       #- SPRING_APPLICATION_JSON={"spring.jpa.properties.hibernate.generate_statistics":true}
 
   prometheus-rsocket-proxy:
-    image: micrometermetrics/prometheus-rsocket-proxy:2.0.0-M1
+    image: micrometermetrics/prometheus-rsocket-proxy:2.0.0-M2
     container_name: prometheus-rsocket-proxy
     expose:
       - '9096'

diff --git a/src/kubernetes/prometheus-proxy/prometheus-proxy-deployment.yaml b/src/kubernetes/prometheus-proxy/prometheus-proxy-deployment.yaml
@@ -17,7 +17,7 @@ spec:
       serviceAccountName: prometheus-rsocket-proxy
       containers:
         - name: prometheus-rsocket-proxy
-          image: micrometermetrics/prometheus-rsocket-proxy:2.0.0-M1
+          image: micrometermetrics/prometheus-rsocket-proxy:2.0.0-M2
           imagePullPolicy: IfNotPresent
           ports:
             - name: scrape

diff --git a/src/templates/docker-compose/docker-compose-prometheus.yml b/src/templates/docker-compose/docker-compose-prometheus.yml
@@ -22,7 +22,7 @@ services:
       #- SPRING_APPLICATION_JSON={"spring.jpa.properties.hibernate.generate_statistics":true}
 
   prometheus-rsocket-proxy:
-    image: micrometermetrics/prometheus-rsocket-proxy:2.0.0-M1
+    image: micrometermetrics/prometheus-rsocket-proxy:2.0.0-M2
     container_name: prometheus-rsocket-proxy
     expose:
       - '9096'

diff --git a/src/templates/kubernetes/prometheus-proxy/prometheus-proxy-deployment.yaml b/src/templates/kubernetes/prometheus-proxy/prometheus-proxy-deployment.yaml
@@ -17,7 +17,7 @@ spec:
       serviceAccountName: prometheus-rsocket-proxy
       containers:
         - name: prometheus-rsocket-proxy
-          image: micrometermetrics/prometheus-rsocket-proxy:2.0.0-M1
+          image: micrometermetrics/prometheus-rsocket-proxy:2.0.0-M2
           imagePullPolicy: IfNotPresent
           ports:
             - name: scrape