chore(deps): bump github.com/openshift/api from 20240930125604-62d5277244a4 to 20250305013520-e7f23be12279

Signed-off-by: Marc Nuri <marc@marcnuri.com>

Author: manusa

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

@@ -20,14 +20,11 @@ require (
 	github.com/openshift/hive/apis v0.0.0-20240930213556-2d25383963db
 	github.com/openshift/installer v0.0.0-00010101000000-000000000000
 	github.com/operator-framework/api v0.29.0
-	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.79.2
 	github.com/spf13/cobra v1.9.1
 	github.com/stolostron/discovery v0.0.0-20241023180217-47cd9895f600
 	github.com/stolostron/klusterlet-addon-controller v0.0.0-20240912124113-fe0b6574a401
-	github.com/stolostron/multicluster-observability-operator v1.0.1-2020-06-08-14-28-27
-	github.com/stolostron/multiclusterhub-operator v1.0.1-2020-06-08-14-28-27
 	github.com/stolostron/search-v2-operator v0.0.0-20241029125341-1a376a062a45
 	github.com/tektoncd/pipeline v0.69.0
 	github.com/tektoncd/triggers v0.31.0
@@ -64,6 +61,7 @@ require (
 // Required by some openshift operator dependencies
 // Force usage of latest Kuberentes Version
 replace (
+	github.com/openshift/api => github.com/openshift/api v0.0.0-20250305013520-e7f23be12279 // Latest 4.18
 	github.com/openshift/assisted-service/api => github.com/openshift/assisted-service/api v0.0.0-20241003070528-341f9860c455
 	github.com/openshift/assisted-service/client => github.com/openshift/assisted-service/client v0.0.0-20241003070528-341f9860c455
 	github.com/openshift/assisted-service/models => github.com/openshift/assisted-service/models v0.0.0-20241003070528-341f9860c455
@@ -91,15 +89,19 @@ replace (
 	github.com/chaos-mesh/chaos-mesh/api => github.com/marcnuri-forks/chaos-mesh/api v0.0.0-20250107101005-a389b2cbf857
 	// TODO: WIP while this gets merged or fixed https://github.com/metal3-io/baremetal-operator/pull/1985
 	github.com/metal3-io/baremetal-operator/apis => github.com/marcnuri-forks/baremetal-operator/apis v0.0.0-20241004142039-6b123cc23349
-	// TODO: WIP while this gets merged or fixed https://github.com/openshift/api/pull/2050
-	github.com/openshift/api => github.com/marcnuri-forks/api v0.0.0-20240930125604-62d5277244a4
 	// TODO: WIP while this gets merged or fixed https://github.com/operator-framework/operator-lifecycle-manager/pull/3406
 	// For some reason v0.30.0 has been released with the fix but the downloaded sources don't match those in GitHub ????
 	github.com/operator-framework/operator-lifecycle-manager => github.com/marcnuri-forks/operator-lifecycle-manager v0.0.0-20241002090802-7539192fbf96
 	// TODO: WIP while this gets merged or fixed https://github.com/kubernetes/autoscaler/pull/7393 (Merged only pending release)
 	k8s.io/autoscaler/vertical-pod-autoscaler => github.com/marcnuri-forks/kubernetes-autoscaler/vertical-pod-autoscaler v0.0.0-20241015073945-66b859601d68
 )
 
+require (
+	github.com/operator-framework/operator-lifecycle-manager v0.22.0
+	github.com/stolostron/multicluster-observability-operator v0.0.0-00010101000000-000000000000
+	github.com/stolostron/multiclusterhub-operator v0.0.0-20240626140553-4f1ed6be3b84
+)
+
 require (
 	cel.dev/expr v0.19.1 // indirect
 	contrib.go.opencensus.io/exporter/ocagent v0.7.1-0.20200907061046-05415f1de66d // indirect

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

@@ -757,8 +757,6 @@ github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJ
 github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
 github.com/mailru/easyjson v0.9.0 h1:PrnmzHw7262yW8sTBwxi1PdJA3Iw/EKBa8psRf7d9a4=
 github.com/mailru/easyjson v0.9.0/go.mod h1:1+xMtQp2MRNVL/V1bOzuP3aP8VNwRW55fQUto+XFtTU=
-github.com/marcnuri-forks/api v0.0.0-20240930125604-62d5277244a4 h1:OVm/tM0Io+jkCLhrYvDL4B6zJb9ueRBX36zt7q9KFOU=
-github.com/marcnuri-forks/api v0.0.0-20240930125604-62d5277244a4/go.mod h1:OOh6Qopf21pSzqNVCB5gomomBXb8o5sGKZxG2KNpaXM=
 github.com/marcnuri-forks/baremetal-operator/apis v0.0.0-20241004142039-6b123cc23349 h1:jSdEzmJMzBkCBT4Ft39OYARV+fgP82RlYcZc09Z8Ldk=
 github.com/marcnuri-forks/baremetal-operator/apis v0.0.0-20241004142039-6b123cc23349/go.mod h1:Qao+jEhzuKU8M763GkP70ZIdiZCaeC0H0LPyMw/l/O0=
 github.com/marcnuri-forks/chaos-mesh/api v0.0.0-20250107101005-a389b2cbf857 h1:Xl5Lm1Du3vzpTgEEgWPs/q34p8Zgb5rSre/WxJAtCE4=
@@ -908,6 +906,8 @@ github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQ
 github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM=
 github.com/opencontainers/runtime-spec v1.2.0 h1:z97+pHb3uELt/yiAWD691HNHQIF07bE7dzrbT927iTk=
 github.com/opencontainers/runtime-spec v1.2.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
+github.com/openshift/api v0.0.0-20250305013520-e7f23be12279 h1:eYvpiSNyNl7P7kmtNH0d6zAMLlrziyz370m0q1tggJE=
+github.com/openshift/api v0.0.0-20250305013520-e7f23be12279/go.mod h1:Shkl4HanLwDiiBzakv+con/aMGnVE2MAGvoKp5oyYUo=
 github.com/openshift/cloud-credential-operator v0.0.0-20240910052617-d668c182b0e3 h1:WQH/wm0E1I3zrmCnHtpaeaYduJalzL9qpDwAFLLVTNk=
 github.com/openshift/cloud-credential-operator v0.0.0-20240910052617-d668c182b0e3/go.mod h1:4AWWBNPuWzPtT77xDONlObrazPlBCKXd+16lupnIrQc=
 github.com/openshift/cluster-network-operator v0.0.0-20240912134426-a3188633549d h1:9Xf/80gDpRc33FwCEJ6L2/DF1yU/4L6QjoYxKexDzvo=

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

@@ -40,6 +40,7 @@
 @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonPropertyOrder({
+    "cloudLoadBalancerConfig",
     "region",
     "resourceTags",
     "serviceEndpoints"
@@ -69,6 +70,8 @@
 public class AWSPlatformStatus implements Editable<AWSPlatformStatusBuilder>, KubernetesResource
 {
 
+    @JsonProperty("cloudLoadBalancerConfig")
+    private CloudLoadBalancerConfig cloudLoadBalancerConfig;
     @JsonProperty("region")
     private String region;
     @JsonProperty("resourceTags")
@@ -86,13 +89,30 @@ public class AWSPlatformStatus implements Editable<AWSPlatformStatusBuilder>, Ku
     public AWSPlatformStatus() {
     }
 
-    public AWSPlatformStatus(String region, List<AWSResourceTag> resourceTags, List<AWSServiceEndpoint> serviceEndpoints) {
+    public AWSPlatformStatus(CloudLoadBalancerConfig cloudLoadBalancerConfig, String region, List<AWSResourceTag> resourceTags, List<AWSServiceEndpoint> serviceEndpoints) {
         super();
+        this.cloudLoadBalancerConfig = cloudLoadBalancerConfig;
         this.region = region;
         this.resourceTags = resourceTags;
         this.serviceEndpoints = serviceEndpoints;
     }
 
+    /**
+     * AWSPlatformStatus holds the current status of the Amazon Web Services infrastructure provider.
+     */
+    @JsonProperty("cloudLoadBalancerConfig")
+    public CloudLoadBalancerConfig getCloudLoadBalancerConfig() {
+        return cloudLoadBalancerConfig;
+    }
+
+    /**
+     * AWSPlatformStatus holds the current status of the Amazon Web Services infrastructure provider.
+     */
+    @JsonProperty("cloudLoadBalancerConfig")
+    public void setCloudLoadBalancerConfig(CloudLoadBalancerConfig cloudLoadBalancerConfig) {
+        this.cloudLoadBalancerConfig = cloudLoadBalancerConfig;
+    }
+
     /**
      * region holds the default AWS region for new AWS resources created by the cluster.
      */

kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AWSPlatformStatus.java

@@ -36,6 +36,7 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonPropertyOrder({
     "cgroupMode",
+    "minimumKubeletVersion",
     "workerLatencyProfile"
 })
 @ToString
@@ -65,6 +66,8 @@ public class NodeSpec implements Editable<NodeSpecBuilder>, KubernetesResource
 
     @JsonProperty("cgroupMode")
     private String cgroupMode;
+    @JsonProperty("minimumKubeletVersion")
+    private String minimumKubeletVersion;
     @JsonProperty("workerLatencyProfile")
     private String workerLatencyProfile;
     @JsonIgnore
@@ -76,9 +79,10 @@ public class NodeSpec implements Editable<NodeSpecBuilder>, KubernetesResource
     public NodeSpec() {
     }
 
-    public NodeSpec(String cgroupMode, String workerLatencyProfile) {
+    public NodeSpec(String cgroupMode, String minimumKubeletVersion, String workerLatencyProfile) {
         super();
         this.cgroupMode = cgroupMode;
+        this.minimumKubeletVersion = minimumKubeletVersion;
         this.workerLatencyProfile = workerLatencyProfile;
     }
 
@@ -98,6 +102,22 @@ public void setCgroupMode(String cgroupMode) {
         this.cgroupMode = cgroupMode;
     }
 
+    /**
+     * minimumKubeletVersion is the lowest version of a kubelet that can join the cluster. Specifically, the apiserver will deny most authorization requests of kubelets that are older than the specified version, only allowing the kubelet to get and update its node object, and perform subjectaccessreviews. This means any kubelet that attempts to join the cluster will not be able to run any assigned workloads, and will eventually be marked as not ready. Its max length is 8, so maximum version allowed is either "9.999.99" or "99.99.99". Since the kubelet reports the version of the kubernetes release, not Openshift, this field references the underlying kubernetes version this version of Openshift is based off of. In other words: if an admin wishes to ensure no nodes run an older version than Openshift 4.17, then they should set the minimumKubeletVersion to 1.30.0. When comparing versions, the kubelet's version is stripped of any contents outside of major.minor.patch version. Thus, a kubelet with version "1.0.0-ec.0" will be compatible with minimumKubeletVersion "1.0.0" or earlier.
+     */
+    @JsonProperty("minimumKubeletVersion")
+    public String getMinimumKubeletVersion() {
+        return minimumKubeletVersion;
+    }
+
+    /**
+     * minimumKubeletVersion is the lowest version of a kubelet that can join the cluster. Specifically, the apiserver will deny most authorization requests of kubelets that are older than the specified version, only allowing the kubelet to get and update its node object, and perform subjectaccessreviews. This means any kubelet that attempts to join the cluster will not be able to run any assigned workloads, and will eventually be marked as not ready. Its max length is 8, so maximum version allowed is either "9.999.99" or "99.99.99". Since the kubelet reports the version of the kubernetes release, not Openshift, this field references the underlying kubernetes version this version of Openshift is based off of. In other words: if an admin wishes to ensure no nodes run an older version than Openshift 4.17, then they should set the minimumKubeletVersion to 1.30.0. When comparing versions, the kubelet's version is stripped of any contents outside of major.minor.patch version. Thus, a kubelet with version "1.0.0-ec.0" will be compatible with minimumKubeletVersion "1.0.0" or earlier.
+     */
+    @JsonProperty("minimumKubeletVersion")
+    public void setMinimumKubeletVersion(String minimumKubeletVersion) {
+        this.minimumKubeletVersion = minimumKubeletVersion;
+    }
+
     /**
      * WorkerLatencyProfile determins the how fast the kubelet is updating the status and corresponding reaction of the cluster
      */

kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NodeSpec.java

@@ -125,7 +125,7 @@ public void setName(String name) {
     }
 
     /**
-     * subnets holds a list of identifiers (one or more) of the cluster's network subnets for the Machine's VM to connect to. The subnet identifiers (uuid or name) can be obtained from the Prism Central console or using the prism_central API.
+     * subnets holds a list of identifiers (one or more) of the cluster's network subnets If the feature gate NutanixMultiSubnets is enabled, up to 32 subnets may be configured. for the Machine's VM to connect to. The subnet identifiers (uuid or name) can be obtained from the Prism Central console or using the prism_central API.
      */
     @JsonProperty("subnets")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
@@ -134,7 +134,7 @@ public List<NutanixResourceIdentifier> getSubnets() {
     }
 
     /**
-     * subnets holds a list of identifiers (one or more) of the cluster's network subnets for the Machine's VM to connect to. The subnet identifiers (uuid or name) can be obtained from the Prism Central console or using the prism_central API.
+     * subnets holds a list of identifiers (one or more) of the cluster's network subnets If the feature gate NutanixMultiSubnets is enabled, up to 32 subnets may be configured. for the Machine's VM to connect to. The subnet identifiers (uuid or name) can be obtained from the Prism Central console or using the prism_central API.
      */
     @JsonProperty("subnets")
     public void setSubnets(List<NutanixResourceIdentifier> subnets) {

kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NutanixFailureDomain.java

@@ -40,6 +40,7 @@
 @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonPropertyOrder({
+    "architecture",
     "channels",
     "image",
     "url",
@@ -70,6 +71,8 @@
 public class Release implements Editable<ReleaseBuilder>, KubernetesResource
 {
 
+    @JsonProperty("architecture")
+    private String architecture;
     @JsonProperty("channels")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private List<String> channels = new ArrayList<>();
@@ -88,14 +91,31 @@ public class Release implements Editable<ReleaseBuilder>, KubernetesResource
     public Release() {
     }
 
-    public Release(List<String> channels, String image, String url, String version) {
+    public Release(String architecture, List<String> channels, String image, String url, String version) {
         super();
+        this.architecture = architecture;
         this.channels = channels;
         this.image = image;
         this.url = url;
         this.version = version;
     }
 
+    /**
+     * architecture is an optional field that indicates the value of the cluster architecture. In this context cluster architecture means either a single architecture or a multi architecture. Valid values are 'Multi' and empty.
+     */
+    @JsonProperty("architecture")
+    public String getArchitecture() {
+        return architecture;
+    }
+
+    /**
+     * architecture is an optional field that indicates the value of the cluster architecture. In this context cluster architecture means either a single architecture or a multi architecture. Valid values are 'Multi' and empty.
+     */
+    @JsonProperty("architecture")
+    public void setArchitecture(String architecture) {
+        this.architecture = architecture;
+    }
+
     /**
      * channels is the set of Cincinnati channels to which the release currently belongs.
      */