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

…ometheus-operator/pkg/apis/monitoring 0.79.2 Signed-off-by: Marc Nuri <marc@marcnuri.com>
fabric8io · Jan 7, 2025 · 1203c4c · 1203c4c
1 parent 93983a1
commit 1203c4c
Show file tree

Hide file tree

Showing 17 changed files with 574 additions and 50 deletions.
diff --git a/kubernetes-model-generator/openapi/schemas/openshift-generated.json b/kubernetes-model-generator/openapi/schemas/openshift-generated.json
diff --git a/...rc/generated/java/io/fabric8/openshift/api/model/monitoring/v1/AlertmanagerEndpoints.java b/...rc/generated/java/io/fabric8/openshift/api/model/monitoring/v1/AlertmanagerEndpoints.java
@@ -26,6 +26,7 @@
 import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
 import io.fabric8.kubernetes.api.model.PodTemplateSpec;
 import io.fabric8.kubernetes.api.model.ResourceRequirements;
+import io.fabric8.kubernetes.api.model.SecretKeySelector;
 import io.fabric8.kubernetes.api.model.Volume;
 import io.fabric8.kubernetes.api.model.VolumeMount;
 import io.sundr.builder.annotations.Buildable;
@@ -45,8 +46,12 @@
     "enableHttp2",
     "name",
     "namespace",
+    "noProxy",
     "pathPrefix",
     "port",
+    "proxyConnectHeader",
+    "proxyFromEnvironment",
+    "proxyUrl",
     "relabelings",
     "scheme",
     "sigv4",
@@ -95,10 +100,19 @@ public class AlertmanagerEndpoints implements Editable<AlertmanagerEndpointsBuil
     private String name;
     @JsonProperty("namespace")
     private String namespace;
+    @JsonProperty("noProxy")
+    private String noProxy;
     @JsonProperty("pathPrefix")
     private String pathPrefix;
     @JsonProperty("port")
     private IntOrString port;
+    @JsonProperty("proxyConnectHeader")
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    private Map<String, List<SecretKeySelector>> proxyConnectHeader = new LinkedHashMap<>();
+    @JsonProperty("proxyFromEnvironment")
+    private Boolean proxyFromEnvironment;
+    @JsonProperty("proxyUrl")
+    private String proxyUrl;
     @JsonProperty("relabelings")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private List<RelabelConfig> relabelings = new ArrayList<>();
@@ -120,7 +134,7 @@ public class AlertmanagerEndpoints implements Editable<AlertmanagerEndpointsBuil
     public AlertmanagerEndpoints() {
     }
 
