feat(openapi): regenerate model for github.com/prometheus-operator/pr…

…ometheus-operator/pkg/apis/monitoring 0.78.2 Signed-off-by: Marc Nuri <[email protected]>
fabric8io · Nov 22, 2024 · 75bc54b · 75bc54b
1 parent d7c778e
commit 75bc54b
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 2 deletions.
diff --git a/kubernetes-model-generator/openapi/schemas/openshift-generated.json b/kubernetes-model-generator/openapi/schemas/openshift-generated.json
@@ -6575,6 +6575,10 @@
           "description": "Whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).\n\nIt requires Prometheus \u003e= v2.43.0 or Alertmanager \u003e= 0.25.0.",
           "type": "boolean"
         },
+        "proxyURL": {
+          "description": "Optional proxy URL.\n\nIf defined, this field takes precedence over `proxyUrl`.",
+          "type": "string"
+        },
         "proxyUrl": {
           "description": "`proxyURL` defines the HTTP proxy server to use.",
           "type": "string"
@@ -10178,6 +10182,10 @@
           "description": "Whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).\n\nIt requires Prometheus \u003e= v2.43.0 or Alertmanager \u003e= 0.25.0.",
           "type": "boolean"
         },
+        "proxyURL": {
+          "description": "Optional proxy URL.\n\nIf defined, this field takes precedence over `proxyUrl`.",
+          "type": "string"
+        },
         "proxyUrl": {
           "description": "`proxyURL` defines the HTTP proxy server to use.",
           "type": "string"

diff --git a/...ing/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/HTTPConfig.java b/...ing/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/HTTPConfig.java
@@ -49,6 +49,7 @@
     "oauth2",
     "proxyConnectHeader",
     "proxyFromEnvironment",
+    "proxyURL",
     "proxyUrl",
     "tlsConfig"
 })
@@ -94,6 +95,8 @@ public class HTTPConfig implements Editable<HTTPConfigBuilder> , KubernetesResou
     private Map<String, List<SecretKeySelector>> proxyConnectHeader = new LinkedHashMap<>();
     @JsonProperty("proxyFromEnvironment")
     private Boolean proxyFromEnvironment;
+    @JsonProperty("proxyURL")
+    private String proxyURL;
     @JsonProperty("proxyUrl")
     private String proxyUrl;
     @JsonProperty("tlsConfig")
@@ -108,7 +111,7 @@ public class HTTPConfig implements Editable<HTTPConfigBuilder> , KubernetesResou
     public HTTPConfig() {
     }
 
-    public HTTPConfig(SafeAuthorization authorization, BasicAuth basicAuth, SecretKeySelector bearerTokenSecret, Boolean followRedirects, String noProxy, OAuth2 oauth2, Map<String, List<SecretKeySelector>> proxyConnectHeader, Boolean proxyFromEnvironment, String proxyUrl, SafeTLSConfig tlsConfig) {
+    public HTTPConfig(SafeAuthorization authorization, BasicAuth basicAuth, SecretKeySelector bearerTokenSecret, Boolean followRedirects, String noProxy, OAuth2 oauth2, Map<String, List<SecretKeySelector>> proxyConnectHeader, Boolean proxyFromEnvironment, String proxyURL, String proxyUrl, SafeTLSConfig tlsConfig) {
         super();
         this.authorization = authorization;
         this.basicAuth = basicAuth;
@@ -118,6 +121,7 @@ public HTTPConfig(SafeAuthorization authorization, BasicAuth basicAuth, SecretKe
         this.oauth2 = oauth2;
         this.proxyConnectHeader = proxyConnectHeader;
         this.proxyFromEnvironment = proxyFromEnvironment;
+        this.proxyURL = proxyURL;
         this.proxyUrl = proxyUrl;
         this.tlsConfig = tlsConfig;
     }
@@ -203,6 +207,16 @@ public void setProxyFromEnvironment(Boolean proxyFromEnvironment) {
         this.proxyFromEnvironment = proxyFromEnvironment;
     }
 
+    @JsonProperty("proxyURL")
+    public String getProxyURL() {
+        return proxyURL;
+    }
+
+    @JsonProperty("proxyURL")
+    public void setProxyURL(String proxyURL) {
+        this.proxyURL = proxyURL;
+    }
+
     @JsonProperty("proxyUrl")
     public String getProxyUrl() {
         return proxyUrl;

diff --git a/...ring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1beta1/HTTPConfig.java b/...ring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1beta1/HTTPConfig.java
@@ -49,6 +49,7 @@
     "oauth2",
     "proxyConnectHeader",
     "proxyFromEnvironment",
+    "proxyURL",
     "proxyUrl",
     "tlsConfig"
 })
@@ -94,6 +95,8 @@ public class HTTPConfig implements Editable<HTTPConfigBuilder> , KubernetesResou
     private Map<String, List<SecretKeySelector>> proxyConnectHeader = new LinkedHashMap<>();
     @JsonProperty("proxyFromEnvironment")
     private Boolean proxyFromEnvironment;
+    @JsonProperty("proxyURL")
+    private String proxyURL;
     @JsonProperty("proxyUrl")
     private String proxyUrl;
     @JsonProperty("tlsConfig")
@@ -108,7 +111,7 @@ public class HTTPConfig implements Editable<HTTPConfigBuilder> , KubernetesResou
     public HTTPConfig() {
     }
 
-    public HTTPConfig(SafeAuthorization authorization, BasicAuth basicAuth, SecretKeySelector bearerTokenSecret, Boolean followRedirects, String noProxy, OAuth2 oauth2, Map<String, List<SecretKeySelector>> proxyConnectHeader, Boolean proxyFromEnvironment, String proxyUrl, SafeTLSConfig tlsConfig) {
+    public HTTPConfig(SafeAuthorization authorization, BasicAuth basicAuth, SecretKeySelector bearerTokenSecret, Boolean followRedirects, String noProxy, OAuth2 oauth2, Map<String, List<SecretKeySelector>> proxyConnectHeader, Boolean proxyFromEnvironment, String proxyURL, String proxyUrl, SafeTLSConfig tlsConfig) {
         super();
         this.authorization = authorization;
         this.basicAuth = basicAuth;
@@ -118,6 +121,7 @@ public HTTPConfig(SafeAuthorization authorization, BasicAuth basicAuth, SecretKe
         this.oauth2 = oauth2;
         this.proxyConnectHeader = proxyConnectHeader;
         this.proxyFromEnvironment = proxyFromEnvironment;
+        this.proxyURL = proxyURL;
         this.proxyUrl = proxyUrl;
         this.tlsConfig = tlsConfig;
     }
@@ -203,6 +207,16 @@ public void setProxyFromEnvironment(Boolean proxyFromEnvironment) {
         this.proxyFromEnvironment = proxyFromEnvironment;
     }
 
+    @JsonProperty("proxyURL")
+    public String getProxyURL() {
+        return proxyURL;
+    }
+
+    @JsonProperty("proxyURL")
+    public void setProxyURL(String proxyURL) {
+        this.proxyURL = proxyURL;
+    }
+
     @JsonProperty("proxyUrl")
     public String getProxyUrl() {
         return proxyUrl;