modified v1alpha1 internalreleaseimage status to use the same structure adopted for the MCN status field

Author: andfasano

hack/update-payload-crds.sh

@@ -24,6 +24,7 @@ crd_globs="\
     config/v1/zz_generated.crd-manifests/0000_10_openshift-controller-manager_01_builds*.crd.yaml
     operator/v1/zz_generated.crd-manifests/0000_50_openshift-controller-manager_02_openshiftcontrollermanagers*.crd.yaml
     machineconfiguration/v1/zz_generated.crd-manifests/*.crd.yaml
+    machineconfiguration/v1alpha1/zz_generated.crd-manifests/0000_80_machine-config_01_internalreleaseimages-*.crd.yaml
     operator/v1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfigurations*.crd.yaml
     config/v1alpha1/zz_generated.crd-manifests/0000_10_config-operator_01_clustermonitoring*.crd.yaml
     operator/v1/zz_generated.crd-manifests/*_storage_01_storages*.crd.yaml

machineconfiguration/v1/types_machineconfignode.go

@@ -172,6 +172,7 @@ type MachineConfigNodeStatusInternalReleaseImage struct {
 	// releases is a list of the release bundles currently owned and managed by the
 	// cluster, indicating that their images can be safely pulled by any cluster entity
 	// requiring them.
+	// Entries must be unique, keyed on the name field.
 	// This field can contain between 1 and 5 entries.
 	// +listType=map
 	// +listMapKey=name
@@ -183,10 +184,16 @@ type MachineConfigNodeStatusInternalReleaseImage struct {
 
 // MachineConfigNodeStatusInternalReleaseImageRef is used to provide a more detailed reference for
 // a release bundle.
-// +openshift:enable:FeatureGate=NoRegistryClusterOperations
 type MachineConfigNodeStatusInternalReleaseImageRef struct {
-	// conditions represent the observations of an internal release image current state. See InternalReleaseImageConditionType for the possible
-	// type values.
+	// conditions represent the observations of an internal release image current state. Valid types are:
+	// Mounted, Installing, Available, Removing and Degraded.
+	//
+	// If Mounted is true, that means that a a valid ISO has been mounted on the current node.
+	// If Installing is true, that means that a new release bundle is currently being copied on the current node, and not yet completed.
+	// If Available is true, it means that the release has been previously installed on the current node, and it can be used.
+	// If Removing is true, it means that a release deletion is in progress on the current node, and not yet completed.
+	// If Degraded is true, that means something has gone wrong in the current node.
+	//
 	// +listType=map
 	// +listMapKey=type
 	// +kubebuilder:validation:MinItems=1
@@ -201,12 +208,13 @@ type MachineConfigNodeStatusInternalReleaseImageRef struct {
 	// image is an OCP release image referenced by digest.
 	// The format of the image pull spec is: host[:port][/namespace]/name@sha256:<digest>,
 	// where the digest must be 64 characters long, and consist only of lowercase hexadecimal characters, a-f and 0-9.
-	// The length of the whole spec must be between 1 to 447 characters.
+	// The length of the whole spec must be between 0 to 447 characters.
+	// The field is optional, and it will be provided after a release will be successfully installed.
 	// +kubebuilder:validation:MinLength=1
 	// +kubebuilder:validation:MaxLength=447
-	// +kubebuilder:validation:XValidation:rule=`(self.split('@').size() == 2 && self.split('@')[1].matches('^sha256:[a-f0-9]{64}$'))`,message="the OCI Image reference must end with a valid '@sha256:<digest>' suffix, where '<digest>' is 64 characters long"
-	// +kubebuilder:validation:XValidation:rule=`(self.split('@')[0].matches('^([a-zA-Z0-9-]+\\.)+[a-zA-Z0-9-]+(:[0-9]{2,5})?/([a-zA-Z0-9-_]{0,61}/)?[a-zA-Z0-9-_.]*?$'))`,message="the OCI Image name should follow the host[:port][/namespace]/name format, resembling a valid URL without the scheme"
-	// +required
+	// +kubebuilder:validation:XValidation:rule=`self == '' || (self.split('@').size() == 2 && self.split('@')[1].matches('^sha256:[a-f0-9]{64}$'))`,message="the OCI Image reference must end with a valid '@sha256:<digest>' suffix, where '<digest>' is 64 characters long"
+	// +kubebuilder:validation:XValidation:rule=`self == '' || (self.split('@')[0].matches('^([a-zA-Z0-9-]+\\.)+[a-zA-Z0-9-]+(:[0-9]{2,5})?/([a-zA-Z0-9-_]{0,61}/)?[a-zA-Z0-9-_.]*?$'))`,message="the OCI Image name should follow the host[:port][/namespace]/name format, resembling a valid URL without the scheme"
+	// +optional
 	Image string `json:"image,omitempty"`
 }
 

machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfignodes-Hypershift-CustomNoUpgrade.crd.yaml

@@ -363,6 +363,7 @@ spec:
                       releases is a list of the release bundles currently owned and managed by the
                       cluster, indicating that their images can be safely pulled by any cluster entity
                       requiring them.
+                      Entries must be unique, keyed on the name field.
                       This field can contain between 1 and 5 entries.
                     items:
                       description: |-
@@ -371,8 +372,14 @@ spec:
                       properties:
                         conditions:
                           description: |-
-                            conditions represent the observations of an internal release image current state. See InternalReleaseImageConditionType for the possible
-                            type values.
+                            conditions represent the observations of an internal release image current state. Valid types are:
+                            Mounted, Installing, Available, Removing and Degraded.
+
+                            If Mounted is true, that means that a a valid ISO has been mounted on the current node.
+                            If Installing is true, that means that a new release bundle is currently being copied on the current node, and not yet completed.
+                            If Available is true, it means that the release has been previously installed on the current node, and it can be used.
+                            If Removing is true, it means that a release deletion is in progress on the current node, and not yet completed.
+                            If Degraded is true, that means something has gone wrong in the current node.
                           items:
                             description: Condition contains details for one aspect
                               of the current state of this API Resource.
@@ -440,18 +447,19 @@ spec:
                             image is an OCP release image referenced by digest.
                             The format of the image pull spec is: host[:port][/namespace]/name@sha256:<digest>,
                             where the digest must be 64 characters long, and consist only of lowercase hexadecimal characters, a-f and 0-9.
-                            The length of the whole spec must be between 1 to 447 characters.
+                            The length of the whole spec must be between 0 to 447 characters.
+                            The field is optional, and it will be provided after a release will be successfully installed.
                           maxLength: 447
                           minLength: 1
                           type: string
                           x-kubernetes-validations:
                           - message: the OCI Image reference must end with a valid
                               '@sha256:<digest>' suffix, where '<digest>' is 64 characters
                               long
-                            rule: (self.split('@').size() == 2 && self.split('@')[1].matches('^sha256:[a-f0-9]{64}$'))
+                            rule: self == '' || (self.split('@').size() == 2 && self.split('@')[1].matches('^sha256:[a-f0-9]{64}$'))
                           - message: the OCI Image name should follow the host[:port][/namespace]/name
                               format, resembling a valid URL without the scheme
-                            rule: (self.split('@')[0].matches('^([a-zA-Z0-9-]+\\.)+[a-zA-Z0-9-]+(:[0-9]{2,5})?/([a-zA-Z0-9-_]{0,61}/)?[a-zA-Z0-9-_.]*?$'))
+                            rule: self == '' || (self.split('@')[0].matches('^([a-zA-Z0-9-]+\\.)+[a-zA-Z0-9-]+(:[0-9]{2,5})?/([a-zA-Z0-9-_]{0,61}/)?[a-zA-Z0-9-_.]*?$'))
                         name:
                           description: name indicates the desired release bundle identifier.
                             This field is required and must be between 1 and 64 characters
@@ -460,7 +468,6 @@ spec:
                           minLength: 1
                           type: string
                       required:
-                      - image
                       - name
                       type: object
                     maxItems: 5

machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfignodes-SelfManagedHA-CustomNoUpgrade.crd.yaml

@@ -363,6 +363,7 @@ spec:
                       releases is a list of the release bundles currently owned and managed by the
                       cluster, indicating that their images can be safely pulled by any cluster entity
                       requiring them.
+                      Entries must be unique, keyed on the name field.
                       This field can contain between 1 and 5 entries.
                     items:
                       description: |-
@@ -371,8 +372,14 @@ spec:
                       properties:
                         conditions:
                           description: |-
-                            conditions represent the observations of an internal release image current state. See InternalReleaseImageConditionType for the possible
-                            type values.
+                            conditions represent the observations of an internal release image current state. Valid types are:
+                            Mounted, Installing, Available, Removing and Degraded.
+
+                            If Mounted is true, that means that a a valid ISO has been mounted on the current node.
+                            If Installing is true, that means that a new release bundle is currently being copied on the current node, and not yet completed.
+                            If Available is true, it means that the release has been previously installed on the current node, and it can be used.
+                            If Removing is true, it means that a release deletion is in progress on the current node, and not yet completed.
+                            If Degraded is true, that means something has gone wrong in the current node.
                           items:
                             description: Condition contains details for one aspect
                               of the current state of this API Resource.
@@ -440,18 +447,19 @@ spec:
                             image is an OCP release image referenced by digest.
                             The format of the image pull spec is: host[:port][/namespace]/name@sha256:<digest>,
                             where the digest must be 64 characters long, and consist only of lowercase hexadecimal characters, a-f and 0-9.
-                            The length of the whole spec must be between 1 to 447 characters.
+                            The length of the whole spec must be between 0 to 447 characters.
+                            The field is optional, and it will be provided after a release will be successfully installed.
                           maxLength: 447
                           minLength: 1
                           type: string
                           x-kubernetes-validations:
                           - message: the OCI Image reference must end with a valid
                               '@sha256:<digest>' suffix, where '<digest>' is 64 characters
                               long
-                            rule: (self.split('@').size() == 2 && self.split('@')[1].matches('^sha256:[a-f0-9]{64}$'))
+                            rule: self == '' || (self.split('@').size() == 2 && self.split('@')[1].matches('^sha256:[a-f0-9]{64}$'))
                           - message: the OCI Image name should follow the host[:port][/namespace]/name
                               format, resembling a valid URL without the scheme
-                            rule: (self.split('@')[0].matches('^([a-zA-Z0-9-]+\\.)+[a-zA-Z0-9-]+(:[0-9]{2,5})?/([a-zA-Z0-9-_]{0,61}/)?[a-zA-Z0-9-_.]*?$'))
+                            rule: self == '' || (self.split('@')[0].matches('^([a-zA-Z0-9-]+\\.)+[a-zA-Z0-9-]+(:[0-9]{2,5})?/([a-zA-Z0-9-_]{0,61}/)?[a-zA-Z0-9-_.]*?$'))
                         name:
                           description: name indicates the desired release bundle identifier.
                             This field is required and must be between 1 and 64 characters
@@ -460,7 +468,6 @@ spec:
                           minLength: 1
                           type: string
                       required:
-                      - image
                       - name
                       type: object
                     maxItems: 5

machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfignodes-SelfManagedHA-DevPreviewNoUpgrade.crd.yaml

@@ -363,6 +363,7 @@ spec:
                       releases is a list of the release bundles currently owned and managed by the
                       cluster, indicating that their images can be safely pulled by any cluster entity
                       requiring them.
+                      Entries must be unique, keyed on the name field.
                       This field can contain between 1 and 5 entries.
                     items:
                       description: |-
@@ -371,8 +372,14 @@ spec:
                       properties:
                         conditions:
                           description: |-
-                            conditions represent the observations of an internal release image current state. See InternalReleaseImageConditionType for the possible
-                            type values.
+                            conditions represent the observations of an internal release image current state. Valid types are:
+                            Mounted, Installing, Available, Removing and Degraded.
+
+                            If Mounted is true, that means that a a valid ISO has been mounted on the current node.
+                            If Installing is true, that means that a new release bundle is currently being copied on the current node, and not yet completed.
+                            If Available is true, it means that the release has been previously installed on the current node, and it can be used.
+                            If Removing is true, it means that a release deletion is in progress on the current node, and not yet completed.
+                            If Degraded is true, that means something has gone wrong in the current node.
                           items:
                             description: Condition contains details for one aspect
                               of the current state of this API Resource.
@@ -440,18 +447,19 @@ spec:
                             image is an OCP release image referenced by digest.
                             The format of the image pull spec is: host[:port][/namespace]/name@sha256:<digest>,
                             where the digest must be 64 characters long, and consist only of lowercase hexadecimal characters, a-f and 0-9.
-                            The length of the whole spec must be between 1 to 447 characters.
+                            The length of the whole spec must be between 0 to 447 characters.
+                            The field is optional, and it will be provided after a release will be successfully installed.
                           maxLength: 447
                           minLength: 1
                           type: string
                           x-kubernetes-validations:
                           - message: the OCI Image reference must end with a valid
                               '@sha256:<digest>' suffix, where '<digest>' is 64 characters
                               long
-                            rule: (self.split('@').size() == 2 && self.split('@')[1].matches('^sha256:[a-f0-9]{64}$'))
+                            rule: self == '' || (self.split('@').size() == 2 && self.split('@')[1].matches('^sha256:[a-f0-9]{64}$'))
                           - message: the OCI Image name should follow the host[:port][/namespace]/name
                               format, resembling a valid URL without the scheme
-                            rule: (self.split('@')[0].matches('^([a-zA-Z0-9-]+\\.)+[a-zA-Z0-9-]+(:[0-9]{2,5})?/([a-zA-Z0-9-_]{0,61}/)?[a-zA-Z0-9-_.]*?$'))
+                            rule: self == '' || (self.split('@')[0].matches('^([a-zA-Z0-9-]+\\.)+[a-zA-Z0-9-]+(:[0-9]{2,5})?/([a-zA-Z0-9-_]{0,61}/)?[a-zA-Z0-9-_.]*?$'))
                         name:
                           description: name indicates the desired release bundle identifier.
                             This field is required and must be between 1 and 64 characters
@@ -460,7 +468,6 @@ spec:
                           minLength: 1
                           type: string
                       required:
-                      - image
                       - name
                       type: object
                     maxItems: 5