Skip to content

Commit ef59440

Browse files
dependabot[bot]manusa
dependabot[bot]
and
manusa
authored
chore(deps): bump github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring from 0.78.1 to 0.78.2 in /kubernetes-model-generator/openapi/generator (6648)
chore(deps): bump github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring Bumps [github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring](https://github.com/prometheus-operator/prometheus-operator) from 0.78.1 to 0.78.2. - [Release notes](https://github.com/prometheus-operator/prometheus-operator/releases) - [Changelog](https://github.com/prometheus-operator/prometheus-operator/blob/main/CHANGELOG.md) - [Commits](prometheus-operator/prometheus-operator@v0.78.1...v0.78.2) --- updated-dependencies: - dependency-name: github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> --- feat(openapi): regenerate model for github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring 0.78.2 Signed-off-by: Marc Nuri <marc@marcnuri.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Marc Nuri <marc@marcnuri.com>
1 parent 1e952e0 commit ef59440

File tree

5 files changed

+41
-5
lines changed

5 files changed

+41
-5
lines changed

‎kubernetes-model-generator/openapi/generator/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ require (
2222
github.com/operator-framework/api v0.27.1-0.20241002175140-413605f42947
2323
github.com/operator-framework/operator-lifecycle-manager v0.22.0
2424
github.com/ovn-org/ovn-kubernetes/go-controller v0.0.0-20241030140127-a68ef49d9441
25-
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.78.1
25+
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.78.2
2626
github.com/spf13/cobra v1.8.1
2727
github.com/stolostron/discovery v0.0.0-20241023180217-47cd9895f600
2828
github.com/stolostron/klusterlet-addon-controller v0.0.0-20240912124113-fe0b6574a401

‎kubernetes-model-generator/openapi/generator/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -960,8 +960,8 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI
960960
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
961961
github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
962962
github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA=
963-
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.78.1 h1:Fm9Z+FabnB+6EoGq15j+pyLmaK6hYrYOpBlTzOLTQ+E=
964-
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.78.1/go.mod h1:SvsRXw4m1F2vk7HquU5h475bFpke27mIUswfyw9u3ug=
963+
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.78.2 h1:SyoVBXD/r0PntR1rprb90ClI32FSUNOCWqqTatnipHM=
964+
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.78.2/go.mod h1:SvsRXw4m1F2vk7HquU5h475bFpke27mIUswfyw9u3ug=
965965
github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
966966
github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso=
967967
github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=

‎kubernetes-model-generator/openapi/schemas/openshift-generated.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6575,6 +6575,10 @@
65756575
"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.",
65766576
"type": "boolean"
65776577
},
6578+
"proxyURL": {
6579+
"description": "Optional proxy URL.\n\nIf defined, this field takes precedence over `proxyUrl`.",
6580+
"type": "string"
6581+
},
65786582
"proxyUrl": {
65796583
"description": "`proxyURL` defines the HTTP proxy server to use.",
65806584
"type": "string"
@@ -10178,6 +10182,10 @@
1017810182
"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.",
1017910183
"type": "boolean"
1018010184
},
10185+
"proxyURL": {
10186+
"description": "Optional proxy URL.\n\nIf defined, this field takes precedence over `proxyUrl`.",
10187+
"type": "string"
10188+
},
1018110189
"proxyUrl": {
1018210190
"description": "`proxyURL` defines the HTTP proxy server to use.",
1018310191
"type": "string"

‎kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/HTTPConfig.java

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
"oauth2",
5050
"proxyConnectHeader",
5151
"proxyFromEnvironment",
52+
"proxyURL",
5253
"proxyUrl",
5354
"tlsConfig"
5455
})
@@ -94,6 +95,8 @@ public class HTTPConfig implements Editable<HTTPConfigBuilder> , KubernetesResou
9495
private Map<String, List<SecretKeySelector>> proxyConnectHeader = new LinkedHashMap<>();
9596
@JsonProperty("proxyFromEnvironment")
9697
private Boolean proxyFromEnvironment;
98+
@JsonProperty("proxyURL")
99+
private String proxyURL;
97100
@JsonProperty("proxyUrl")
98101
private String proxyUrl;
99102
@JsonProperty("tlsConfig")
@@ -108,7 +111,7 @@ public class HTTPConfig implements Editable<HTTPConfigBuilder> , KubernetesResou
108111
public HTTPConfig() {
109112
}
110113

