Merge pull request #1804 from deads2k/by-gate-16-more-stragglers

convert generation in a couple more v1 APIs

apiserver/v1/apiserver.openshift.io_apirequestcount.yaml

@@ -3,6 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     api-approved.openshift.io: https://github.com/openshift/api/pull/897
+    api.openshift.io/merged-by-featuregates: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     include.release.openshift.io/single-node-developer: "true"
   name: apirequestcounts.apiserver.openshift.io

apiserver/v1/types_apirequestcount.go

@@ -11,15 +11,23 @@ const (
 
 // +genclient
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-// +kubebuilder:resource:scope="Cluster"
-// +kubebuilder:subresource:status
 // +genclient:nonNamespaced
 // +openshift:compatibility-gen:level=1
 
 // APIRequestCount tracks requests made to an API. The instance name must
 // be of the form `resource.version.group`, matching the resource.
 //
 // Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).
+// +kubebuilder:object:root=true
+// +kubebuilder:subresource:status
+// +kubebuilder:resource:path=apirequestcounts,scope=Cluster
+// +openshift:api-approved.openshift.io=https://github.com/openshift/api/pull/897
+// +openshift:file-pattern=apiserver.openshift.io_apirequestcountMARKERS.yaml
+// +kubebuilder:metadata:annotations=include.release.openshift.io/self-managed-high-availability=true
+// +kubebuilder:metadata:annotations=include.release.openshift.io/single-node-developer=true
+// +kubebuilder:printcolumn:name=RemovedInRelease,JSONPath=.status.removedInRelease,type=string,description=Release in which an API will be removed.
+// +kubebuilder:printcolumn:name=RequestsInCurrentHour,JSONPath=.status.currentHour.requestCount,type=integer,description=Number of requests in the current hour.
+// +kubebuilder:printcolumn:name=RequestsInLast24h,JSONPath=.status.requestCount,type=integer,description=Number of requests in the last 24h.
 type APIRequestCount struct {
 	metav1.TypeMeta `json:",inline"`
 

apiserver/v1/zz_generated.featuregated-crd-manifests.yaml

@@ -0,0 +1,33 @@
+apirequestcounts.apiserver.openshift.io:
+  Annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
+    include.release.openshift.io/single-node-developer: "true"
+  ApprovedPRNumber: https://github.com/openshift/api/pull/897
+  CRDName: apirequestcounts.apiserver.openshift.io
+  Capability: ""
+  Category: ""
+  FeatureGates: []
+  GroupName: apiserver.openshift.io
+  HasStatus: true
+  KindName: APIRequestCount
+  Labels: {}
+  PluralName: apirequestcounts
+  PrinterColumns:
+  - description: Release in which an API will be removed.
+    jsonPath: .status.removedInRelease
+    name: RemovedInRelease
+    type: string
+  - description: Number of requests in the current hour.
+    jsonPath: .status.currentHour.requestCount
+    name: RequestsInCurrentHour
+    type: integer
+  - description: Number of requests in the last 24h.
+    jsonPath: .status.requestCount
+    name: RequestsInLast24h
+    type: integer
+  Scope: Cluster
+  ShortNames: null
+  TargetFilenamePattern: apiserver.openshift.io_apirequestcountMARKERS.yaml
+  TopLevelFeatureGates: []
+  Version: v1
+

imageregistry/v1/00_imageregistry.crd.yaml

@@ -3,6 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     api-approved.openshift.io: https://github.com/openshift/api/pull/519
+    api.openshift.io/merged-by-featuregates: "true"
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     include.release.openshift.io/single-node-developer: "true"

imageregistry/v1/01_imagepruner.crd.yaml

@@ -3,6 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     api-approved.openshift.io: https://github.com/openshift/api/pull/555
+    api.openshift.io/merged-by-featuregates: "true"
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     include.release.openshift.io/single-node-developer: "true"

imageregistry/v1/manual-override-crd-manifests/configs.imageregistry.operator.openshift.io/AAA_ungated.yaml

@@ -0,0 +1,32 @@
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: configs.imageregistry.operator.openshift.io
+spec:
+  versions:
+  - name: v1
+    schema:
+      openAPIV3Schema:
+        properties:
+          spec:
+            properties:
+              storage:
+                properties:
+                  oss:
+                    properties:
+                      encryption:
+                        anyOf:
+                        - not:
+                            required:
+                            - kms
+                          properties:
+                            method:
+                              not:
+                                enum:
+                                - KMS
+                        - properties:
+                            method:
+                              enum:
+                              - KMS
+                          required:
+                          - kms

imageregistry/v1/types.go

@@ -39,6 +39,11 @@ const (
 //
 // Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).
 // +openshift:compatibility-gen:level=1
+// +kubebuilder:object:root=true
+// +kubebuilder:subresource:status
+// +kubebuilder:resource:path=configs,scope=Cluster
+// +openshift:api-approved.openshift.io=https://github.com/openshift/api/pull/519
+// +openshift:file-pattern=00_imageregistryMARKERS.crd.yaml
 type Config struct {
 	metav1.TypeMeta `json:",inline"`
 

imageregistry/v1/types_imagepruner.go

@@ -33,6 +33,11 @@ type ImagePrunerList struct {
 //
 // Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).
 // +openshift:compatibility-gen:level=1
+// +kubebuilder:object:root=true
+// +kubebuilder:subresource:status
+// +kubebuilder:resource:path=imagepruners,scope=Cluster
+// +openshift:api-approved.openshift.io=https://github.com/openshift/api/pull/555
+// +openshift:file-pattern=01_imageprunerMARKERS.crd.yaml
 type ImagePruner struct {
 	metav1.TypeMeta `json:",inline"`
 

imageregistry/v1/zz_generated.featuregated-crd-manifests.yaml

@@ -0,0 +1,38 @@
+configs.imageregistry.operator.openshift.io:
+  Annotations: {}
+  ApprovedPRNumber: https://github.com/openshift/api/pull/519
+  CRDName: configs.imageregistry.operator.openshift.io
+  Capability: ""
+  Category: ""
+  FeatureGates: []
+  GroupName: imageregistry.operator.openshift.io
+  HasStatus: true
+  KindName: Config
+  Labels: {}
+  PluralName: configs
+  PrinterColumns: []
+  Scope: Cluster
+  ShortNames: null
+  TargetFilenamePattern: 00_imageregistryMARKERS.crd.yaml
+  TopLevelFeatureGates: []
+  Version: v1
+
+imagepruners.imageregistry.operator.openshift.io:
+  Annotations: {}
+  ApprovedPRNumber: https://github.com/openshift/api/pull/555
+  CRDName: imagepruners.imageregistry.operator.openshift.io
+  Capability: ""
+  Category: ""
+  FeatureGates: []
+  GroupName: imageregistry.operator.openshift.io
+  HasStatus: true
+  KindName: ImagePruner
+  Labels: {}
+  PluralName: imagepruners
+  PrinterColumns: []
+  Scope: Cluster
+  ShortNames: null
+  TargetFilenamePattern: 01_imageprunerMARKERS.crd.yaml
+  TopLevelFeatureGates: []
+  Version: v1
+