make update

openshift · Sep 28, 2023 · 545417a · 545417a
1 parent 0d78e89
commit 545417a
Show file tree

Hide file tree

Showing 13 changed files with 1,941 additions and 65 deletions.
diff --git a/machineconfiguration/v1/0000_80_containerruntimeconfig.crd.yaml b/machineconfiguration/v1/0000_80_containerruntimeconfig.crd.yaml
@@ -115,10 +115,6 @@ spec:
                   items:
                     description: ContainerRuntimeConfigCondition defines the state of the ContainerRuntimeConfig
                     type: object
-                    required:
-                      - lastTransitionTime
-                      - status
-                      - type
                     properties:
                       lastTransitionTime:
                         description: lastTransitionTime is the time of the last update to the current status object.
@@ -137,6 +133,7 @@ spec:
                       type:
                         description: type specifies the state of the operator's reconciliation functionality.
                         type: string
+                  x-kubernetes-list-type: atomic
                 observedGeneration:
                   description: observedGeneration represents the generation observed by the controller.
                   type: integer

diff --git a/machineconfiguration/v1/0000_80_controllerconfig.crd.yaml b/machineconfiguration/v1/0000_80_controllerconfig.crd.yaml
diff --git a/machineconfiguration/v1/0000_80_kubeletconfig.crd.yaml b/machineconfiguration/v1/0000_80_kubeletconfig.crd.yaml
@@ -134,10 +134,6 @@ spec:
                   items:
                     description: KubeletConfigCondition defines the state of the KubeletConfig
                     type: object
-                    required:
-                      - lastTransitionTime
-                      - status
-                      - type
                     properties:
                       lastTransitionTime:
                         description: lastTransitionTime is the time of the last update to the current status object.

diff --git a/machineconfiguration/v1/0000_80_machineconfig.crd.yaml b/machineconfiguration/v1/0000_80_machineconfig.crd.yaml
@@ -49,8 +49,6 @@ spec:
         openAPIV3Schema:
           description: "MachineConfig defines the configuration for a machine \n Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer)."
           type: object
-          required:
-            - spec
           properties:
             apiVersion:
               description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
@@ -76,6 +74,7 @@ spec:
                   type: array
                   items:
                     type: string
+                  x-kubernetes-list-type: atomic
                 fips:
                   description: fips controls FIPS mode
                   type: boolean
@@ -85,6 +84,7 @@ spec:
                   items:
                     type: string
                   nullable: true
+                  x-kubernetes-list-type: atomic
                 kernelType:
                   description: kernelType contains which kernel we want to be running like default (traditional), realtime.
                   type: string

diff --git a/machineconfiguration/v1/0000_80_machineconfigpool.crd.yaml b/machineconfiguration/v1/0000_80_machineconfigpool.crd.yaml
@@ -87,9 +87,6 @@ spec:
             spec:
               description: MachineConfigPoolSpec is the spec for MachineConfigPool resource.
               type: object
-              required:
-                - configuration
-                - paused
               properties:
                 configuration:
                   description: The targeted MachineConfig object for the machine config pool.
@@ -142,6 +139,7 @@ spec:
                             description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                             type: string
                         x-kubernetes-map-type: atomic
+                      x-kubernetes-list-type: atomic
                     uid:
                       description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                       type: string
@@ -220,26 +218,35 @@ spec:
             status:
               description: MachineConfigPoolStatus is the status for MachineConfigPool resource.
               type: object
-              required:
-                - configuration
-                - degradedMachineCount
-                - machineCount
-                - readyMachineCount
-                - unavailableMachineCount
-                - updatedMachineCount
               properties:
+                certExpirys:
+                  description: certExpirys keeps track of important certificate expiration data
+                  type: array
+                  items:
+                    description: ceryExpiry contains the bundle name and the expiry date
+                    type: object
+                    required:
+                      - bundle
+                      - expiry
+                      - subject
+                    properties:
+                      bundle:
+                        description: bundle is the name of the bundle in which the subject certificate resides
+                        type: string
+                      expiry:
+                        description: expiry is the date after which the certificate will no longer be valid
+                        type: string
+                        format: date-time
+                      subject:
+                        description: subject is the subject of the certificate
+                        type: string
+                  x-kubernetes-list-type: atomic
                 conditions:
                   description: conditions represents the latest available observations of current state.
                   type: array
                   items:
                     description: MachineConfigPoolCondition contains condition information for an MachineConfigPool.
                     type: object
-                    required:
-                      - lastTransitionTime
-                      - message
-                      - reason
-                      - status
-                      - type
                     properties:
                       lastTransitionTime:
                         description: lastTransitionTime is the timestamp corresponding to the last status change of this condition.
@@ -258,6 +265,7 @@ spec:
                       type:
                         description: type of the condition, currently ('Done', 'Updating', 'Failed').
                         type: string
+                  x-kubernetes-list-type: atomic
                 configuration:
                   description: configuration represents the current MachineConfig object for the machine config pool.
                   type: object
@@ -309,6 +317,7 @@ spec:
                             description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                             type: string
                         x-kubernetes-map-type: atomic
+                      x-kubernetes-list-type: atomic
                     uid:
                       description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                       type: string

diff --git a/machineconfiguration/v1/types.go b/machineconfiguration/v1/types.go
@@ -23,7 +23,7 @@ const KubeletConfigRoleLabelPrefix = "pools.operator.machineconfiguration.opensh
 // ControllerConfig describes configuration for MachineConfigController.
 // This is currently only used to drive the MachineConfig objects generated by the TemplateController.
 //
-// Compatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.
+// 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
 type ControllerConfig struct {
 	metav1.TypeMeta   `json:",inline"`
@@ -265,7 +265,7 @@ const (
 
 // ControllerConfigList is a list of ControllerConfig resources
 //
-// Compatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.
+// 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
 type ControllerConfigList struct {
 	metav1.TypeMeta `json:",inline"`