111-
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) {
114+
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) {
112115
super();
113116
this.authorization = authorization;
114117
this.basicAuth = basicAuth;
@@ -118,6 +121,7 @@ public HTTPConfig(SafeAuthorization authorization, BasicAuth basicAuth, SecretKe
118121
this.oauth2 = oauth2;
119122
this.proxyConnectHeader = proxyConnectHeader;
120123
this.proxyFromEnvironment = proxyFromEnvironment;
124+
this.proxyURL = proxyURL;
121125
this.proxyUrl = proxyUrl;
122126
this.tlsConfig = tlsConfig;
123127
}
@@ -203,6 +207,16 @@ public void setProxyFromEnvironment(Boolean proxyFromEnvironment) {
203207
this.proxyFromEnvironment = proxyFromEnvironment;
204208
}
205209

210+
@JsonProperty("proxyURL")
211+
public String getProxyURL() {
212+
return proxyURL;
213+
}
214+
215+
@JsonProperty("proxyURL")
216+
public void setProxyURL(String proxyURL) {
217+
this.proxyURL = proxyURL;
218+
}
219+
206220
@JsonProperty("proxyUrl")
207221
public String getProxyUrl() {
208222
return proxyUrl;

‎kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1beta1/HTTPConfig.java

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
"oauth2",
5050
"proxyConnectHeader",
5151
"proxyFromEnvironment",
52+
"proxyURL",
5253
"proxyUrl",
5354
"tlsConfig"
5455
})
@@ -94,6 +95,8 @@ public class HTTPConfig implements Editable<HTTPConfigBuilder> , KubernetesResou
9495
private Map<String, List<SecretKeySelector>> proxyConnectHeader = new LinkedHashMap<>();
9596
@JsonProperty("proxyFromEnvironment")
9697
private Boolean proxyFromEnvironment;
98+
@JsonProperty("proxyURL")
99+
private String proxyURL;
97100
@JsonProperty("proxyUrl")
98101
private String proxyUrl;
99102
@JsonProperty("tlsConfig")
@@ -108,7 +111,7 @@ public class HTTPConfig implements Editable<HTTPConfigBuilder> , KubernetesResou
108111
public HTTPConfig() {
109112
}
110113

111-
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) {
114+
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) {
112115
super();
113116
this.authorization = authorization;
114117
this.basicAuth = basicAuth;
@@ -118,6 +121,7 @@ public HTTPConfig(SafeAuthorization authorization, BasicAuth basicAuth, SecretKe
118121
this.oauth2 = oauth2;
119122
this.proxyConnectHeader = proxyConnectHeader;
120123
this.proxyFromEnvironment = proxyFromEnvironment;
124+
this.proxyURL = proxyURL;
121125
this.proxyUrl = proxyUrl;
122126
this.tlsConfig = tlsConfig;
123127
}
@@ -203,6 +207,16 @@ public void setProxyFromEnvironment(Boolean proxyFromEnvironment) {
203207
this.proxyFromEnvironment = proxyFromEnvironment;
204208
}
205209

210+
@JsonProperty("proxyURL")
211+
public String getProxyURL() {
212+
return proxyURL;
213+
}
214+
215+
@JsonProperty("proxyURL")
216+
public void setProxyURL(String proxyURL) {
217+
this.proxyURL = proxyURL;
218+
}
219+
206220
@JsonProperty("proxyUrl")
207221
public String getProxyUrl() {
208222
return proxyUrl;

0 commit comments

Comments
 (0)