Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to Prometheus RSocket Proxy 2.0.0-M2 #6070

Merged
merged 1 commit into from
Nov 14, 2024
Merged

Update to Prometheus RSocket Proxy 2.0.0-M2 #6070

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion spring-cloud-dataflow-build/spring-cloud-dataflow-build-dependencies/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/carvel/config/values/values.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,5 +112,5 @@ scdf:
enabled: false
image:
repository: micrometermetrics/prometheus-rsocket-proxy
tag: 2.0.0-M1
tag: 2.0.0-M2
digest: ""
3 changes: 1 addition & 2 deletions src/carvel/docs/configuration-options.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:::
Expand All @@ -618,4 +618,3 @@ No
Boolean
Default Value:::
False

2 changes: 1 addition & 1 deletion src/deploy/carvel/load-images.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/deploy/images/pull-prometheus-rsocket-proxy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 1 addition & 1 deletion src/deploy/k8s/deploy-scdf.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/docker-compose/docker-compose-prometheus.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion src/kubernetes/prometheus-proxy/prometheus-proxy-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/templates/docker-compose/docker-compose-prometheus.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion src/templates/kubernetes/prometheus-proxy/prometheus-proxy-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading