diff --git a/kubernetes-model-generator/openapi/generator/go.mod b/kubernetes-model-generator/openapi/generator/go.mod index 92fc3c19511..b177a52bc05 100644 --- a/kubernetes-model-generator/openapi/generator/go.mod +++ b/kubernetes-model-generator/openapi/generator/go.mod @@ -22,7 +22,7 @@ require ( github.com/operator-framework/api v0.27.1-0.20241002175140-413605f42947 github.com/operator-framework/operator-lifecycle-manager v0.22.0 github.com/ovn-org/ovn-kubernetes/go-controller v0.0.0-20241030140127-a68ef49d9441 - github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.78.1 + github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.78.2 github.com/spf13/cobra v1.8.1 github.com/stolostron/discovery v0.0.0-20241023180217-47cd9895f600 github.com/stolostron/klusterlet-addon-controller v0.0.0-20240912124113-fe0b6574a401 diff --git a/kubernetes-model-generator/openapi/generator/go.sum b/kubernetes-model-generator/openapi/generator/go.sum index b291c684159..d1ae85ab78a 100644 --- a/kubernetes-model-generator/openapi/generator/go.sum +++ b/kubernetes-model-generator/openapi/generator/go.sum @@ -960,8 +960,8 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= -github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.78.1 h1:Fm9Z+FabnB+6EoGq15j+pyLmaK6hYrYOpBlTzOLTQ+E= -github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.78.1/go.mod h1:SvsRXw4m1F2vk7HquU5h475bFpke27mIUswfyw9u3ug= +github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.78.2 h1:SyoVBXD/r0PntR1rprb90ClI32FSUNOCWqqTatnipHM= +github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.78.2/go.mod h1:SvsRXw4m1F2vk7HquU5h475bFpke27mIUswfyw9u3ug= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= diff --git a/kubernetes-model-generator/openapi/schemas/openshift-generated.json b/kubernetes-model-generator/openapi/schemas/openshift-generated.json index b22a0524736..20627dbe916 100644 --- 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/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/HTTPConfig.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/HTTPConfig.java index 2650d8c8995..ed4ca6a63f0 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/HTTPConfig.java +++ b/kubernetes-model-generator/openshift-model-monitoring/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/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1beta1/HTTPConfig.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1beta1/HTTPConfig.java index e0bd5b3ddaf..e3777a7a4d0 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1beta1/HTTPConfig.java +++ b/kubernetes-model-generator/openshift-model-monitoring/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;