-    public AlertmanagerEndpoints(List<RelabelConfig> alertRelabelings, String apiVersion, SafeAuthorization authorization, BasicAuth basicAuth, String bearerTokenFile, Boolean enableHttp2, String name, String namespace, String pathPrefix, IntOrString port, List<RelabelConfig> relabelings, String scheme, Sigv4 sigv4, String timeout, TLSConfig tlsConfig) {
+    public AlertmanagerEndpoints(List<RelabelConfig> alertRelabelings, String apiVersion, SafeAuthorization authorization, BasicAuth basicAuth, String bearerTokenFile, Boolean enableHttp2, String name, String namespace, String noProxy, String pathPrefix, IntOrString port, Map<String, List<SecretKeySelector>> proxyConnectHeader, Boolean proxyFromEnvironment, String proxyUrl, List<RelabelConfig> relabelings, String scheme, Sigv4 sigv4, String timeout, TLSConfig tlsConfig) {
         super();
         this.alertRelabelings = alertRelabelings;
         this.apiVersion = apiVersion;
@@ -130,8 +144,12 @@ public AlertmanagerEndpoints(List<RelabelConfig> alertRelabelings, String apiVer
         this.enableHttp2 = enableHttp2;
         this.name = name;
         this.namespace = namespace;
+        this.noProxy = noProxy;
         this.pathPrefix = pathPrefix;
         this.port = port;
+        this.proxyConnectHeader = proxyConnectHeader;
+        this.proxyFromEnvironment = proxyFromEnvironment;
+        this.proxyUrl = proxyUrl;
         this.relabelings = relabelings;
         this.scheme = scheme;
         this.sigv4 = sigv4;
@@ -220,6 +238,16 @@ public void setNamespace(String namespace) {
         this.namespace = namespace;
     }
 
+    @JsonProperty("noProxy")
+    public String getNoProxy() {
+        return noProxy;
+    }
+
+    @JsonProperty("noProxy")
+    public void setNoProxy(String noProxy) {
+        this.noProxy = noProxy;
+    }
+
     @JsonProperty("pathPrefix")
     public String getPathPrefix() {
         return pathPrefix;
@@ -240,6 +268,37 @@ public void setPort(IntOrString port) {
         this.port = port;
     }
 
+    @JsonProperty("proxyConnectHeader")
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    public Map<String, List<SecretKeySelector>> getProxyConnectHeader() {
+        return proxyConnectHeader;
+    }
+
+    @JsonProperty("proxyConnectHeader")
+    public void setProxyConnectHeader(Map<String, List<SecretKeySelector>> proxyConnectHeader) {
+        this.proxyConnectHeader = proxyConnectHeader;
+    }
+
+    @JsonProperty("proxyFromEnvironment")
+    public Boolean getProxyFromEnvironment() {
+        return proxyFromEnvironment;
+    }
+
+    @JsonProperty("proxyFromEnvironment")
+    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("relabelings")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     public List<RelabelConfig> getRelabelings() {

diff --git a/...ing/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/AlertmanagerSpec.java b/...ing/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/AlertmanagerSpec.java
@@ -32,6 +32,7 @@
 import io.fabric8.kubernetes.api.model.TopologySpreadConstraint;
 import io.fabric8.kubernetes.api.model.Volume;
 import io.fabric8.kubernetes.api.model.VolumeMount;
+import io.fabric8.kubernetes.api.model.apps.StatefulSetPersistentVolumeClaimRetentionPolicy;
 import io.sundr.builder.annotations.Buildable;
 import io.sundr.builder.annotations.BuildableReference;
 import lombok.EqualsAndHashCode;
@@ -73,6 +74,7 @@
     "minReadySeconds",
     "nodeSelector",
     "paused",
+    "persistentVolumeClaimRetentionPolicy",
     "podMetadata",
     "portName",
     "priorityClassName",
@@ -190,6 +192,8 @@ public class AlertmanagerSpec implements Editable<AlertmanagerSpecBuilder>, Kube
     private Map<String, String> nodeSelector = new LinkedHashMap<>();
     @JsonProperty("paused")
     private Boolean paused;
+    @JsonProperty("persistentVolumeClaimRetentionPolicy")
+    private StatefulSetPersistentVolumeClaimRetentionPolicy persistentVolumeClaimRetentionPolicy;
     @JsonProperty("podMetadata")
     private EmbeddedObjectMetadata podMetadata;
     @JsonProperty("portName")
@@ -243,7 +247,7 @@ public class AlertmanagerSpec implements Editable<AlertmanagerSpecBuilder>, Kube
     public AlertmanagerSpec() {
     }
 
-    public AlertmanagerSpec(List<String> additionalPeers, Affinity affinity, AlertmanagerConfigMatcherStrategy alertmanagerConfigMatcherStrategy, LabelSelector alertmanagerConfigNamespaceSelector, LabelSelector alertmanagerConfigSelector, AlertmanagerConfiguration alertmanagerConfiguration, Boolean automountServiceAccountToken, String baseImage, String clusterAdvertiseAddress, String clusterGossipInterval, String clusterLabel, String clusterPeerTimeout, String clusterPushpullInterval, List<String> configMaps, String configSecret, List<Container> containers, PodDNSConfig dnsConfig, String dnsPolicy, List<String> enableFeatures, String externalUrl, Boolean forceEnableClusterMode, List<HostAlias> hostAliases, String image, String imagePullPolicy, List<LocalObjectReference> imagePullSecrets, List<Container> initContainers, Boolean listenLocal, String logFormat, String logLevel, Long minReadySeconds, Map<String, String> nodeSelector, Boolean paused, EmbeddedObjectMetadata podMetadata, String portName, String priorityClassName, Integer replicas, ResourceRequirements resources, String retention, String routePrefix, List<String> secrets, PodSecurityContext securityContext, String serviceAccountName, String sha, StorageSpec storage, String tag, List<Toleration> tolerations, List<TopologySpreadConstraint> topologySpreadConstraints, String version, List<VolumeMount> volumeMounts, List<Volume> volumes, AlertmanagerWebSpec web) {
+    public AlertmanagerSpec(List<String> additionalPeers, Affinity affinity, AlertmanagerConfigMatcherStrategy alertmanagerConfigMatcherStrategy, LabelSelector alertmanagerConfigNamespaceSelector, LabelSelector alertmanagerConfigSelector, AlertmanagerConfiguration alertmanagerConfiguration, Boolean automountServiceAccountToken, String baseImage, String clusterAdvertiseAddress, String clusterGossipInterval, String clusterLabel, String clusterPeerTimeout, String clusterPushpullInterval, List<String> configMaps, String configSecret, List<Container> containers, PodDNSConfig dnsConfig, String dnsPolicy, List<String> enableFeatures, String externalUrl, Boolean forceEnableClusterMode, List<HostAlias> hostAliases, String image, String imagePullPolicy, List<LocalObjectReference> imagePullSecrets, List<Container> initContainers, Boolean listenLocal, String logFormat, String logLevel, Long minReadySeconds, Map<String, String> nodeSelector, Boolean paused, StatefulSetPersistentVolumeClaimRetentionPolicy persistentVolumeClaimRetentionPolicy, EmbeddedObjectMetadata podMetadata, String portName, String priorityClassName, Integer replicas, ResourceRequirements resources, String retention, String routePrefix, List<String> secrets, PodSecurityContext securityContext, String serviceAccountName, String sha, StorageSpec storage, String tag, List<Toleration> tolerations, List<TopologySpreadConstraint> topologySpreadConstraints, String version, List<VolumeMount> volumeMounts, List<Volume> volumes, AlertmanagerWebSpec web) {
         super();
         this.additionalPeers = additionalPeers;
         this.affinity = affinity;
@@ -277,6 +281,7 @@ public AlertmanagerSpec(List<String> additionalPeers, Affinity affinity, Alertma
         this.minReadySeconds = minReadySeconds;
         this.nodeSelector = nodeSelector;
         this.paused = paused;
+        this.persistentVolumeClaimRetentionPolicy = persistentVolumeClaimRetentionPolicy;
         this.podMetadata = podMetadata;
         this.portName = portName;
         this.priorityClassName = priorityClassName;
@@ -626,6 +631,16 @@ public void setPaused(Boolean paused) {
         this.paused = paused;
     }
 
+    @JsonProperty("persistentVolumeClaimRetentionPolicy")
+    public StatefulSetPersistentVolumeClaimRetentionPolicy getPersistentVolumeClaimRetentionPolicy() {
+        return persistentVolumeClaimRetentionPolicy;
+    }
+
+    @JsonProperty("persistentVolumeClaimRetentionPolicy")
+    public void setPersistentVolumeClaimRetentionPolicy(StatefulSetPersistentVolumeClaimRetentionPolicy persistentVolumeClaimRetentionPolicy) {
+        this.persistentVolumeClaimRetentionPolicy = persistentVolumeClaimRetentionPolicy;
+    }
+
     @JsonProperty("podMetadata")
     public EmbeddedObjectMetadata getPodMetadata() {
         return podMetadata;