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 6e8321d494..8ce15ded5c 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 @@ -32,7 +32,7 @@ 1.26.2 9.39.3 - 2.0.0-M1 + 2.0.0-M2 2.3.0 3.5.4 5.12.4 diff --git a/src/carvel/config/values/values.yml b/src/carvel/config/values/values.yml index 093a582d4a..e5cfcb8487 100644 --- 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 index 52deb3a26f..4b84059e6f 100644 --- 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 index cbf3fdc274..30cbfdd723 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" "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 index 1b6dcf4500..65dac2970a 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: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 index 34ae03f67d..c587aee20f 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: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 index baefed1f23..67f7ff4430 100644 --- 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 index 3ef37ac06a..5420441724 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: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 index 3a16933508..ad09cce384 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: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 index 99be636fd0..5bdfe0bb8d 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:2.0.0-M1 + image: micrometermetrics/prometheus-rsocket-proxy:2.0.0-M2 imagePullPolicy: IfNotPresent ports: - name: scrape