diff --git a/go.mod b/go.mod index 56425afac2..da2cc2f0c3 100644 --- a/go.mod +++ b/go.mod @@ -123,3 +123,6 @@ require ( sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect sigs.k8s.io/yaml v1.3.0 // indirect ) + +// DO NOT MERGE: testing https://issues.redhat.com/browse/STOR-1267 +replace github.com/openshift/api => /home/jon/workspace/api diff --git a/go.sum b/go.sum index 58d99220d9..5b3eb9094d 100644 --- a/go.sum +++ b/go.sum @@ -438,8 +438,6 @@ github.com/onsi/ginkgo/v2 v2.4.0 h1:+Ig9nvqgS5OBSACXNk15PLdp0U9XPYROt9CFzVdFGIs= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.23.0 h1:/oxKu9c2HVap+F3PfKort2Hw5DEU+HGlW8n+tguWsys= -github.com/openshift/api v0.0.0-20230310162623-1957a8d7445b h1:21vdXJmEMu3bMSnblu0vr/e6BGESZPXNjzPM3ecyhh0= -github.com/openshift/api v0.0.0-20230310162623-1957a8d7445b/go.mod h1:ctXNyWanKEjGj8sss1KjjHQ3ENKFm33FFnS5BKaIPh4= github.com/openshift/build-machinery-go v0.0.0-20230228230858-4cd708338479 h1:IU2KU1kzg7/dfiZO4uPJY1G5Wp1k/IiXfYesc+quwaE= github.com/openshift/build-machinery-go v0.0.0-20230228230858-4cd708338479/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE= github.com/openshift/client-go v0.0.0-20230120202327-72f107311084 h1:66uaqNwA+qYyQDwsMWUfjjau8ezmg1dzCqub13KZOcE= diff --git a/vendor/github.com/openshift/api/config/v1/types_feature.go b/vendor/github.com/openshift/api/config/v1/types_feature.go index 26846cc36d..431e115891 100644 --- a/vendor/github.com/openshift/api/config/v1/types_feature.go +++ b/vendor/github.com/openshift/api/config/v1/types_feature.go @@ -119,20 +119,19 @@ var FeatureSets = map[FeatureSet]*FeatureGateEnabledDisabled{ with("RetroactiveDefaultStorageClass"). // sig-storage, RomanBednar, Kubernetes feature gate with("PDBUnhealthyPodEvictionPolicy"). // sig-apps, atiratree (#forum-workloads), Kubernetes feature gate with("DynamicResourceAllocation"). // sig-scheduling, jchaloup (#forum-workloads), Kubernetes feature gate - toFeatures(), + with("ValidatingAdmissionPolicy"). // sig-api-machinery, benluddy + with("AdmissionWebhookMatchConditions"). // sig-api-machinery, benluddy + toFeatures(defaultFeatures), LatencySensitive: newDefaultFeatures(). with( "TopologyManager", // sig-pod, sjenning ). - toFeatures(), + toFeatures(defaultFeatures), } var defaultFeatures = &FeatureGateEnabledDisabled{ Enabled: []string{ - "APIPriorityAndFairness", // sig-apimachinery, deads2k - "RotateKubeletServerCertificate", // sig-pod, sjenning - "DownwardAPIHugePages", // sig-node, rphillips - "OpenShiftPodSecurityAdmission", // bz-auth, stlaz, OCP specific + "OpenShiftPodSecurityAdmission", // bz-auth, stlaz, OCP specific }, Disabled: []string{ "RetroactiveDefaultStorageClass", // sig-storage, RomanBednar, Kubernetes feature gate @@ -176,7 +175,7 @@ func (f *featureSetBuilder) isForcedOn(needle string) bool { return false } -func (f *featureSetBuilder) toFeatures() *FeatureGateEnabledDisabled { +func (f *featureSetBuilder) toFeatures(defaultFeatures *FeatureGateEnabledDisabled) *FeatureGateEnabledDisabled { finalOn := []string{} finalOff := []string{} diff --git a/vendor/github.com/openshift/api/genswaggertypedocs b/vendor/github.com/openshift/api/genswaggertypedocs new file mode 100644 index 0000000000..64caaf49b8 Binary files /dev/null and b/vendor/github.com/openshift/api/genswaggertypedocs differ diff --git a/vendor/github.com/openshift/api/operator/v1/0000_50_cluster_storage_operator_01_crd.yaml b/vendor/github.com/openshift/api/operator/v1/0000_50_cluster_storage_operator_01_crd.yaml index 948f42dda7..325f1bc2cf 100644 --- a/vendor/github.com/openshift/api/operator/v1/0000_50_cluster_storage_operator_01_crd.yaml +++ b/vendor/github.com/openshift/api/operator/v1/0000_50_cluster_storage_operator_01_crd.yaml @@ -35,6 +35,15 @@ spec: description: spec holds user settable values for configuration type: object properties: + csiMigrationVSphere: + description: 'CSIMigrationVSphere enables CSI migration for VSphere. This field is immutable once it is set and can not be undone. If this is empty, the platform will choose a good default, which may change over time without notice. DEPRECATED: This field will be removed in a future release.' + type: string + enum: + - "" + - Enabled + x-kubernetes-validations: + - rule: self == oldSelf + message: CSIMigrationVSphere is immutable logLevel: description: "logLevel is an intent based logging for an overall component. It does not give fine grained control, but it is a simple way to manage coarse grained logging choices that operators have to interpret for their operands. \n Valid values are: \"Normal\", \"Debug\", \"Trace\", \"TraceAll\". Defaults to \"Normal\"." type: string @@ -69,6 +78,9 @@ spec: type: object nullable: true x-kubernetes-preserve-unknown-fields: true + x-kubernetes-validations: + - rule: '!has(oldSelf.csiMigrationVSphere) || has(self.csiMigrationVSphere)' + message: CSIMigrationVSphere is required once set status: description: status holds observed values from the cluster. They may not be overridden. type: object diff --git a/vendor/github.com/openshift/api/operator/v1/types_storage.go b/vendor/github.com/openshift/api/operator/v1/types_storage.go index 38ffe26d52..e73523edb1 100644 --- a/vendor/github.com/openshift/api/operator/v1/types_storage.go +++ b/vendor/github.com/openshift/api/operator/v1/types_storage.go @@ -26,9 +26,27 @@ type Storage struct { Status StorageStatus `json:"status"` } +// CSIMigrationToggle indicates whether CSI migration should be enabled for drivers where it is optional. +// +kubebuilder:validation:Enum="";Enabled +type CSIMigrationToggle string + +const ( + CSIMigrationEnabled CSIMigrationToggle = "Enabled" +) + // StorageSpec is the specification of the desired behavior of the cluster storage operator. +// +kubebuilder:validation:XValidation:rule="!has(oldSelf.csiMigrationVSphere) || has(self.csiMigrationVSphere)", message="CSIMigrationVSphere is required once set" type StorageSpec struct { OperatorSpec `json:",inline"` + + // CSIMigrationVSphere enables CSI migration for VSphere. + // This field is immutable once it is set and can not be undone. + // If this is empty, the platform will choose a good default, + // which may change over time without notice. + // DEPRECATED: This field will be removed in a future release. + // +kubebuilder:validation:XValidation:rule="self == oldSelf",message="CSIMigrationVSphere is immutable" + // +optional + CSIMigrationVSphere CSIMigrationToggle `json:"csiMigrationVSphere"` } // StorageStatus defines the observed status of the cluster storage operator. 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 0c76b27aa5..bd292d44cc 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 @@ -1610,7 +1610,8 @@ func (StorageList) SwaggerDoc() map[string]string { } var map_StorageSpec = map[string]string{ - "": "StorageSpec is the specification of the desired behavior of the cluster storage operator.", + "": "StorageSpec is the specification of the desired behavior of the cluster storage operator.", + "csiMigrationVSphere": "CSIMigrationVSphere enables CSI migration for VSphere. This field is immutable once it is set and can not be undone. If this is empty, the platform will choose a good default, which may change over time without notice. DEPRECATED: This field will be removed in a future release.", } func (StorageSpec) SwaggerDoc() map[string]string { diff --git a/vendor/modules.txt b/vendor/modules.txt index c3626f3424..d879e30335 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -201,7 +201,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-20230310162623-1957a8d7445b +# github.com/openshift/api v0.0.0-20230310162623-1957a8d7445b => /home/jon/workspace/api ## explicit; go 1.19 github.com/openshift/api github.com/openshift/api/apiserver @@ -1415,3 +1415,4 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.3.0 ## explicit; go 1.12 sigs.k8s.io/yaml +# github.com/openshift/api => /home/jon/workspace/api