Revert Prometheus RSocket Proxy to 2.0.0-M2

Corneil du Plessis · Corneil du Plessis · commit 7e0244c2f331 · 2024-12-10T17:30:01.000+02:00
diff --git a/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/config/DataflowOAuthSecurityConfiguration.java b/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/config/DataflowOAuthSecurityConfiguration.java
@@ -164,6 +164,7 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
 			auth.userInfoEndpoint(customizer -> {
 				customizer.userService(plainOauth2UserService).oidcUserService(oidcUserService);
 			});
+			auth.defaultSuccessUrl(authorizationProperties.getDashboardUrl());
 		});
 
 		http.oauth2ResourceServer(resourceserver -> {
diff --git a/spring-cloud-dataflow-server/src/test/java/org/springframework/cloud/dataflow/unit/test/DataFlowAuthenticationTests.java b/spring-cloud-dataflow-server/src/test/java/org/springframework/cloud/dataflow/unit/test/DataFlowAuthenticationTests.java
diff --git a/spring-cloud-dataflow-server/src/test/resources/application-keycloak-client.yaml b/spring-cloud-dataflow-server/src/test/resources/application-keycloak-client.yaml
@@ -40,7 +40,6 @@ spring:
             client-secret: '090RucamvekrMLyGHMr4lkHX9xhAlsqK'
             provider: 'keycloak'
             authorization-grant-type: 'authorization_code'
-#            client-authentication-method: # unsure of value
             scope:
               - openid
               - roles
diff --git a/spring-cloud-dataflow-server/src/test/resources/application-keycloak.yaml b/spring-cloud-dataflow-server/src/test/resources/application-keycloak.yaml
@@ -43,7 +43,6 @@ spring:
             client-secret: '090RucamvekrMLyGHMr4lkHX9xhAlsqK'
             provider: 'keycloak'
             authorization-grant-type: 'authorization_code'
-#            client-authentication-method: # unsure of value
             scope:
               - openid
               - roles
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: 1.5.3
+          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.5.3
+2.0.0-M2
 
 [[configuration-options-scdf.feature.monitoring.prometheusRsocketProxy.image.digest]]`scdf.feature.monitoring.prometheusRsocketProxy.image.digest`::
   Description:::
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" "1.5.3" 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:1.5.3"
+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:1.5.3"
+        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:1.5.3
+    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:1.5.3
+          image: micrometermetrics/prometheus-rsocket-proxy:2.0.0-M2
           imagePullPolicy: IfNotPresent
           ports:
             - name: scrape
diff --git a/src/local/application-dataflow-keycloak.yaml b/src/local/application-dataflow-keycloak.yaml
@@ -34,7 +34,6 @@ spring:
             client-secret: '090RucamvekrMLyGHMr4lkHX9xhAlsqK'
             provider: 'keycloak'
             authorization-grant-type: 'authorization_code'
-#            client-authentication-method: # unsure of value
             scope:
               - openid
               - roles
diff --git a/src/local/application-skipper-keycloak.yaml b/src/local/application-skipper-keycloak.yaml
@@ -34,7 +34,6 @@ spring:
             client-secret: '090RucamvekrMLyGHMr4lkHX9xhAlsqK'
             provider: 'keycloak'
             authorization-grant-type: 'authorization_code'
-            # client-authentication-method: ''
             scope:
               - openid
               - roles
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:1.5.3
+    image: micrometermetrics/prometheus-rsocket-proxy:2.0.0-M3
     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:1.5.3
+          image: micrometermetrics/prometheus-rsocket-proxy:2.0.0-M2
           imagePullPolicy: IfNotPresent
           ports:
             - name: scrape

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`#!/bin/bash`
`2`		`-docker pull "micrometermetrics/prometheus-rsocket-proxy:1.5.3"`
	`2`	`+docker pull "micrometermetrics/prometheus-rsocket-proxy:2.0.0-M2"`