From 2f05ded8878fc9da3c3869ebc0f3855ffd3c439a Mon Sep 17 00:00:00 2001
From: Chris Bono <chris.bono@gmail.com>
Date: Tue, 27 Feb 2024 16:10:03 -0600
Subject: [PATCH] Update prometheus-rsocket-proxy to 1.6.0-SNAPSHOT
This commit updates the Prometheus RSocket proxy to 1.6.x which in turn is
updated to Spring Boot 3.2.x.
---
.../spring-cloud-dataflow-build-dependencies/pom.xml | 2 +-
src/carvel/config/values/values.yml | 2 +-
src/deploy/carvel/load-images.sh | 2 +-
src/deploy/images/pull-prometheus-rsocket-proxy.sh | 2 +-
src/deploy/k8s/deploy-scdf.sh | 2 +-
src/docker-compose/docker-compose-prometheus.yml | 2 +-
.../prometheus-proxy/prometheus-proxy-deployment.yaml | 2 +-
src/templates/docker-compose/docker-compose-prometheus.yml | 2 +-
.../prometheus-proxy/prometheus-proxy-deployment.yaml | 2 +-
9 files changed, 9 insertions(+), 9 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
index 8e670cade6..409b66cb05 100644
--- a/spring-cloud-dataflow-build/spring-cloud-dataflow-build-dependencies/pom.xml
+++ b/spring-cloud-dataflow-build/spring-cloud-dataflow-build-dependencies/pom.xml
@@ -29,7 +29,7 @@
<nimbus-jose-jwt.version>9.37</nimbus-jose-jwt.version>
<snappy-java.version>1.1.10.5</snappy-java.version>
<commons-compress.version>1.24.0</commons-compress.version>
- <prometheus-rsocket.version>1.5.2</prometheus-rsocket.version>
+ <prometheus-rsocket.version>1.6.0-SNAPSHOT</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
index 1118534c6b..97752c8970 100644
--- a/src/carvel/config/values/values.yml
+++ b/src/carvel/config/values/values.yml
@@ -108,5 +108,5 @@ scdf:
enabled: false
image:
repository: micrometermetrics/prometheus-rsocket-proxy
- tag: 1.5.2
+ tag: 1.6.0-SNAPSHOT
digest: ""
diff --git a/src/deploy/carvel/load-images.sh b/src/deploy/carvel/load-images.sh
index 2337b49a91..78a4990a4e 100755
--- 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" "1.5.2" false
+ sh "$K8S/load-image.sh" "micrometermetrics/prometheus-rsocket-proxy" "1.6.0-SNAPSHOT" 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
index 18e8ee75f2..6abc6df781 100755
--- 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:1.5.2"
+docker pull "micrometermetrics/prometheus-rsocket-proxy:1.6.0-SNAPSHOT"
diff --git a/src/deploy/k8s/deploy-scdf.sh b/src/deploy/k8s/deploy-scdf.sh
index 02d068fdc9..32f7905765 100755
--- 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:1.5.2"
+ sh "$SCDIR/load-image.sh" "micrometermetrics/prometheus-rsocket-proxy:1.6.0-SNAPSHOT"
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
index ce148b74d9..6814b6e80c 100644
--- a/src/docker-compose/docker-compose-prometheus.yml
+++ b/src/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:1.5.2
+ image: micrometermetrics/prometheus-rsocket-proxy:1.6.0-SNAPSHOT
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
index 3494e71009..6a1ab72d19 100644
--- 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:1.5.2
+ image: micrometermetrics/prometheus-rsocket-proxy:1.6.0-SNAPSHOT
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
index 47f91c1559..55332b3fac 100644
--- 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:1.5.2
+ image: micrometermetrics/prometheus-rsocket-proxy:1.6.0-SNAPSHOT
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
index 034af0ca0b..d996782253 100644
--- 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:1.5.2
+ image: micrometermetrics/prometheus-rsocket-proxy:1.6.0-SNAPSHOT
imagePullPolicy: IfNotPresent
ports:
- name: scrape