diff --git a/assets/csidriveroperators/vsphere/06_clusterrole.yaml b/assets/csidriveroperators/vsphere/06_clusterrole.yaml
index c987d6abf..602f9b859 100644
--- a/assets/csidriveroperators/vsphere/06_clusterrole.yaml
+++ b/assets/csidriveroperators/vsphere/06_clusterrole.yaml
@@ -295,6 +295,8 @@ rules:
- infrastructures
- proxies
- apiservers
+ - featuregates
+ - clusterversions
verbs:
- get
- list
diff --git a/go.mod b/go.mod
index 6d2891532..87352176c 100644
--- a/go.mod
+++ b/go.mod
@@ -8,7 +8,7 @@ require (
github.com/go-logr/logr v1.4.1 // indirect
github.com/google/go-cmp v0.6.0
github.com/google/gofuzz v1.2.0 // indirect
- github.com/openshift/api v0.0.0-20240424142232-29a704bf5aa2
+ github.com/openshift/api v0.0.0-20240508125607-95e22923d553
github.com/openshift/build-machinery-go v0.0.0-20231128094528-1e9b1b0595c8
github.com/openshift/client-go v0.0.0-20240405120947-c67c8325cdd8
github.com/openshift/library-go v0.0.0-20240506162756-6301addeda88
diff --git a/go.sum b/go.sum
index 56d1c3351..68633eb1e 100644
--- a/go.sum
+++ b/go.sum
@@ -129,8 +129,8 @@ github.com/onsi/ginkgo/v2 v2.14.0 h1:vSmGj2Z5YPb9JwCWT6z6ihcUvDhuXLc3sJiqd3jMKAY
github.com/onsi/ginkgo/v2 v2.14.0/go.mod h1:JkUdW7JkN0V6rFvsHcJ478egV3XH9NxpD27Hal/PhZw=
github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8=
github.com/onsi/gomega v1.30.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ=
-github.com/openshift/api v0.0.0-20240424142232-29a704bf5aa2 h1:U1BsjJoTsvYjymeMseC8apZnvCgExIIRolpc/xJ7jhM=
-github.com/openshift/api v0.0.0-20240424142232-29a704bf5aa2/go.mod h1:CxgbWAlvu2iQB0UmKTtRu1YfepRg1/vJ64n2DlIEVz4=
+github.com/openshift/api v0.0.0-20240508125607-95e22923d553 h1:xMTwK9/Co/HyzXkNQLDcHRBgrTdL52/bgNHyDS+YY94=
+github.com/openshift/api v0.0.0-20240508125607-95e22923d553/go.mod h1:CxgbWAlvu2iQB0UmKTtRu1YfepRg1/vJ64n2DlIEVz4=
github.com/openshift/build-machinery-go v0.0.0-20231128094528-1e9b1b0595c8 h1:cu3YUMVGsKIyFyJGO3F6BZKGYQZpCKxAv9cBPgQAca8=
github.com/openshift/build-machinery-go v0.0.0-20231128094528-1e9b1b0595c8/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE=
github.com/openshift/client-go v0.0.0-20240405120947-c67c8325cdd8 h1:HGfbllzRcrJBSiwzNjBCs7sExLUxC5/1evnvlNGB0Cg=
diff --git a/vendor/github.com/openshift/api/config/v1/types_infrastructure.go b/vendor/github.com/openshift/api/config/v1/types_infrastructure.go
index fb224c6e6..b0cba8ddf 100644
--- a/vendor/github.com/openshift/api/config/v1/types_infrastructure.go
+++ b/vendor/github.com/openshift/api/config/v1/types_infrastructure.go
@@ -825,7 +825,7 @@ type BareMetalPlatformSpec struct {
//
// +kubebuilder:validation:MaxItems=2
// +kubebuilder:validation:XValidation:rule="size(self) == 2 && isIP(self[0]) && isIP(self[1]) ? ip(self[0]).family() != ip(self[1]).family() : true",message="apiServerInternalIPs must contain at most one IPv4 address and at most one IPv6 address"
- // +listType=set
+ // +listType=atomic
// +optional
APIServerInternalIPs []IP `json:"apiServerInternalIPs"`
@@ -840,15 +840,16 @@ type BareMetalPlatformSpec struct {
//
// +kubebuilder:validation:MaxItems=2
// +kubebuilder:validation:XValidation:rule="size(self) == 2 && isIP(self[0]) && isIP(self[1]) ? ip(self[0]).family() != ip(self[1]).family() : true",message="ingressIPs must contain at most one IPv4 address and at most one IPv6 address"
- // +listType=set
+ // +listType=atomic
// +optional
IngressIPs []IP `json:"ingressIPs"`
// machineNetworks are IP networks used to connect all the OpenShift cluster
// nodes. Each network is provided in the CIDR format and should be IPv4 or IPv6,
// for example "10.0.0.0/8" or "fd00::/8".
- // +listType=set
+ // +listType=atomic
// +kubebuilder:validation:MaxItems=32
+ // +kubebuilder:validation:XValidation:rule="self.all(x, self.exists_one(y, x == y))"
// +optional
MachineNetworks []CIDR `json:"machineNetworks"`
}
@@ -873,7 +874,8 @@ type BareMetalPlatformStatus struct {
//
// +kubebuilder:validation:Format=ip
// +kubebuilder:validation:MaxItems=2
- // +listType=set
+ // +kubebuilder:validation:XValidation:rule="self == oldSelf || (size(self) == 2 && isIP(self[0]) && isIP(self[1]) ? ip(self[0]).family() != ip(self[1]).family() : true)",message="apiServerInternalIPs must contain at most one IPv4 address and at most one IPv6 address"
+ // +listType=atomic
APIServerInternalIPs []string `json:"apiServerInternalIPs"`
// ingressIP is an external IP which routes to the default ingress controller.
@@ -889,7 +891,8 @@ type BareMetalPlatformStatus struct {
//
// +kubebuilder:validation:Format=ip
// +kubebuilder:validation:MaxItems=2
- // +listType=set
+ // +kubebuilder:validation:XValidation:rule="self == oldSelf || (size(self) == 2 && isIP(self[0]) && isIP(self[1]) ? ip(self[0]).family() != ip(self[1]).family() : true)",message="ingressIPs must contain at most one IPv4 address and at most one IPv6 address"
+ // +listType=atomic
IngressIPs []string `json:"ingressIPs"`
// nodeDNSIP is the IP address for the internal DNS used by the
@@ -908,8 +911,9 @@ type BareMetalPlatformStatus struct {
LoadBalancer *BareMetalPlatformLoadBalancer `json:"loadBalancer,omitempty"`
// machineNetworks are IP networks used to connect all the OpenShift cluster nodes.
- // +listType=set
+ // +listType=atomic
// +kubebuilder:validation:MaxItems=32
+ // +kubebuilder:validation:XValidation:rule="self.all(x, self.exists_one(y, x == y))"
// +optional
MachineNetworks []CIDR `json:"machineNetworks"`
}
@@ -952,7 +956,7 @@ type OpenStackPlatformSpec struct {
//
// +kubebuilder:validation:MaxItems=2
// +kubebuilder:validation:XValidation:rule="size(self) == 2 && isIP(self[0]) && isIP(self[1]) ? ip(self[0]).family() != ip(self[1]).family() : true",message="apiServerInternalIPs must contain at most one IPv4 address and at most one IPv6 address"
- // +listType=set
+ // +listType=atomic
// +optional
APIServerInternalIPs []IP `json:"apiServerInternalIPs"`
@@ -967,15 +971,16 @@ type OpenStackPlatformSpec struct {
//
// +kubebuilder:validation:MaxItems=2
// +kubebuilder:validation:XValidation:rule="size(self) == 2 && isIP(self[0]) && isIP(self[1]) ? ip(self[0]).family() != ip(self[1]).family() : true",message="ingressIPs must contain at most one IPv4 address and at most one IPv6 address"
- // +listType=set
+ // +listType=atomic
// +optional
IngressIPs []IP `json:"ingressIPs"`
// machineNetworks are IP networks used to connect all the OpenShift cluster
// nodes. Each network is provided in the CIDR format and should be IPv4 or IPv6,
// for example "10.0.0.0/8" or "fd00::/8".
- // +listType=set
+ // +listType=atomic
// +kubebuilder:validation:MaxItems=32
+ // +kubebuilder:validation:XValidation:rule="self.all(x, self.exists_one(y, x == y))"
// +optional
MachineNetworks []CIDR `json:"machineNetworks"`
}
@@ -998,7 +1003,8 @@ type OpenStackPlatformStatus struct {
//
// +kubebuilder:validation:Format=ip
// +kubebuilder:validation:MaxItems=2
- // +listType=set
+ // +kubebuilder:validation:XValidation:rule="self == oldSelf || (size(self) == 2 && isIP(self[0]) && isIP(self[1]) ? ip(self[0]).family() != ip(self[1]).family() : true)",message="apiServerInternalIPs must contain at most one IPv4 address and at most one IPv6 address"
+ // +listType=atomic
APIServerInternalIPs []string `json:"apiServerInternalIPs"`
// cloudName is the name of the desired OpenStack cloud in the
@@ -1018,7 +1024,8 @@ type OpenStackPlatformStatus struct {
//
// +kubebuilder:validation:Format=ip
// +kubebuilder:validation:MaxItems=2
- // +listType=set
+ // +kubebuilder:validation:XValidation:rule="self == oldSelf || (size(self) == 2 && isIP(self[0]) && isIP(self[1]) ? ip(self[0]).family() != ip(self[1]).family() : true)",message="ingressIPs must contain at most one IPv4 address and at most one IPv6 address"
+ // +listType=atomic
IngressIPs []string `json:"ingressIPs"`
// nodeDNSIP is the IP address for the internal DNS used by the
@@ -1036,8 +1043,9 @@ type OpenStackPlatformStatus struct {
LoadBalancer *OpenStackPlatformLoadBalancer `json:"loadBalancer,omitempty"`
// machineNetworks are IP networks used to connect all the OpenShift cluster nodes.
- // +listType=set
+ // +listType=atomic
// +kubebuilder:validation:MaxItems=32
+ // +kubebuilder:validation:XValidation:rule="self.all(x, self.exists_one(y, x == y))"
// +optional
MachineNetworks []CIDR `json:"machineNetworks"`
}
@@ -1085,6 +1093,7 @@ type OvirtPlatformStatus struct {
//
// +kubebuilder:validation:Format=ip
// +kubebuilder:validation:MaxItems=2
+ // +kubebuilder:validation:XValidation:rule="self == oldSelf || (size(self) == 2 && isIP(self[0]) && isIP(self[1]) ? ip(self[0]).family() != ip(self[1]).family() : true)",message="apiServerInternalIPs must contain at most one IPv4 address and at most one IPv6 address"
// +listType=set
APIServerInternalIPs []string `json:"apiServerInternalIPs"`
@@ -1101,6 +1110,7 @@ type OvirtPlatformStatus struct {
//
// +kubebuilder:validation:Format=ip
// +kubebuilder:validation:MaxItems=2
+ // +kubebuilder:validation:XValidation:rule="self == oldSelf || (size(self) == 2 && isIP(self[0]) && isIP(self[1]) ? ip(self[0]).family() != ip(self[1]).family() : true)",message="ingressIPs must contain at most one IPv4 address and at most one IPv6 address"
// +listType=set
IngressIPs []string `json:"ingressIPs"`
@@ -1333,8 +1343,9 @@ type VSpherePlatformSpec struct {
// ---
// + If VCenters is not defined use the existing cloud-config configmap defined
// + in openshift-config.
- // +kubebuilder:validation:MaxItems=1
// +kubebuilder:validation:MinItems=0
+ // +openshift:validation:FeatureGateAwareMaxItems:featureGate="",maxItems=1
+ // +openshift:validation:FeatureGateAwareMaxItems:featureGate=VSphereMultiVCenters,maxItems=3
// +listType=atomic
// +optional
VCenters []VSpherePlatformVCenterSpec `json:"vcenters,omitempty"`
@@ -1366,7 +1377,7 @@ type VSpherePlatformSpec struct {
//
// +kubebuilder:validation:MaxItems=2
// +kubebuilder:validation:XValidation:rule="size(self) == 2 && isIP(self[0]) && isIP(self[1]) ? ip(self[0]).family() != ip(self[1]).family() : true",message="apiServerInternalIPs must contain at most one IPv4 address and at most one IPv6 address"
- // +listType=set
+ // +listType=atomic
// +optional
APIServerInternalIPs []IP `json:"apiServerInternalIPs"`
@@ -1381,15 +1392,16 @@ type VSpherePlatformSpec struct {
//
// +kubebuilder:validation:MaxItems=2
// +kubebuilder:validation:XValidation:rule="size(self) == 2 && isIP(self[0]) && isIP(self[1]) ? ip(self[0]).family() != ip(self[1]).family() : true",message="ingressIPs must contain at most one IPv4 address and at most one IPv6 address"
- // +listType=set
+ // +listType=atomic
// +optional
IngressIPs []IP `json:"ingressIPs"`
// machineNetworks are IP networks used to connect all the OpenShift cluster
// nodes. Each network is provided in the CIDR format and should be IPv4 or IPv6,
// for example "10.0.0.0/8" or "fd00::/8".
- // +listType=set
+ // +listType=atomic
// +kubebuilder:validation:MaxItems=32
+ // +kubebuilder:validation:XValidation:rule="self.all(x, self.exists_one(y, x == y))"
// +optional
MachineNetworks []CIDR `json:"machineNetworks"`
}
@@ -1412,7 +1424,8 @@ type VSpherePlatformStatus struct {
//
// +kubebuilder:validation:Format=ip
// +kubebuilder:validation:MaxItems=2
- // +listType=set
+ // +kubebuilder:validation:XValidation:rule="self == oldSelf || (size(self) == 2 && isIP(self[0]) && isIP(self[1]) ? ip(self[0]).family() != ip(self[1]).family() : true)",message="apiServerInternalIPs must contain at most one IPv4 address and at most one IPv6 address"
+ // +listType=atomic
APIServerInternalIPs []string `json:"apiServerInternalIPs"`
// ingressIP is an external IP which routes to the default ingress controller.
@@ -1428,7 +1441,8 @@ type VSpherePlatformStatus struct {
//
// +kubebuilder:validation:Format=ip
// +kubebuilder:validation:MaxItems=2
- // +listType=set
+ // +kubebuilder:validation:XValidation:rule="self == oldSelf || (size(self) == 2 && isIP(self[0]) && isIP(self[1]) ? ip(self[0]).family() != ip(self[1]).family() : true)",message="ingressIPs must contain at most one IPv4 address and at most one IPv6 address"
+ // +listType=atomic
IngressIPs []string `json:"ingressIPs"`
// nodeDNSIP is the IP address for the internal DNS used by the
@@ -1447,8 +1461,9 @@ type VSpherePlatformStatus struct {
LoadBalancer *VSpherePlatformLoadBalancer `json:"loadBalancer,omitempty"`
// machineNetworks are IP networks used to connect all the OpenShift cluster nodes.
- // +listType=set
+ // +listType=atomic
// +kubebuilder:validation:MaxItems=32
+ // +kubebuilder:validation:XValidation:rule="self.all(x, self.exists_one(y, x == y))"
// +optional
MachineNetworks []CIDR `json:"machineNetworks"`
}
@@ -1813,6 +1828,7 @@ type NutanixPlatformStatus struct {
//
// +kubebuilder:validation:Format=ip
// +kubebuilder:validation:MaxItems=2
+ // +kubebuilder:validation:XValidation:rule="self == oldSelf || (size(self) == 2 && isIP(self[0]) && isIP(self[1]) ? ip(self[0]).family() != ip(self[1]).family() : true)",message="apiServerInternalIPs must contain at most one IPv4 address and at most one IPv6 address"
// +listType=set
APIServerInternalIPs []string `json:"apiServerInternalIPs"`
@@ -1829,6 +1845,7 @@ type NutanixPlatformStatus struct {
//
// +kubebuilder:validation:Format=ip
// +kubebuilder:validation:MaxItems=2
+ // +kubebuilder:validation:XValidation:rule="self == oldSelf || (size(self) == 2 && isIP(self[0]) && isIP(self[1]) ? ip(self[0]).family() != ip(self[1]).family() : true)",message="ingressIPs must contain at most one IPv4 address and at most one IPv6 address"
// +listType=set
IngressIPs []string `json:"ingressIPs"`
diff --git a/vendor/github.com/openshift/api/config/v1/zz_generated.featuregated-crd-manifests.yaml b/vendor/github.com/openshift/api/config/v1/zz_generated.featuregated-crd-manifests.yaml
index 286bbbd84..59c4bbea6 100644
--- a/vendor/github.com/openshift/api/config/v1/zz_generated.featuregated-crd-manifests.yaml
+++ b/vendor/github.com/openshift/api/config/v1/zz_generated.featuregated-crd-manifests.yaml
@@ -303,6 +303,7 @@ infrastructures.config.openshift.io:
- GCPClusterHostedDNS
- GCPLabelsTags
- VSphereControlPlaneMachineSet
+ - VSphereMultiVCenters
FilenameOperatorName: config-operator
FilenameOperatorOrdering: "01"
FilenameRunLevel: "0000_10"
diff --git a/vendor/github.com/openshift/api/features.md b/vendor/github.com/openshift/api/features.md
index b9000e90e..3e93133d7 100644
--- a/vendor/github.com/openshift/api/features.md
+++ b/vendor/github.com/openshift/api/features.md
@@ -1,12 +1,22 @@
| FeatureGate | Default on Hypershift | Default on SelfManagedHA | DevPreviewNoUpgrade on Hypershift | DevPreviewNoUpgrade on SelfManagedHA | TechPreviewNoUpgrade on Hypershift | TechPreviewNoUpgrade on SelfManagedHA |
| ------ | --- | --- | --- | --- | --- | --- |
| ClusterAPIInstall| | | | | | |
+| ClusterAPIInstallAWS| | | | | | |
+| ClusterAPIInstallAzure| | | | | | |
+| ClusterAPIInstallGCP| | | | | | |
+| ClusterAPIInstallIBMCloud| | | | | | |
+| ClusterAPIInstallNutanix| | | | | | |
+| ClusterAPIInstallOpenStack| | | | | | |
+| ClusterAPIInstallPowerVS| | | | | | |
+| ClusterAPIInstallVSphere| | | | | | |
| EventedPLEG| | | | | | |
| MachineAPIOperatorDisableMachineHealthCheckController| | | | | | |
| AutomatedEtcdBackup| | | Enabled | Enabled | Enabled | Enabled |
| CSIDriverSharedResource| | | Enabled | Enabled | Enabled | Enabled |
+| ChunkSizeMiB| | | Enabled | Enabled | Enabled | Enabled |
| DNSNameResolver| | | Enabled | Enabled | Enabled | Enabled |
| DynamicResourceAllocation| | | Enabled | Enabled | Enabled | Enabled |
+| EtcdBackendQuota| | | Enabled | Enabled | Enabled | Enabled |
| Example| | | Enabled | Enabled | Enabled | Enabled |
| ExternalRouteCertificate| | | Enabled | Enabled | Enabled | Enabled |
| GCPClusterHostedDNS| | | Enabled | Enabled | Enabled | Enabled |
@@ -41,6 +51,7 @@
| TranslateStreamCloseWebsocketRequests| | | Enabled | Enabled | Enabled | Enabled |
| UpgradeStatus| | | Enabled | Enabled | Enabled | Enabled |
| VSphereDriverConfiguration| | | Enabled | Enabled | Enabled | Enabled |
+| VSphereMultiVCenters| | | Enabled | Enabled | Enabled | Enabled |
| ValidatingAdmissionPolicy| | | Enabled | Enabled | Enabled | Enabled |
| VolumeGroupSnapshot| | | Enabled | Enabled | Enabled | Enabled |
| ExternalOIDC| Enabled | | Enabled | Enabled | Enabled | Enabled |
diff --git a/vendor/github.com/openshift/api/features/features.go b/vendor/github.com/openshift/api/features/features.go
index 04a17ca83..4d2482302 100644
--- a/vendor/github.com/openshift/api/features/features.go
+++ b/vendor/github.com/openshift/api/features/features.go
@@ -2,6 +2,7 @@ package features
import (
"fmt"
+
configv1 "github.com/openshift/api/config/v1"
)
@@ -202,6 +203,13 @@ var (
enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
mustRegister()
+ FeatureGateVSphereMultiVCenters = newFeatureGate("VSphereMultiVCenters").
+ reportProblemsToJiraComponent("splat").
+ contactPerson("vr4manta").
+ productScope(ocpSpecific).
+ enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+ mustRegister()
+
FeatureGateVSphereStaticIPs = newFeatureGate("VSphereStaticIPs").
reportProblemsToJiraComponent("splat").
contactPerson("rvanderp3").
@@ -244,6 +252,13 @@ var (
enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
mustRegister()
+ FeatureGateBackendQuotaGiB = newFeatureGate("EtcdBackendQuota").
+ reportProblemsToJiraComponent("etcd").
+ contactPerson("hasbro17").
+ productScope(ocpSpecific).
+ enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+ mustRegister()
+
FeatureGateAutomatedEtcdBackup = newFeatureGate("AutomatedEtcdBackup").
reportProblemsToJiraComponent("etcd").
contactPerson("hasbro17").
@@ -459,4 +474,59 @@ var (
productScope(ocpSpecific).
enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
mustRegister()
+
+ FeatureGateClusterAPIInstallAWS = newFeatureGate("ClusterAPIInstallAWS").
+ reportProblemsToJiraComponent("Installer").
+ contactPerson("r4f4").
+ productScope(ocpSpecific).
+ mustRegister()
+
+ FeatureGateClusterAPIInstallAzure = newFeatureGate("ClusterAPIInstallAzure").
+ reportProblemsToJiraComponent("Installer").
+ contactPerson("jhixson74").
+ productScope(ocpSpecific).
+ mustRegister()
+
+ FeatureGateClusterAPIInstallGCP = newFeatureGate("ClusterAPIInstallGCP").
+ reportProblemsToJiraComponent("Installer").
+ contactPerson("bfournie").
+ productScope(ocpSpecific).
+ mustRegister()
+
+ FeatureGateClusterAPIInstallIBMCloud = newFeatureGate("ClusterAPIInstallIBMCloud").
+ reportProblemsToJiraComponent("Installer").
+ contactPerson("cjschaef").
+ productScope(ocpSpecific).
+ mustRegister()
+
+ FeatureGateClusterAPIInstallNutanix = newFeatureGate("ClusterAPIInstallNutanix").
+ reportProblemsToJiraComponent("Installer").
+ contactPerson("yanhua121").
+ productScope(ocpSpecific).
+ mustRegister()
+
+ FeatureGateClusterAPIInstallOpenStack = newFeatureGate("ClusterAPIInstallOpenStack").
+ reportProblemsToJiraComponent("Installer").
+ contactPerson("stephenfin").
+ productScope(ocpSpecific).
+ mustRegister()
+
+ FeatureGateClusterAPIInstallPowerVS = newFeatureGate("ClusterAPIInstallPowerVS").
+ reportProblemsToJiraComponent("Installer").
+ contactPerson("mjturek").
+ productScope(ocpSpecific).
+ mustRegister()
+
+ FeatureGateClusterAPIInstallVSphere = newFeatureGate("ClusterAPIInstallVSphere").
+ reportProblemsToJiraComponent("Installer").
+ contactPerson("rvanderp3").
+ productScope(ocpSpecific).
+ mustRegister()
+
+ FeatureGateChunkSizeMiB = newFeatureGate("ChunkSizeMiB").
+ reportProblemsToJiraComponent("Image Registry").
+ contactPerson("flavianmissi").
+ productScope(ocpSpecific).
+ enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+ mustRegister()
)
diff --git a/vendor/github.com/openshift/api/imageregistry/v1/types.go b/vendor/github.com/openshift/api/imageregistry/v1/types.go
index aecdc8a3e..9b3cc21a4 100644
--- a/vendor/github.com/openshift/api/imageregistry/v1/types.go
+++ b/vendor/github.com/openshift/api/imageregistry/v1/types.go
@@ -82,6 +82,7 @@ type ImageRegistrySpec struct {
// requests controls how many parallel requests a given registry instance
// will handle before queuing additional requests.
// +optional
+ // +structType=atomic
Requests ImageRegistryConfigRequests `json:"requests,omitempty"`
// defaultRoute indicates whether an external facing route for the registry
// should be created using the default generated hostname.
@@ -90,6 +91,7 @@ type ImageRegistrySpec struct {
// routes defines additional external facing routes which should be
// created for the registry.
// +optional
+ // +listType=atomic
Routes []ImageRegistryConfigRoute `json:"routes,omitempty"`
// replicas determines the number of registry instances to run.
Replicas int32 `json:"replicas"`
@@ -98,6 +100,7 @@ type ImageRegistrySpec struct {
Logging int64 `json:"logging,omitempty"`
// resources defines the resource requests+limits for the registry pod.
// +optional
+ // +structType=atomic
Resources *corev1.ResourceRequirements `json:"resources,omitempty"`
// nodeSelector defines the node selection constraints for the registry
// pod.
@@ -105,6 +108,7 @@ type ImageRegistrySpec struct {
NodeSelector map[string]string `json:"nodeSelector,omitempty"`
// tolerations defines the tolerations for the registry pod.
// +optional
+ // +listType=atomic
Tolerations []corev1.Toleration `json:"tolerations,omitempty"`
// rolloutStrategy defines rollout strategy for the image registry
// deployment.
@@ -116,6 +120,7 @@ type ImageRegistrySpec struct {
Affinity *corev1.Affinity `json:"affinity,omitempty"`
// topologySpreadConstraints specify how to spread matching pods among the given topology.
// +optional
+ // +listType=atomic
TopologySpreadConstraints []corev1.TopologySpreadConstraint `json:"topologySpreadConstraints,omitempty"`
}
@@ -200,6 +205,17 @@ type ImageRegistryConfigStorageS3 struct {
// Optional, defaults based on the Region that is provided.
// +optional
RegionEndpoint string `json:"regionEndpoint,omitempty"`
+ // chunkSizeMiB defines the size of the multipart upload chunks of the S3 API.
+ // The S3 API requires multipart upload chunks to be at least 5MiB.
+ // When omitted, this means no opinion and the platform is left to choose a reasonable default, which is subject to change over time.
+ // The current default value is 10 MiB.
+ // The value is an integer number of MiB.
+ // The minimum value is 5 and the maximum value is 5120 (5 GiB).
+ // +kubebuilder:validation:Minimum=5
+ // +kubebuilder:validation:Maximum=5120
+ // +openshift:enable:FeatureGate=ChunkSizeMiB
+ // +optional
+ ChunkSizeMiB int32 `json:"chunkSizeMiB,omitempty"`
// encrypt specifies whether the registry stores the image in encrypted
// format or not.
// Optional, defaults to false.
diff --git a/vendor/github.com/openshift/api/imageregistry/v1/zz_generated.featuregated-crd-manifests.yaml b/vendor/github.com/openshift/api/imageregistry/v1/zz_generated.featuregated-crd-manifests.yaml
index 95613c7ae..a6ccc2262 100644
--- a/vendor/github.com/openshift/api/imageregistry/v1/zz_generated.featuregated-crd-manifests.yaml
+++ b/vendor/github.com/openshift/api/imageregistry/v1/zz_generated.featuregated-crd-manifests.yaml
@@ -4,7 +4,8 @@ configs.imageregistry.operator.openshift.io:
CRDName: configs.imageregistry.operator.openshift.io
Capability: ""
Category: ""
- FeatureGates: []
+ FeatureGates:
+ - ChunkSizeMiB
FilenameOperatorName: ""
FilenameOperatorOrdering: "00"
FilenameRunLevel: ""
diff --git a/vendor/github.com/openshift/api/imageregistry/v1/zz_generated.swagger_doc_generated.go b/vendor/github.com/openshift/api/imageregistry/v1/zz_generated.swagger_doc_generated.go
index 24d6d780d..ec999f309 100644
--- a/vendor/github.com/openshift/api/imageregistry/v1/zz_generated.swagger_doc_generated.go
+++ b/vendor/github.com/openshift/api/imageregistry/v1/zz_generated.swagger_doc_generated.go
@@ -191,6 +191,7 @@ var map_ImageRegistryConfigStorageS3 = map[string]string{
"bucket": "bucket is the bucket name in which you want to store the registry's data. Optional, will be generated if not provided.",
"region": "region is the AWS region in which your bucket exists. Optional, will be set based on the installed AWS Region.",
"regionEndpoint": "regionEndpoint is the endpoint for S3 compatible storage services. It should be a valid URL with scheme, e.g. https://s3.example.com. Optional, defaults based on the Region that is provided.",
+ "chunkSizeMiB": "chunkSizeMiB defines the size of the multipart upload chunks of the S3 API. The S3 API requires multipart upload chunks to be at least 5MiB. When omitted, this means no opinion and the platform is left to choose a reasonable default, which is subject to change over time. The current default value is 10 MiB. The value is an integer number of MiB. The minimum value is 5 and the maximum value is 5120 (5 GiB).",
"encrypt": "encrypt specifies whether the registry stores the image in encrypted format or not. Optional, defaults to false.",
"keyID": "keyID is the KMS key ID to use for encryption. Optional, Encrypt must be true, or this parameter is ignored.",
"cloudFront": "cloudFront configures Amazon Cloudfront as the storage middleware in a registry.",
diff --git a/vendor/github.com/openshift/api/operator/v1/types_etcd.go b/vendor/github.com/openshift/api/operator/v1/types_etcd.go
index a2ba12689..71345d7d7 100644
--- a/vendor/github.com/openshift/api/operator/v1/types_etcd.go
+++ b/vendor/github.com/openshift/api/operator/v1/types_etcd.go
@@ -43,6 +43,18 @@ type EtcdSpec struct {
// +openshift:enable:FeatureGate=HardwareSpeed
// +optional
HardwareSpeed ControlPlaneHardwareSpeed `json:"controlPlaneHardwareSpeed"`
+
+ // backendQuotaGiB sets the etcd backend storage size limit in gibibytes.
+ // The value should be an integer not less than 8 and not more than 32.
+ // When not specified, the default value is 8.
+ // +kubebuilder:default:=8
+ // +kubebuilder:validation:Minimum=8
+ // +kubebuilder:validation:Maximum=32
+ // +kubebuilder:validation:XValidation:rule="self>=oldSelf",message="etcd backendQuotaGiB may not be decreased"
+ // +openshift:enable:FeatureGate=EtcdBackendQuota
+ // +default=8
+ // +optional
+ BackendQuotaGiB int32 `json:"backendQuotaGiB,omitempty"`
}
type EtcdStatus struct {
diff --git a/vendor/github.com/openshift/api/operator/v1/types_machineconfiguration.go b/vendor/github.com/openshift/api/operator/v1/types_machineconfiguration.go
index 8bc06a4ec..b97ba2548 100644
--- a/vendor/github.com/openshift/api/operator/v1/types_machineconfiguration.go
+++ b/vendor/github.com/openshift/api/operator/v1/types_machineconfiguration.go
@@ -57,8 +57,39 @@ type MachineConfigurationSpec struct {
}
type MachineConfigurationStatus struct {
- // TODO tombstone this field
- StaticPodOperatorStatus `json:",inline"`
+ // observedGeneration is the last generation change you've dealt with
+ // +optional
+ ObservedGeneration int64 `json:"observedGeneration,omitempty"`
+
+ // conditions is a list of conditions and their status
+ // +patchMergeKey=type
+ // +patchStrategy=merge
+ // +listType=map
+ // +listMapKey=type
+ Conditions []metav1.Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type"`
+
+ // Previously there was a StaticPodOperatorStatus here for legacy reasons. Many of the fields within
+ // it are no longer relevant for the MachineConfiguration CRD's functions. The following remainder
+ // fields were tombstoned after lifting out StaticPodOperatorStatus. To avoid conflicts with
+ // serialisation, the following field names may never be used again.
+
+ // Tombstone: legacy field from StaticPodOperatorStatus
+ // Version string `json:"version,omitempty"`
+
+ // Tombstone: legacy field from StaticPodOperatorStatus
+ // ReadyReplicas int32 `json:"readyReplicas"`
+
+ // Tombstone: legacy field from StaticPodOperatorStatus
+ // Generations []GenerationStatus `json:"generations,omitempty"`
+
+ // Tombstone: legacy field from StaticPodOperatorStatus
+ // LatestAvailableRevision int32 `json:"latestAvailableRevision,omitempty"`
+
+ // Tombstone: legacy field from StaticPodOperatorStatus
+ // LatestAvailableRevisionReason string `json:"latestAvailableRevisionReason,omitempty"`
+
+ // Tombstone: legacy field from StaticPodOperatorStatus
+ // NodeStatuses []NodeStatus `json:"nodeStatuses,omitempty"`
// nodeDisruptionPolicyStatus status reflects what the latest cluster-validated policies are,
// and will be used by the Machine Config Daemon during future node updates.
diff --git a/vendor/github.com/openshift/api/operator/v1/types_network.go b/vendor/github.com/openshift/api/operator/v1/types_network.go
index 970be707e..b810e7859 100644
--- a/vendor/github.com/openshift/api/operator/v1/types_network.go
+++ b/vendor/github.com/openshift/api/operator/v1/types_network.go
@@ -135,7 +135,7 @@ const (
)
// NetworkMigration represents the cluster network configuration.
-// +openshift:validation:FeatureGateAwareXValidation:featureGate=NetworkLiveMigration,rule="!has(self.mtu) || !has(self.networkType) || self.networkType == '' || has(self.mode) && self.mode == 'Live'",message="networkType migration in mode other than 'Live' may not be configured at the same time as mtu migration"
+// +openshift:validation:FeatureGateAwareXValidation:featureGate=NetworkLiveMigration,rule="!has(self.mtu) || !has(self.networkType) || self.networkType == \"\" || has(self.mode) && self.mode == 'Live'",message="networkType migration in mode other than 'Live' may not be configured at the same time as mtu migration"
type NetworkMigration struct {
// networkType is the target type of network migration. Set this to the
// target network type to allow changing the default network. If unset, the
@@ -450,8 +450,8 @@ type IPv4OVNKubernetesConfig struct {
// The value must be in proper IPV4 CIDR format
// +kubebuilder:validation:MaxLength=18
// +kubebuilder:validation:XValidation:rule="isCIDR(self) && cidr(self).ip().family() == 4",message="Subnet must be in valid IPV4 CIDR format"
- // +kubebuilder:validation:XValidation:rule="[self.findAll('[0-9]+')[0]].all(x, x != '0' && int(x) <= 255 && !x.startsWith('0'))",message="first IP address octet must not contain leading zeros, must be greater than 0 and less or equal to 255"
- // +kubebuilder:validation:XValidation:rule="[int(self.split('/')[1])].all(x, x <= 30 && x >= 0)",message="subnet must be in the range /0 to /30 inclusive"
+ // +kubebuilder:validation:XValidation:rule="isCIDR(self) && cidr(self).prefixLength() <= 30",message="subnet must be in the range /0 to /30 inclusive"
+ // +kubebuilder:validation:XValidation:rule="isCIDR(self) && int(self.split('.')[0]) > 0",message="first IP address octet must not be 0"
// +optional
InternalTransitSwitchSubnet string `json:"internalTransitSwitchSubnet,omitempty"`
// internalJoinSubnet is a v4 subnet used internally by ovn-kubernetes in case the
@@ -464,8 +464,8 @@ type IPv4OVNKubernetesConfig struct {
// The value must be in proper IPV4 CIDR format
// +kubebuilder:validation:MaxLength=18
// +kubebuilder:validation:XValidation:rule="isCIDR(self) && cidr(self).ip().family() == 4",message="Subnet must be in valid IPV4 CIDR format"
- // +kubebuilder:validation:XValidation:rule="[self.findAll('[0-9]+')[0]].all(x, x != '0' && int(x) <= 255 && !x.startsWith('0'))",message="first IP address octet must not contain leading zeros, must be greater than 0 and less or equal to 255"
- // +kubebuilder:validation:XValidation:rule="[int(self.split('/')[1])].all(x, x <= 30 && x >= 0)",message="subnet must be in the range /0 to /30 inclusive"
+ // +kubebuilder:validation:XValidation:rule="isCIDR(self) && cidr(self).prefixLength() <= 30",message="subnet must be in the range /0 to /30 inclusive"
+ // +kubebuilder:validation:XValidation:rule="isCIDR(self) && int(self.split('.')[0]) > 0",message="first IP address octet must not be 0"
// +optional
InternalJoinSubnet string `json:"internalJoinSubnet,omitempty"`
}
@@ -484,10 +484,8 @@ type IPv6OVNKubernetesConfig struct {
// The value must be in proper IPV6 CIDR format
// Note that IPV6 dual addresses are not permitted
// +kubebuilder:validation:MaxLength=48
- // +kubebuilder:validation:XValidation:rule="isCIDR(self) && cidr(self).ip().family() == 6",message="Subnet must be in valid IPV6 CIDR format"
- // +kubebuilder:validation:XValidation:rule="self.split('/').size() == 2 && [int(self.split('/')[1])].all(x, x <= 125 && x >= 0)",message="subnet must be in the range /0 to /125 inclusive"
- // +kubebuilder:validation:XValidation:rule="self.contains('::') ? self.split('/')[0].split(':').size() <= 8 : self.split('/')[0].split(':').size() == 8",message="a valid IPv6 address must contain 8 segments unless elided (::), in which case it must contain at most 6 non-empty segments"
- // +kubebuilder:validation:XValidation:rule="!self.contains('.')",message="IPv6 dual addresses are not permitted, value should not contain `.` characters"
+ // +kubebuilder:validation:XValidation:rule="isCIDR(self) && cidr(self).ip().family() == 6",message="Subnet must be in valid IPV6 CIDR format"
+ // +kubebuilder:validation:XValidation:rule="isCIDR(self) && cidr(self).prefixLength() <= 125",message="subnet must be in the range /0 to /125 inclusive"
// +optional
InternalTransitSwitchSubnet string `json:"internalTransitSwitchSubnet,omitempty"`
// internalJoinSubnet is a v6 subnet used internally by ovn-kubernetes in case the
@@ -501,9 +499,7 @@ type IPv6OVNKubernetesConfig struct {
// Note that IPV6 dual addresses are not permitted
// +kubebuilder:validation:MaxLength=48
// +kubebuilder:validation:XValidation:rule="isCIDR(self) && cidr(self).ip().family() == 6",message="Subnet must be in valid IPV6 CIDR format"
- // +kubebuilder:validation:XValidation:rule="self.split('/').size() == 2 && [int(self.split('/')[1])].all(x, x <= 125 && x >= 0)",message="subnet must be in the range /0 to /125 inclusive"
- // +kubebuilder:validation:XValidation:rule="self.contains('::') ? self.split('/')[0].split(':').size() <= 8 : self.split('/')[0].split(':').size() == 8",message="a valid IPv6 address must contain 8 segments unless elided (::), in which case it must contain at most 6 non-empty segments"
- // +kubebuilder:validation:XValidation:rule="!self.contains('.')",message="IPv6 dual addresses are not permitted, value should not contain `.` characters"
+ // +kubebuilder:validation:XValidation:rule="isCIDR(self) && cidr(self).prefixLength() <= 125",message="subnet must be in the range /0 to /125 inclusive"
// +optional
InternalJoinSubnet string `json:"internalJoinSubnet,omitempty"`
}
@@ -581,11 +577,9 @@ type IPv4GatewayConfig struct {
// The current default subnet is 169.254.169.0/29
// The value must be in proper IPV4 CIDR format
// +kubebuilder:validation:MaxLength=18
- // +kubebuilder:validation:XValidation:rule="self.indexOf('/') == self.lastIndexOf('/')",message="CIDR format must contain exactly one '/'"
- // +kubebuilder:validation:XValidation:rule="[int(self.split('/')[1])].all(x, x <= 29 && x >= 0)",message="subnet must be in the range /0 to /29 inclusive"
- // +kubebuilder:validation:XValidation:rule="self.split('/')[0].split('.').size() == 4",message="a valid IPv4 address must contain 4 octets"
- // +kubebuilder:validation:XValidation:rule="[self.findAll('[0-9]+')[0]].all(x, x != '0' && int(x) <= 255 && !x.startsWith('0'))",message="first IP address octet must not contain leading zeros, must be greater than 0 and less or equal to 255"
- // +kubebuilder:validation:XValidation:rule="[self.findAll('[0-9]+')[1], self.findAll('[0-9]+')[2], self.findAll('[0-9]+')[3]].all(x, int(x) <= 255 && (x == '0' || !x.startsWith('0')))",message="IP address octets must not contain leading zeros, and must be less or equal to 255"
+ // +kubebuilder:validation:XValidation:rule="isCIDR(self) && cidr(self).ip().family() == 4",message="Subnet must be in valid IPV4 CIDR format"
+ // +kubebuilder:validation:XValidation:rule="isCIDR(self) && cidr(self).prefixLength() <= 29",message="subnet must be in the range /0 to /29 inclusive"
+ // +kubebuilder:validation:XValidation:rule="isCIDR(self) && int(self.split('.')[0]) > 0",message="first IP address octet must not be 0"
// +optional
InternalMasqueradeSubnet string `json:"internalMasqueradeSubnet,omitempty"`
}
@@ -601,19 +595,8 @@ type IPv6GatewayConfig struct {
// When omitted, this means no opinion and the platform is left to choose a reasonable default which is subject to change over time.
// The current default subnet is fd69::/125
// Note that IPV6 dual addresses are not permitted
- // +kubebuilder:validation:XValidation:rule="self.indexOf('/') == self.lastIndexOf('/')",message="CIDR format must contain exactly one '/'"
- // +kubebuilder:validation:XValidation:rule="self.split('/').size() == 2 && [int(self.split('/')[1])].all(x, x <= 125 && x >= 0)",message="subnet must be in the range /0 to /125 inclusive"
- // +kubebuilder:validation:XValidation:rule="self.indexOf('::') == self.lastIndexOf('::')",message="IPv6 addresses must contain at most one '::' and may only be shortened once"
- // +kubebuilder:validation:XValidation:rule="self.contains('::') ? self.split('/')[0].split(':').size() <= 8 : self.split('/')[0].split(':').size() == 8",message="a valid IPv6 address must contain 8 segments unless elided (::), in which case it must contain at most 6 non-empty segments"
- // +kubebuilder:validation:XValidation:rule="self.split('/')[0].split(':').size() >=1 ? [self.split('/')[0].split(':', 8)[0]].all(x, x == '' || (x.matches('^[0-9A-Fa-f]{1,4}$')) && size(x)<5 ) : true",message="each segment of an IPv6 address must be a hexadecimal number between 0 and FFFF, failed on segment 1"
- // +kubebuilder:validation:XValidation:rule="self.split('/')[0].split(':').size() >=2 ? [self.split('/')[0].split(':', 8)[1]].all(x, x == '' || (x.matches('^[0-9A-Fa-f]{1,4}$')) && size(x)<5 ) : true",message="each segment of an IPv6 address must be a hexadecimal number between 0 and FFFF, failed on segment 2"
- // +kubebuilder:validation:XValidation:rule="self.split('/')[0].split(':').size() >=3 ? [self.split('/')[0].split(':', 8)[2]].all(x, x == '' || (x.matches('^[0-9A-Fa-f]{1,4}$')) && size(x)<5 ) : true",message="each segment of an IPv6 address must be a hexadecimal number between 0 and FFFF, failed on segment 3"
- // +kubebuilder:validation:XValidation:rule="self.split('/')[0].split(':').size() >=4 ? [self.split('/')[0].split(':', 8)[3]].all(x, x == '' || (x.matches('^[0-9A-Fa-f]{1,4}$')) && size(x)<5 ) : true",message="each segment of an IPv6 address must be a hexadecimal number between 0 and FFFF, failed on segment 4"
- // +kubebuilder:validation:XValidation:rule="self.split('/')[0].split(':').size() >=5 ? [self.split('/')[0].split(':', 8)[4]].all(x, x == '' || (x.matches('^[0-9A-Fa-f]{1,4}$')) && size(x)<5 ) : true",message="each segment of an IPv6 address must be a hexadecimal number between 0 and FFFF, failed on segment 5"
- // +kubebuilder:validation:XValidation:rule="self.split('/')[0].split(':').size() >=6 ? [self.split('/')[0].split(':', 8)[5]].all(x, x == '' || (x.matches('^[0-9A-Fa-f]{1,4}$')) && size(x)<5 ) : true",message="each segment of an IPv6 address must be a hexadecimal number between 0 and FFFF, failed on segment 6"
- // +kubebuilder:validation:XValidation:rule="self.split('/')[0].split(':').size() >=7 ? [self.split('/')[0].split(':', 8)[6]].all(x, x == '' || (x.matches('^[0-9A-Fa-f]{1,4}$')) && size(x)<5 ) : true",message="each segment of an IPv6 address must be a hexadecimal number between 0 and FFFF, failed on segment 7"
- // +kubebuilder:validation:XValidation:rule="self.split('/')[0].split(':').size() >=8 ? [self.split('/')[0].split(':', 8)[7]].all(x, x == '' || (x.matches('^[0-9A-Fa-f]{1,4}$')) && size(x)<5 ) : true",message="each segment of an IPv6 address must be a hexadecimal number between 0 and FFFF, failed on segment 8"
- // +kubebuilder:validation:XValidation:rule="!self.contains('.')",message="IPv6 dual addresses are not permitted, value should not contain `.` characters"
+ // +kubebuilder:validation:XValidation:rule="isCIDR(self) && cidr(self).ip().family() == 6",message="Subnet must be in valid IPV6 CIDR format"
+ // +kubebuilder:validation:XValidation:rule="isCIDR(self) && cidr(self).prefixLength() <= 125",message="subnet must be in the range /0 to /125 inclusive"
// +optional
InternalMasqueradeSubnet string `json:"internalMasqueradeSubnet,omitempty"`
}
diff --git a/vendor/github.com/openshift/api/operator/v1/zz_generated.crd-manifests/0000_12_etcd_01_etcds-CustomNoUpgrade.crd.yaml b/vendor/github.com/openshift/api/operator/v1/zz_generated.crd-manifests/0000_12_etcd_01_etcds-CustomNoUpgrade.crd.yaml
index ea5b9116e..c80b66824 100644
--- a/vendor/github.com/openshift/api/operator/v1/zz_generated.crd-manifests/0000_12_etcd_01_etcds-CustomNoUpgrade.crd.yaml
+++ b/vendor/github.com/openshift/api/operator/v1/zz_generated.crd-manifests/0000_12_etcd_01_etcds-CustomNoUpgrade.crd.yaml
@@ -40,6 +40,18 @@ spec:
type: object
spec:
properties:
+ backendQuotaGiB:
+ default: 8
+ description: backendQuotaGiB sets the etcd backend storage size limit
+ in gibibytes. The value should be an integer not less than 8 and
+ not more than 32. When not specified, the default value is 8.
+ format: int32
+ maximum: 32
+ minimum: 8
+ type: integer
+ x-kubernetes-validations:
+ - message: etcd backendQuotaGiB may not be decreased
+ rule: self>=oldSelf
controlPlaneHardwareSpeed:
description: HardwareSpeed allows user to change the etcd tuning profile
which configures the latency parameters for heartbeat interval and
diff --git a/vendor/github.com/openshift/api/operator/v1/zz_generated.crd-manifests/0000_12_etcd_01_etcds-DevPreviewNoUpgrade.crd.yaml b/vendor/github.com/openshift/api/operator/v1/zz_generated.crd-manifests/0000_12_etcd_01_etcds-DevPreviewNoUpgrade.crd.yaml
index 2e426af02..7b181f78e 100644
--- a/vendor/github.com/openshift/api/operator/v1/zz_generated.crd-manifests/0000_12_etcd_01_etcds-DevPreviewNoUpgrade.crd.yaml
+++ b/vendor/github.com/openshift/api/operator/v1/zz_generated.crd-manifests/0000_12_etcd_01_etcds-DevPreviewNoUpgrade.crd.yaml
@@ -40,6 +40,18 @@ spec:
type: object
spec:
properties:
+ backendQuotaGiB:
+ default: 8
+ description: backendQuotaGiB sets the etcd backend storage size limit
+ in gibibytes. The value should be an integer not less than 8 and
+ not more than 32. When not specified, the default value is 8.
+ format: int32
+ maximum: 32
+ minimum: 8
+ type: integer
+ x-kubernetes-validations:
+ - message: etcd backendQuotaGiB may not be decreased
+ rule: self>=oldSelf
controlPlaneHardwareSpeed:
description: HardwareSpeed allows user to change the etcd tuning profile
which configures the latency parameters for heartbeat interval and
diff --git a/vendor/github.com/openshift/api/operator/v1/zz_generated.crd-manifests/0000_12_etcd_01_etcds-TechPreviewNoUpgrade.crd.yaml b/vendor/github.com/openshift/api/operator/v1/zz_generated.crd-manifests/0000_12_etcd_01_etcds-TechPreviewNoUpgrade.crd.yaml
index 5026260cd..28cbf7edb 100644
--- a/vendor/github.com/openshift/api/operator/v1/zz_generated.crd-manifests/0000_12_etcd_01_etcds-TechPreviewNoUpgrade.crd.yaml
+++ b/vendor/github.com/openshift/api/operator/v1/zz_generated.crd-manifests/0000_12_etcd_01_etcds-TechPreviewNoUpgrade.crd.yaml
@@ -40,6 +40,18 @@ spec:
type: object
spec:
properties:
+ backendQuotaGiB:
+ default: 8
+ description: backendQuotaGiB sets the etcd backend storage size limit
+ in gibibytes. The value should be an integer not less than 8 and
+ not more than 32. When not specified, the default value is 8.
+ format: int32
+ maximum: 32
+ minimum: 8
+ type: integer
+ x-kubernetes-validations:
+ - message: etcd backendQuotaGiB may not be decreased
+ rule: self>=oldSelf
controlPlaneHardwareSpeed:
description: HardwareSpeed allows user to change the etcd tuning profile
which configures the latency parameters for heartbeat interval and
diff --git a/vendor/github.com/openshift/api/operator/v1/zz_generated.crd-manifests/0000_70_network_01_networks.crd.yaml b/vendor/github.com/openshift/api/operator/v1/zz_generated.crd-manifests/0000_70_network_01_networks.crd.yaml
index 5cbe491c5..a72085245 100644
--- a/vendor/github.com/openshift/api/operator/v1/zz_generated.crd-manifests/0000_70_network_01_networks.crd.yaml
+++ b/vendor/github.com/openshift/api/operator/v1/zz_generated.crd-manifests/0000_70_network_01_networks.crd.yaml
@@ -278,23 +278,15 @@ spec:
maxLength: 18
type: string
x-kubernetes-validations:
- - message: CIDR format must contain exactly one '/'
- rule: self.indexOf('/') == self.lastIndexOf('/')
+ - message: Subnet must be in valid IPV4 CIDR format
+ rule: isCIDR(self) && cidr(self).ip().family() ==
+ 4
- message: subnet must be in the range /0 to /29 inclusive
- rule: '[int(self.split(''/'')[1])].all(x, x <= 29
- && x >= 0)'
- - message: a valid IPv4 address must contain 4 octets
- rule: self.split('/')[0].split('.').size() == 4
- - message: first IP address octet must not contain
- leading zeros, must be greater than 0 and less
- or equal to 255
- rule: '[self.findAll(''[0-9]+'')[0]].all(x, x !=
- ''0'' && int(x) <= 255 && !x.startsWith(''0''))'
- - message: IP address octets must not contain leading
- zeros, and must be less or equal to 255
- rule: '[self.findAll(''[0-9]+'')[1], self.findAll(''[0-9]+'')[2],
- self.findAll(''[0-9]+'')[3]].all(x, int(x) <=
- 255 && (x == ''0'' || !x.startsWith(''0'')))'
+ rule: isCIDR(self) && cidr(self).prefixLength()
+ <= 29
+ - message: first IP address octet must not be 0
+ rule: isCIDR(self) && int(self.split('.')[0]) >
+ 0
type: object
ipv6:
description: ipv6 allows users to configure IP settings
@@ -320,80 +312,13 @@ spec:
Note that IPV6 dual addresses are not permitted
type: string
x-kubernetes-validations:
- - message: CIDR format must contain exactly one '/'
- rule: self.indexOf('/') == self.lastIndexOf('/')
+ - message: Subnet must be in valid IPV6 CIDR format
+ rule: isCIDR(self) && cidr(self).ip().family() ==
+ 6
- message: subnet must be in the range /0 to /125
inclusive
- rule: self.split('/').size() == 2 && [int(self.split('/')[1])].all(x,
- x <= 125 && x >= 0)
- - message: IPv6 addresses must contain at most one
- '::' and may only be shortened once
- rule: self.indexOf('::') == self.lastIndexOf('::')
- - message: a valid IPv6 address must contain 8 segments
- unless elided (::), in which case it must contain
- at most 6 non-empty segments
- rule: 'self.contains(''::'') ? self.split(''/'')[0].split('':'').size()
- <= 8 : self.split(''/'')[0].split('':'').size()
- == 8'
- - message: each segment of an IPv6 address must be
- a hexadecimal number between 0 and FFFF, failed
- on segment 1
- rule: 'self.split(''/'')[0].split('':'').size()
- >=1 ? [self.split(''/'')[0].split('':'', 8)[0]].all(x,
- x == '''' || (x.matches(''^[0-9A-Fa-f]{1,4}$''))
- && size(x)<5 ) : true'
- - message: each segment of an IPv6 address must be
- a hexadecimal number between 0 and FFFF, failed
- on segment 2
- rule: 'self.split(''/'')[0].split('':'').size()
- >=2 ? [self.split(''/'')[0].split('':'', 8)[1]].all(x,
- x == '''' || (x.matches(''^[0-9A-Fa-f]{1,4}$''))
- && size(x)<5 ) : true'
- - message: each segment of an IPv6 address must be
- a hexadecimal number between 0 and FFFF, failed
- on segment 3
- rule: 'self.split(''/'')[0].split('':'').size()
- >=3 ? [self.split(''/'')[0].split('':'', 8)[2]].all(x,
- x == '''' || (x.matches(''^[0-9A-Fa-f]{1,4}$''))
- && size(x)<5 ) : true'
- - message: each segment of an IPv6 address must be
- a hexadecimal number between 0 and FFFF, failed
- on segment 4
- rule: 'self.split(''/'')[0].split('':'').size()
- >=4 ? [self.split(''/'')[0].split('':'', 8)[3]].all(x,
- x == '''' || (x.matches(''^[0-9A-Fa-f]{1,4}$''))
- && size(x)<5 ) : true'
- - message: each segment of an IPv6 address must be
- a hexadecimal number between 0 and FFFF, failed
- on segment 5
- rule: 'self.split(''/'')[0].split('':'').size()
- >=5 ? [self.split(''/'')[0].split('':'', 8)[4]].all(x,
- x == '''' || (x.matches(''^[0-9A-Fa-f]{1,4}$''))
- && size(x)<5 ) : true'
- - message: each segment of an IPv6 address must be
- a hexadecimal number between 0 and FFFF, failed
- on segment 6
- rule: 'self.split(''/'')[0].split('':'').size()
- >=6 ? [self.split(''/'')[0].split('':'', 8)[5]].all(x,
- x == '''' || (x.matches(''^[0-9A-Fa-f]{1,4}$''))
- && size(x)<5 ) : true'
- - message: each segment of an IPv6 address must be
- a hexadecimal number between 0 and FFFF, failed
- on segment 7
- rule: 'self.split(''/'')[0].split('':'').size()
- >=7 ? [self.split(''/'')[0].split('':'', 8)[6]].all(x,
- x == '''' || (x.matches(''^[0-9A-Fa-f]{1,4}$''))
- && size(x)<5 ) : true'
- - message: each segment of an IPv6 address must be
- a hexadecimal number between 0 and FFFF, failed
- on segment 8
- rule: 'self.split(''/'')[0].split('':'').size()
- >=8 ? [self.split(''/'')[0].split('':'', 8)[7]].all(x,
- x == '''' || (x.matches(''^[0-9A-Fa-f]{1,4}$''))
- && size(x)<5 ) : true'
- - message: IPv6 dual addresses are not permitted,
- value should not contain `.` characters
- rule: '!self.contains(''.'')'
+ rule: isCIDR(self) && cidr(self).prefixLength()
+ <= 125
type: object
routingViaHost:
default: false
@@ -493,14 +418,10 @@ spec:
x-kubernetes-validations:
- message: Subnet must be in valid IPV4 CIDR format
rule: isCIDR(self) && cidr(self).ip().family() == 4
- - message: first IP address octet must not contain leading
- zeros, must be greater than 0 and less or equal to
- 255
- rule: '[self.findAll(''[0-9]+'')[0]].all(x, x != ''0''
- && int(x) <= 255 && !x.startsWith(''0''))'
- message: subnet must be in the range /0 to /30 inclusive
- rule: '[int(self.split(''/'')[1])].all(x, x <= 30 &&
- x >= 0)'
+ rule: isCIDR(self) && cidr(self).prefixLength() <= 30
+ - message: first IP address octet must not be 0
+ rule: isCIDR(self) && int(self.split('.')[0]) > 0
internalTransitSwitchSubnet:
description: internalTransitSwitchSubnet is a v4 subnet
in IPV4 CIDR format used internally by OVN-Kubernetes
@@ -521,14 +442,10 @@ spec:
x-kubernetes-validations:
- message: Subnet must be in valid IPV4 CIDR format
rule: isCIDR(self) && cidr(self).ip().family() == 4
- - message: first IP address octet must not contain leading
- zeros, must be greater than 0 and less or equal to
- 255
- rule: '[self.findAll(''[0-9]+'')[0]].all(x, x != ''0''
- && int(x) <= 255 && !x.startsWith(''0''))'
- message: subnet must be in the range /0 to /30 inclusive
- rule: '[int(self.split(''/'')[1])].all(x, x <= 30 &&
- x >= 0)'
+ rule: isCIDR(self) && cidr(self).prefixLength() <= 30
+ - message: first IP address octet must not be 0
+ rule: isCIDR(self) && int(self.split('.')[0]) > 0
type: object
ipv6:
description: ipv6 allows users to configure IP settings for
@@ -553,17 +470,7 @@ spec:
- message: Subnet must be in valid IPV6 CIDR format
rule: isCIDR(self) && cidr(self).ip().family() == 6
- message: subnet must be in the range /0 to /125 inclusive
- rule: self.split('/').size() == 2 && [int(self.split('/')[1])].all(x,
- x <= 125 && x >= 0)
- - message: a valid IPv6 address must contain 8 segments
- unless elided (::), in which case it must contain
- at most 6 non-empty segments
- rule: 'self.contains(''::'') ? self.split(''/'')[0].split('':'').size()
- <= 8 : self.split(''/'')[0].split('':'').size() ==
- 8'
- - message: IPv6 dual addresses are not permitted, value
- should not contain `.` characters
- rule: '!self.contains(''.'')'
+ rule: isCIDR(self) && cidr(self).prefixLength() <= 125
internalTransitSwitchSubnet:
description: internalTransitSwitchSubnet is a v4 subnet
in IPV4 CIDR format used internally by OVN-Kubernetes
@@ -586,17 +493,7 @@ spec:
- message: Subnet must be in valid IPV6 CIDR format
rule: isCIDR(self) && cidr(self).ip().family() == 6
- message: subnet must be in the range /0 to /125 inclusive
- rule: self.split('/').size() == 2 && [int(self.split('/')[1])].all(x,
- x <= 125 && x >= 0)
- - message: a valid IPv6 address must contain 8 segments
- unless elided (::), in which case it must contain
- at most 6 non-empty segments
- rule: 'self.contains(''::'') ? self.split(''/'')[0].split('':'').size()
- <= 8 : self.split(''/'')[0].split('':'').size() ==
- 8'
- - message: IPv6 dual addresses are not permitted, value
- should not contain `.` characters
- rule: '!self.contains(''.'')'
+ rule: isCIDR(self) && cidr(self).prefixLength() <= 125
type: object
mtu:
description: mtu is the MTU to use for the tunnel interface.
@@ -891,7 +788,7 @@ spec:
- message: networkType migration in mode other than 'Live' may not
be configured at the same time as mtu migration
rule: '!has(self.mtu) || !has(self.networkType) || self.networkType
- == '''' || has(self.mode) && self.mode == ''Live'''
+ == "" || has(self.mode) && self.mode == ''Live'''
observedConfig:
description: observedConfig holds a sparse config that controller
has observed from the cluster state. It exists in spec because
diff --git a/vendor/github.com/openshift/api/operator/v1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfigurations-CustomNoUpgrade.crd.yaml b/vendor/github.com/openshift/api/operator/v1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfigurations-CustomNoUpgrade.crd.yaml
index dbeb9e929..f8e237504 100644
--- a/vendor/github.com/openshift/api/operator/v1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfigurations-CustomNoUpgrade.crd.yaml
+++ b/vendor/github.com/openshift/api/operator/v1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfigurations-CustomNoUpgrade.crd.yaml
@@ -698,68 +698,75 @@ spec:
conditions:
description: conditions is a list of conditions and their status
items:
- description: OperatorCondition is just the standard condition fields.
+ description: "Condition contains details for one aspect of the current
+ state of this API Resource. --- This struct is intended for direct
+ use as an array at the field path .status.conditions. For example,
+ \n type FooStatus struct{ // Represents the observations of a
+ foo's current state. // Known .status.conditions.type are: \"Available\",
+ \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge
+ // +listType=map // +listMapKey=type Conditions []metav1.Condition
+ `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
+ protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
properties:
lastTransitionTime:
+ description: lastTransitionTime is the last time the condition
+ transitioned from one status to another. This should be when
+ the underlying condition changed. If that is not known, then
+ using the time when the API field changed is acceptable.
format: date-time
type: string
message:
+ description: message is a human readable message indicating
+ details about the transition. This may be an empty string.
+ maxLength: 32768
type: string
+ observedGeneration:
+ description: observedGeneration represents the .metadata.generation
+ that the condition was set based upon. For instance, if .metadata.generation
+ is currently 12, but the .status.conditions[x].observedGeneration
+ is 9, the condition is out of date with respect to the current
+ state of the instance.
+ format: int64
+ minimum: 0
+ type: integer
reason:
+ description: reason contains a programmatic identifier indicating
+ the reason for the condition's last transition. Producers
+ of specific condition types may define expected values and
+ meanings for this field, and whether the values are considered
+ a guaranteed API. The value should be a CamelCase string.
+ This field may not be empty.
+ maxLength: 1024
+ minLength: 1
+ pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
type: string
status:
+ description: status of the condition, one of True, False, Unknown.
+ enum:
+ - "True"
+ - "False"
+ - Unknown
type: string
type:
+ description: type of condition in CamelCase or in foo.example.com/CamelCase.
+ --- Many .condition.type values are consistent across resources
+ like Available, but because arbitrary conditions can be useful
+ (see .node.status.conditions), the ability to deconflict is
+ important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
+ maxLength: 316
+ pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
type: string
required:
+ - lastTransitionTime
+ - message
+ - reason
+ - status
- type
type: object
type: array
x-kubernetes-list-map-keys:
- type
x-kubernetes-list-type: map
- generations:
- description: generations are used to determine when an item needs
- to be reconciled or has changed in a way that needs a reaction.
- items:
- description: GenerationStatus keeps track of the generation for
- a given resource so that decisions about forced updates can be
- made.
- properties:
- group:
- description: group is the group of the thing you're tracking
- type: string
- hash:
- description: hash is an optional field set for resources without
- generation that are content sensitive like secrets and configmaps
- type: string
- lastGeneration:
- description: lastGeneration is the last generation of the workload
- controller involved
- format: int64
- type: integer
- name:
- description: name is the name of the thing you're tracking
- type: string
- namespace:
- description: namespace is where the thing you're tracking is
- type: string
- resource:
- description: resource is the resource type of the thing you're
- tracking
- type: string
- type: object
- type: array
- x-kubernetes-list-type: atomic
- latestAvailableRevision:
- description: latestAvailableRevision is the deploymentID of the most
- recent deployment
- format: int32
- type: integer
- latestAvailableRevisionReason:
- description: latestAvailableRevisionReason describe the detailed reason
- for the most recent deployment
- type: string
nodeDisruptionPolicyStatus:
description: nodeDisruptionPolicyStatus status reflects what the latest
cluster-validated policies are, and will be used by the Machine
@@ -1213,75 +1220,11 @@ spec:
x-kubernetes-list-type: map
type: object
type: object
- nodeStatuses:
- description: nodeStatuses track the deployment values and errors across
- individual nodes
- items:
- description: NodeStatus provides information about the current state
- of a particular node managed by this operator.
- properties:
- currentRevision:
- description: currentRevision is the generation of the most recently
- successful deployment
- format: int32
- type: integer
- lastFailedCount:
- description: lastFailedCount is how often the installer pod
- of the last failed revision failed.
- type: integer
- lastFailedReason:
- description: lastFailedReason is a machine readable failure
- reason string.
- type: string
- lastFailedRevision:
- description: lastFailedRevision is the generation of the deployment
- we tried and failed to deploy.
- format: int32
- type: integer
- lastFailedRevisionErrors:
- description: lastFailedRevisionErrors is a list of human readable
- errors during the failed deployment referenced in lastFailedRevision.
- items:
- type: string
- type: array
- x-kubernetes-list-type: atomic
- lastFailedTime:
- description: lastFailedTime is the time the last failed revision
- failed the last time.
- format: date-time
- type: string
- lastFallbackCount:
- description: lastFallbackCount is how often a fallback to a
- previous revision happened.
- type: integer
- nodeName:
- description: nodeName is the name of the node
- type: string
- targetRevision:
- description: targetRevision is the generation of the deployment
- we're trying to apply
- format: int32
- type: integer
- required:
- - nodeName
- type: object
- type: array
- x-kubernetes-list-map-keys:
- - nodeName
- x-kubernetes-list-type: map
observedGeneration:
description: observedGeneration is the last generation change you've
dealt with
format: int64
type: integer
- readyReplicas:
- description: readyReplicas indicates how many replicas are ready and
- at the desired state
- format: int32
- type: integer
- version:
- description: version is the level this availability applies to
- type: string
type: object
required:
- spec
diff --git a/vendor/github.com/openshift/api/operator/v1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfigurations-Default.crd.yaml b/vendor/github.com/openshift/api/operator/v1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfigurations-Default.crd.yaml
index 5cd178c2c..9300526eb 100644
--- a/vendor/github.com/openshift/api/operator/v1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfigurations-Default.crd.yaml
+++ b/vendor/github.com/openshift/api/operator/v1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfigurations-Default.crd.yaml
@@ -119,137 +119,80 @@ spec:
conditions:
description: conditions is a list of conditions and their status
items:
- description: OperatorCondition is just the standard condition fields.
+ description: "Condition contains details for one aspect of the current
+ state of this API Resource. --- This struct is intended for direct
+ use as an array at the field path .status.conditions. For example,
+ \n type FooStatus struct{ // Represents the observations of a
+ foo's current state. // Known .status.conditions.type are: \"Available\",
+ \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge
+ // +listType=map // +listMapKey=type Conditions []metav1.Condition
+ `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
+ protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
properties:
lastTransitionTime:
+ description: lastTransitionTime is the last time the condition
+ transitioned from one status to another. This should be when
+ the underlying condition changed. If that is not known, then
+ using the time when the API field changed is acceptable.
format: date-time
type: string
message:
+ description: message is a human readable message indicating
+ details about the transition. This may be an empty string.
+ maxLength: 32768
type: string
+ observedGeneration:
+ description: observedGeneration represents the .metadata.generation
+ that the condition was set based upon. For instance, if .metadata.generation
+ is currently 12, but the .status.conditions[x].observedGeneration
+ is 9, the condition is out of date with respect to the current
+ state of the instance.
+ format: int64
+ minimum: 0
+ type: integer
reason:
+ description: reason contains a programmatic identifier indicating
+ the reason for the condition's last transition. Producers
+ of specific condition types may define expected values and
+ meanings for this field, and whether the values are considered
+ a guaranteed API. The value should be a CamelCase string.
+ This field may not be empty.
+ maxLength: 1024
+ minLength: 1
+ pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
type: string
status:
+ description: status of the condition, one of True, False, Unknown.
+ enum:
+ - "True"
+ - "False"
+ - Unknown
type: string
type:
+ description: type of condition in CamelCase or in foo.example.com/CamelCase.
+ --- Many .condition.type values are consistent across resources
+ like Available, but because arbitrary conditions can be useful
+ (see .node.status.conditions), the ability to deconflict is
+ important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
+ maxLength: 316
+ pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
type: string
required:
+ - lastTransitionTime
+ - message
+ - reason
+ - status
- type
type: object
type: array
x-kubernetes-list-map-keys:
- type
x-kubernetes-list-type: map
- generations:
- description: generations are used to determine when an item needs
- to be reconciled or has changed in a way that needs a reaction.
- items:
- description: GenerationStatus keeps track of the generation for
- a given resource so that decisions about forced updates can be
- made.
- properties:
- group:
- description: group is the group of the thing you're tracking
- type: string
- hash:
- description: hash is an optional field set for resources without
- generation that are content sensitive like secrets and configmaps
- type: string
- lastGeneration:
- description: lastGeneration is the last generation of the workload
- controller involved
- format: int64
- type: integer
- name:
- description: name is the name of the thing you're tracking
- type: string
- namespace:
- description: namespace is where the thing you're tracking is
- type: string
- resource:
- description: resource is the resource type of the thing you're
- tracking
- type: string
- type: object
- type: array
- x-kubernetes-list-type: atomic
- latestAvailableRevision:
- description: latestAvailableRevision is the deploymentID of the most
- recent deployment
- format: int32
- type: integer
- latestAvailableRevisionReason:
- description: latestAvailableRevisionReason describe the detailed reason
- for the most recent deployment
- type: string
- nodeStatuses:
- description: nodeStatuses track the deployment values and errors across
- individual nodes
- items:
- description: NodeStatus provides information about the current state
- of a particular node managed by this operator.
- properties:
- currentRevision:
- description: currentRevision is the generation of the most recently
- successful deployment
- format: int32
- type: integer
- lastFailedCount:
- description: lastFailedCount is how often the installer pod
- of the last failed revision failed.
- type: integer
- lastFailedReason:
- description: lastFailedReason is a machine readable failure
- reason string.
- type: string
- lastFailedRevision:
- description: lastFailedRevision is the generation of the deployment
- we tried and failed to deploy.
- format: int32
- type: integer
- lastFailedRevisionErrors:
- description: lastFailedRevisionErrors is a list of human readable
- errors during the failed deployment referenced in lastFailedRevision.
- items:
- type: string
- type: array
- x-kubernetes-list-type: atomic
- lastFailedTime:
- description: lastFailedTime is the time the last failed revision
- failed the last time.
- format: date-time
- type: string
- lastFallbackCount:
- description: lastFallbackCount is how often a fallback to a
- previous revision happened.
- type: integer
- nodeName:
- description: nodeName is the name of the node
- type: string
- targetRevision:
- description: targetRevision is the generation of the deployment
- we're trying to apply
- format: int32
- type: integer
- required:
- - nodeName
- type: object
- type: array
- x-kubernetes-list-map-keys:
- - nodeName
- x-kubernetes-list-type: map
observedGeneration:
description: observedGeneration is the last generation change you've
dealt with
format: int64
type: integer
- readyReplicas:
- description: readyReplicas indicates how many replicas are ready and
- at the desired state
- format: int32
- type: integer
- version:
- description: version is the level this availability applies to
- type: string
type: object
required:
- spec
diff --git a/vendor/github.com/openshift/api/operator/v1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfigurations-DevPreviewNoUpgrade.crd.yaml b/vendor/github.com/openshift/api/operator/v1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfigurations-DevPreviewNoUpgrade.crd.yaml
index 4f47e4631..21c6d9035 100644
--- a/vendor/github.com/openshift/api/operator/v1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfigurations-DevPreviewNoUpgrade.crd.yaml
+++ b/vendor/github.com/openshift/api/operator/v1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfigurations-DevPreviewNoUpgrade.crd.yaml
@@ -698,68 +698,75 @@ spec:
conditions:
description: conditions is a list of conditions and their status
items:
- description: OperatorCondition is just the standard condition fields.
+ description: "Condition contains details for one aspect of the current
+ state of this API Resource. --- This struct is intended for direct
+ use as an array at the field path .status.conditions. For example,
+ \n type FooStatus struct{ // Represents the observations of a
+ foo's current state. // Known .status.conditions.type are: \"Available\",
+ \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge
+ // +listType=map // +listMapKey=type Conditions []metav1.Condition
+ `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
+ protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
properties:
lastTransitionTime:
+ description: lastTransitionTime is the last time the condition
+ transitioned from one status to another. This should be when
+ the underlying condition changed. If that is not known, then
+ using the time when the API field changed is acceptable.
format: date-time
type: string
message:
+ description: message is a human readable message indicating
+ details about the transition. This may be an empty string.
+ maxLength: 32768
type: string
+ observedGeneration:
+ description: observedGeneration represents the .metadata.generation
+ that the condition was set based upon. For instance, if .metadata.generation
+ is currently 12, but the .status.conditions[x].observedGeneration
+ is 9, the condition is out of date with respect to the current
+ state of the instance.
+ format: int64
+ minimum: 0
+ type: integer
reason:
+ description: reason contains a programmatic identifier indicating
+ the reason for the condition's last transition. Producers
+ of specific condition types may define expected values and
+ meanings for this field, and whether the values are considered
+ a guaranteed API. The value should be a CamelCase string.
+ This field may not be empty.
+ maxLength: 1024
+ minLength: 1
+ pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
type: string
status:
+ description: status of the condition, one of True, False, Unknown.
+ enum:
+ - "True"
+ - "False"
+ - Unknown
type: string
type:
+ description: type of condition in CamelCase or in foo.example.com/CamelCase.
+ --- Many .condition.type values are consistent across resources
+ like Available, but because arbitrary conditions can be useful
+ (see .node.status.conditions), the ability to deconflict is
+ important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
+ maxLength: 316
+ pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
type: string
required:
+ - lastTransitionTime
+ - message
+ - reason
+ - status
- type
type: object
type: array
x-kubernetes-list-map-keys:
- type
x-kubernetes-list-type: map
- generations:
- description: generations are used to determine when an item needs
- to be reconciled or has changed in a way that needs a reaction.
- items:
- description: GenerationStatus keeps track of the generation for
- a given resource so that decisions about forced updates can be
- made.
- properties:
- group:
- description: group is the group of the thing you're tracking
- type: string
- hash:
- description: hash is an optional field set for resources without
- generation that are content sensitive like secrets and configmaps
- type: string
- lastGeneration:
- description: lastGeneration is the last generation of the workload
- controller involved
- format: int64
- type: integer
- name:
- description: name is the name of the thing you're tracking
- type: string
- namespace:
- description: namespace is where the thing you're tracking is
- type: string
- resource:
- description: resource is the resource type of the thing you're
- tracking
- type: string
- type: object
- type: array
- x-kubernetes-list-type: atomic
- latestAvailableRevision:
- description: latestAvailableRevision is the deploymentID of the most
- recent deployment
- format: int32
- type: integer
- latestAvailableRevisionReason:
- description: latestAvailableRevisionReason describe the detailed reason
- for the most recent deployment
- type: string
nodeDisruptionPolicyStatus:
description: nodeDisruptionPolicyStatus status reflects what the latest
cluster-validated policies are, and will be used by the Machine
@@ -1213,75 +1220,11 @@ spec:
x-kubernetes-list-type: map
type: object
type: object
- nodeStatuses:
- description: nodeStatuses track the deployment values and errors across
- individual nodes
- items:
- description: NodeStatus provides information about the current state
- of a particular node managed by this operator.
- properties:
- currentRevision:
- description: currentRevision is the generation of the most recently
- successful deployment
- format: int32
- type: integer
- lastFailedCount:
- description: lastFailedCount is how often the installer pod
- of the last failed revision failed.
- type: integer
- lastFailedReason:
- description: lastFailedReason is a machine readable failure
- reason string.
- type: string
- lastFailedRevision:
- description: lastFailedRevision is the generation of the deployment
- we tried and failed to deploy.
- format: int32
- type: integer
- lastFailedRevisionErrors:
- description: lastFailedRevisionErrors is a list of human readable
- errors during the failed deployment referenced in lastFailedRevision.
- items:
- type: string
- type: array
- x-kubernetes-list-type: atomic
- lastFailedTime:
- description: lastFailedTime is the time the last failed revision
- failed the last time.
- format: date-time
- type: string
- lastFallbackCount:
- description: lastFallbackCount is how often a fallback to a
- previous revision happened.
- type: integer
- nodeName:
- description: nodeName is the name of the node
- type: string
- targetRevision:
- description: targetRevision is the generation of the deployment
- we're trying to apply
- format: int32
- type: integer
- required:
- - nodeName
- type: object
- type: array
- x-kubernetes-list-map-keys:
- - nodeName
- x-kubernetes-list-type: map
observedGeneration:
description: observedGeneration is the last generation change you've
dealt with
format: int64
type: integer
- readyReplicas:
- description: readyReplicas indicates how many replicas are ready and
- at the desired state
- format: int32
- type: integer
- version:
- description: version is the level this availability applies to
- type: string
type: object
required:
- spec
diff --git a/vendor/github.com/openshift/api/operator/v1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfigurations-TechPreviewNoUpgrade.crd.yaml b/vendor/github.com/openshift/api/operator/v1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfigurations-TechPreviewNoUpgrade.crd.yaml
index bf7dab04a..9cd0051e8 100644
--- a/vendor/github.com/openshift/api/operator/v1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfigurations-TechPreviewNoUpgrade.crd.yaml
+++ b/vendor/github.com/openshift/api/operator/v1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfigurations-TechPreviewNoUpgrade.crd.yaml
@@ -698,68 +698,75 @@ spec:
conditions:
description: conditions is a list of conditions and their status
items:
- description: OperatorCondition is just the standard condition fields.
+ description: "Condition contains details for one aspect of the current
+ state of this API Resource. --- This struct is intended for direct
+ use as an array at the field path .status.conditions. For example,
+ \n type FooStatus struct{ // Represents the observations of a
+ foo's current state. // Known .status.conditions.type are: \"Available\",
+ \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge
+ // +listType=map // +listMapKey=type Conditions []metav1.Condition
+ `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
+ protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
properties:
lastTransitionTime:
+ description: lastTransitionTime is the last time the condition
+ transitioned from one status to another. This should be when
+ the underlying condition changed. If that is not known, then
+ using the time when the API field changed is acceptable.
format: date-time
type: string
message:
+ description: message is a human readable message indicating
+ details about the transition. This may be an empty string.
+ maxLength: 32768
type: string
+ observedGeneration:
+ description: observedGeneration represents the .metadata.generation
+ that the condition was set based upon. For instance, if .metadata.generation
+ is currently 12, but the .status.conditions[x].observedGeneration
+ is 9, the condition is out of date with respect to the current
+ state of the instance.
+ format: int64
+ minimum: 0
+ type: integer
reason:
+ description: reason contains a programmatic identifier indicating
+ the reason for the condition's last transition. Producers
+ of specific condition types may define expected values and
+ meanings for this field, and whether the values are considered
+ a guaranteed API. The value should be a CamelCase string.
+ This field may not be empty.
+ maxLength: 1024
+ minLength: 1
+ pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
type: string
status:
+ description: status of the condition, one of True, False, Unknown.
+ enum:
+ - "True"
+ - "False"
+ - Unknown
type: string
type:
+ description: type of condition in CamelCase or in foo.example.com/CamelCase.
+ --- Many .condition.type values are consistent across resources
+ like Available, but because arbitrary conditions can be useful
+ (see .node.status.conditions), the ability to deconflict is
+ important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
+ maxLength: 316
+ pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
type: string
required:
+ - lastTransitionTime
+ - message
+ - reason
+ - status
- type
type: object
type: array
x-kubernetes-list-map-keys:
- type
x-kubernetes-list-type: map
- generations:
- description: generations are used to determine when an item needs
- to be reconciled or has changed in a way that needs a reaction.
- items:
- description: GenerationStatus keeps track of the generation for
- a given resource so that decisions about forced updates can be
- made.
- properties:
- group:
- description: group is the group of the thing you're tracking
- type: string
- hash:
- description: hash is an optional field set for resources without
- generation that are content sensitive like secrets and configmaps
- type: string
- lastGeneration:
- description: lastGeneration is the last generation of the workload
- controller involved
- format: int64
- type: integer
- name:
- description: name is the name of the thing you're tracking
- type: string
- namespace:
- description: namespace is where the thing you're tracking is
- type: string
- resource:
- description: resource is the resource type of the thing you're
- tracking
- type: string
- type: object
- type: array
- x-kubernetes-list-type: atomic
- latestAvailableRevision:
- description: latestAvailableRevision is the deploymentID of the most
- recent deployment
- format: int32
- type: integer
- latestAvailableRevisionReason:
- description: latestAvailableRevisionReason describe the detailed reason
- for the most recent deployment
- type: string
nodeDisruptionPolicyStatus:
description: nodeDisruptionPolicyStatus status reflects what the latest
cluster-validated policies are, and will be used by the Machine
@@ -1213,75 +1220,11 @@ spec:
x-kubernetes-list-type: map
type: object
type: object
- nodeStatuses:
- description: nodeStatuses track the deployment values and errors across
- individual nodes
- items:
- description: NodeStatus provides information about the current state
- of a particular node managed by this operator.
- properties:
- currentRevision:
- description: currentRevision is the generation of the most recently
- successful deployment
- format: int32
- type: integer
- lastFailedCount:
- description: lastFailedCount is how often the installer pod
- of the last failed revision failed.
- type: integer
- lastFailedReason:
- description: lastFailedReason is a machine readable failure
- reason string.
- type: string
- lastFailedRevision:
- description: lastFailedRevision is the generation of the deployment
- we tried and failed to deploy.
- format: int32
- type: integer
- lastFailedRevisionErrors:
- description: lastFailedRevisionErrors is a list of human readable
- errors during the failed deployment referenced in lastFailedRevision.
- items:
- type: string
- type: array
- x-kubernetes-list-type: atomic
- lastFailedTime:
- description: lastFailedTime is the time the last failed revision
- failed the last time.
- format: date-time
- type: string
- lastFallbackCount:
- description: lastFallbackCount is how often a fallback to a
- previous revision happened.
- type: integer
- nodeName:
- description: nodeName is the name of the node
- type: string
- targetRevision:
- description: targetRevision is the generation of the deployment
- we're trying to apply
- format: int32
- type: integer
- required:
- - nodeName
- type: object
- type: array
- x-kubernetes-list-map-keys:
- - nodeName
- x-kubernetes-list-type: map
observedGeneration:
description: observedGeneration is the last generation change you've
dealt with
format: int64
type: integer
- readyReplicas:
- description: readyReplicas indicates how many replicas are ready and
- at the desired state
- format: int32
- type: integer
- version:
- description: version is the level this availability applies to
- type: string
type: object
required:
- spec
diff --git a/vendor/github.com/openshift/api/operator/v1/zz_generated.deepcopy.go b/vendor/github.com/openshift/api/operator/v1/zz_generated.deepcopy.go
index d41982f2a..8b8ef7691 100644
--- a/vendor/github.com/openshift/api/operator/v1/zz_generated.deepcopy.go
+++ b/vendor/github.com/openshift/api/operator/v1/zz_generated.deepcopy.go
@@ -2990,7 +2990,13 @@ func (in *MachineConfigurationSpec) DeepCopy() *MachineConfigurationSpec {
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *MachineConfigurationStatus) DeepCopyInto(out *MachineConfigurationStatus) {
*out = *in
- in.StaticPodOperatorStatus.DeepCopyInto(&out.StaticPodOperatorStatus)
+ if in.Conditions != nil {
+ in, out := &in.Conditions, &out.Conditions
+ *out = make([]metav1.Condition, len(*in))
+ for i := range *in {
+ (*in)[i].DeepCopyInto(&(*out)[i])
+ }
+ }
in.NodeDisruptionPolicyStatus.DeepCopyInto(&out.NodeDisruptionPolicyStatus)
return
}
diff --git a/vendor/github.com/openshift/api/operator/v1/zz_generated.featuregated-crd-manifests.yaml b/vendor/github.com/openshift/api/operator/v1/zz_generated.featuregated-crd-manifests.yaml
index 22992a02a..4b0295af9 100644
--- a/vendor/github.com/openshift/api/operator/v1/zz_generated.featuregated-crd-manifests.yaml
+++ b/vendor/github.com/openshift/api/operator/v1/zz_generated.featuregated-crd-manifests.yaml
@@ -154,6 +154,7 @@ etcds.operator.openshift.io:
Capability: ""
Category: coreoperators
FeatureGates:
+ - EtcdBackendQuota
- HardwareSpeed
FilenameOperatorName: etcd
FilenameOperatorOrdering: "01"
diff --git a/vendor/github.com/openshift/api/operator/v1/zz_generated.swagger_doc_generated.go b/vendor/github.com/openshift/api/operator/v1/zz_generated.swagger_doc_generated.go
index 81d4ce91e..09718520e 100644
--- a/vendor/github.com/openshift/api/operator/v1/zz_generated.swagger_doc_generated.go
+++ b/vendor/github.com/openshift/api/operator/v1/zz_generated.swagger_doc_generated.go
@@ -701,6 +701,7 @@ func (EtcdList) SwaggerDoc() map[string]string {
var map_EtcdSpec = map[string]string{
"controlPlaneHardwareSpeed": "HardwareSpeed allows user to change the etcd tuning profile which configures the latency parameters for heartbeat interval and leader election timeouts allowing the cluster to tolerate longer round-trip-times between etcd members. Valid values are \"\", \"Standard\" and \"Slower\".\n\t\"\" means no opinion and the platform is left to choose a reasonable default\n\twhich is subject to change without notice.",
+ "backendQuotaGiB": "backendQuotaGiB sets the etcd backend storage size limit in gibibytes. The value should be an integer not less than 8 and not more than 32. When not specified, the default value is 8.",
}
func (EtcdSpec) SwaggerDoc() map[string]string {
@@ -1288,6 +1289,8 @@ func (MachineConfigurationSpec) SwaggerDoc() map[string]string {
}
var map_MachineConfigurationStatus = map[string]string{
+ "observedGeneration": "observedGeneration is the last generation change you've dealt with",
+ "conditions": "conditions is a list of conditions and their status",
"nodeDisruptionPolicyStatus": "nodeDisruptionPolicyStatus status reflects what the latest cluster-validated policies are, and will be used by the Machine Config Daemon during future node updates.",
}
diff --git a/vendor/github.com/openshift/api/route/v1/generated.proto b/vendor/github.com/openshift/api/route/v1/generated.proto
index 1797fe770..621bec09b 100644
--- a/vendor/github.com/openshift/api/route/v1/generated.proto
+++ b/vendor/github.com/openshift/api/route/v1/generated.proto
@@ -436,8 +436,12 @@ message TLSConfig {
// insecureEdgeTerminationPolicy indicates the desired behavior for insecure connections to a route. While
// each router may make its own decisions on which ports to expose, this is normally port 80.
//
- // * Allow - traffic is sent to the server on the insecure port (edge/reencrypt terminations only) (default).
- // * None - no traffic is allowed on the insecure port.
+ // If a route does not specify insecureEdgeTerminationPolicy, then the default behavior is "None".
+ //
+ // * Allow - traffic is sent to the server on the insecure port (edge/reencrypt terminations only).
+ //
+ // * None - no traffic is allowed on the insecure port (default).
+ //
// * Redirect - clients are redirected to the secure port.
//
// +kubebuilder:validation:Enum=Allow;None;Redirect;""
diff --git a/vendor/github.com/openshift/api/route/v1/types.go b/vendor/github.com/openshift/api/route/v1/types.go
index cd5e5eced..fadc4b618 100644
--- a/vendor/github.com/openshift/api/route/v1/types.go
+++ b/vendor/github.com/openshift/api/route/v1/types.go
@@ -447,8 +447,12 @@ type TLSConfig struct {
// insecureEdgeTerminationPolicy indicates the desired behavior for insecure connections to a route. While
// each router may make its own decisions on which ports to expose, this is normally port 80.
//
- // * Allow - traffic is sent to the server on the insecure port (edge/reencrypt terminations only) (default).
- // * None - no traffic is allowed on the insecure port.
+ // If a route does not specify insecureEdgeTerminationPolicy, then the default behavior is "None".
+ //
+ // * Allow - traffic is sent to the server on the insecure port (edge/reencrypt terminations only).
+ //
+ // * None - no traffic is allowed on the insecure port (default).
+ //
// * Redirect - clients are redirected to the secure port.
//
// +kubebuilder:validation:Enum=Allow;None;Redirect;""
diff --git a/vendor/github.com/openshift/api/route/v1/zz_generated.swagger_doc_generated.go b/vendor/github.com/openshift/api/route/v1/zz_generated.swagger_doc_generated.go
index c65815a1c..56a4e23e3 100644
--- a/vendor/github.com/openshift/api/route/v1/zz_generated.swagger_doc_generated.go
+++ b/vendor/github.com/openshift/api/route/v1/zz_generated.swagger_doc_generated.go
@@ -178,7 +178,7 @@ var map_TLSConfig = map[string]string{
"key": "key provides key file contents",
"caCertificate": "caCertificate provides the cert authority certificate contents",
"destinationCACertificate": "destinationCACertificate provides the contents of the ca certificate of the final destination. When using reencrypt termination this file should be provided in order to have routers use it for health checks on the secure connection. If this field is not specified, the router may provide its own destination CA and perform hostname validation using the short service name (service.namespace.svc), which allows infrastructure generated certificates to automatically verify.",
- "insecureEdgeTerminationPolicy": "insecureEdgeTerminationPolicy indicates the desired behavior for insecure connections to a route. While each router may make its own decisions on which ports to expose, this is normally port 80.\n\n* Allow - traffic is sent to the server on the insecure port (edge/reencrypt terminations only) (default). * None - no traffic is allowed on the insecure port. * Redirect - clients are redirected to the secure port.",
+ "insecureEdgeTerminationPolicy": "insecureEdgeTerminationPolicy indicates the desired behavior for insecure connections to a route. While each router may make its own decisions on which ports to expose, this is normally port 80.\n\nIf a route does not specify insecureEdgeTerminationPolicy, then the default behavior is \"None\".\n\n* Allow - traffic is sent to the server on the insecure port (edge/reencrypt terminations only).\n\n* None - no traffic is allowed on the insecure port (default).\n\n* Redirect - clients are redirected to the secure port.",
"externalCertificate": "externalCertificate provides certificate contents as a secret reference. This should be a single serving certificate, not a certificate chain. Do not include a CA certificate. The secret referenced should be present in the same namespace as that of the Route. Forbidden when `certificate` is set.",
}
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 056a56b2e..070d8addb 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -163,7 +163,7 @@ github.com/modern-go/reflect2
# github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822
## explicit
github.com/munnerz/goautoneg
-# github.com/openshift/api v0.0.0-20240424142232-29a704bf5aa2
+# github.com/openshift/api v0.0.0-20240508125607-95e22923d553
## explicit; go 1.21
github.com/openshift/api
github.com/openshift/api/annotations