[WIP] Promote IrreconcilableMachineConfig to GA

features.md

@@ -70,7 +70,6 @@
 | IngressComponentRouteLabels| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | IngressControllerDynamicConfigurationManager| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | IngressControllerMultipleHAProxyVersions| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
-| IrreconcilableMachineConfig| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | KMSEncryption| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | MachineAPIMigration| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | MachineAPIMigrationAWS| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
@@ -109,6 +108,7 @@
 | ImageStreamImportMode| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | InsightsConfig| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | InsightsOnDemandDataGather| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
+| IrreconcilableMachineConfig| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | KMSv1| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | ManagedBootImagesCPMS| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | MetricsCollectionProfiles| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |

features/features.go

@@ -862,7 +862,7 @@ var (
 						contactPerson("pabrodri").
 						productScope(ocpSpecific).
 						enhancementPR("https://github.com/openshift/enhancements/pull/1785").
-						enable(inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()).
+						enable(inDefault(), inOKD(), inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()).
 						mustRegister()
 	FeatureGateAWSDualStackInstall = newFeatureGate("AWSDualStackInstall").
 					reportProblemsToJiraComponent("Installer").

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

@@ -284,6 +284,52 @@ spec:
                 required:
                 - desired
                 type: object
+              irreconcilableChanges:
+                description: |-
+                  irreconcilableChanges is an optional field that contains the observed differences between this nodes
+                  configuration and the target rendered MachineConfig.
+                  This field will be set when there are changes to the target rendered MachineConfig that can only be applied to
+                  new nodes joining the cluster.
+                  Entries must be unique, keyed on the fieldPath field.
+                  Must not exceed 32 entries.
+                items:
+                  description: |-
+                    IrreconcilableChangeDiff holds an individual diff between the initial install-time MachineConfig
+                    and the latest applied one caused by the presence of irreconcilable changes.
+                  properties:
+                    diff:
+                      description: |-
+                        diff is a required field containing the difference between the nodes current configuration and the latest
+                        rendered MachineConfig for the field specified in fieldPath.
+                        Must not be an empty string and must not exceed 4096 characters in length.
+                      maxLength: 4096
+                      minLength: 1
+                      type: string
+                    fieldPath:
+                      description: |-
+                        fieldPath is a required reference to the path in the latest rendered MachineConfig that differs from this nodes
+                        configuration.
+                        Must not be empty and must not exceed 70 characters in length.
+                        Must begin with the prefix 'spec.' and only contain alphanumeric characters, square brackets ('[]'), or dots ('.').
+                      maxLength: 70
+                      minLength: 1
+                      type: string
+                      x-kubernetes-validations:
+                      - message: The fieldPath must start with `spec.`
+                        rule: self.startsWith('spec.')
+                      - message: The fieldPath must consist only of alphanumeric characters,
+                          brackets [] and dots ('.').
+                        rule: self.matches('^[\\da-zA-Z\\.\\[\\]]+$')
+                  required:
+                  - diff
+                  - fieldPath
+                  type: object
+                maxItems: 32
+                minItems: 1
+                type: array
+                x-kubernetes-list-map-keys:
+                - fieldPath
+                x-kubernetes-list-type: map
               observedGeneration:
                 description: |-
                   observedGeneration represents the generation of the MachineConfigNode object observed by the Machine Config Operator's controller.

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

@@ -284,6 +284,52 @@ spec:
                 required:
                 - desired
                 type: object
+              irreconcilableChanges:
+                description: |-
+                  irreconcilableChanges is an optional field that contains the observed differences between this nodes
+                  configuration and the target rendered MachineConfig.
+                  This field will be set when there are changes to the target rendered MachineConfig that can only be applied to
+                  new nodes joining the cluster.
+                  Entries must be unique, keyed on the fieldPath field.
+                  Must not exceed 32 entries.
+                items:
+                  description: |-
+                    IrreconcilableChangeDiff holds an individual diff between the initial install-time MachineConfig
+                    and the latest applied one caused by the presence of irreconcilable changes.
+                  properties:
+                    diff:
+                      description: |-
+                        diff is a required field containing the difference between the nodes current configuration and the latest
+                        rendered MachineConfig for the field specified in fieldPath.
+                        Must not be an empty string and must not exceed 4096 characters in length.
+                      maxLength: 4096
+                      minLength: 1
+                      type: string
+                    fieldPath:
+                      description: |-
+                        fieldPath is a required reference to the path in the latest rendered MachineConfig that differs from this nodes
+                        configuration.
+                        Must not be empty and must not exceed 70 characters in length.
+                        Must begin with the prefix 'spec.' and only contain alphanumeric characters, square brackets ('[]'), or dots ('.').
+                      maxLength: 70
+                      minLength: 1
+                      type: string
+                      x-kubernetes-validations:
+                      - message: The fieldPath must start with `spec.`
+                        rule: self.startsWith('spec.')
+                      - message: The fieldPath must consist only of alphanumeric characters,
+                          brackets [] and dots ('.').
+                        rule: self.matches('^[\\da-zA-Z\\.\\[\\]]+$')
+                  required:
+                  - diff
+                  - fieldPath
+                  type: object
+                maxItems: 32
+                minItems: 1
+                type: array
+                x-kubernetes-list-map-keys:
+                - fieldPath
+                x-kubernetes-list-type: map
               observedGeneration:
                 description: |-
                   observedGeneration represents the generation of the MachineConfigNode object observed by the Machine Config Operator's controller.