Merge pull request kubernetes-client#1429 from yue9944882/allow-custom-registry-injection

Removes prometheus actuator endpoints

Author: k8s-ci-robot

spring/src/main/java/io/kubernetes/client/spring/extended/controller/config/ConditionalOnActuatorPrometheusEndpointEnabled.java

@@ -12,7 +12,7 @@
 */
 package io.kubernetes.client.spring.extended.controller.config;
 
-import io.kubernetes.client.spring.extended.controller.metrics.PrometheusScrapeEndpoint;
+import io.prometheus.client.CollectorRegistry;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -21,14 +21,10 @@
 @ConditionalOnKubernetesReconcilerEnabled
 public class KubernetesReconcilerAutoConfiguration {
 
- @Configuration(proxyBeanMethods = false)
- @ConditionalOnActuatorPrometheusEndpointEnabled
- public static class KubernetesActuatorPrometheusConfiguration {
-
- @Bean
- @ConditionalOnMissingBean
- public PrometheusScrapeEndpoint prometheusScrapeEndpoint() {
- return new PrometheusScrapeEndpoint();
- }
+ @Bean
+ @ConditionalOnMissingBean
+ public CollectorRegistry prometheusCollectorRegistry() {
+ // Explicitly uses default static registry by default
+ return CollectorRegistry.defaultRegistry;
  }
 }