Promote CPMSMachineNamePrefix feature gate to default feature set

chiragkyal · chiragkyal · commit ab8362bb85ff · 2025-03-31T14:09:16.000+05:30
Signed-off-by: chiragkyal &lt;ckyal@redhat.com&gt;
diff --git a/features.md b/features.md
@@ -17,7 +17,6 @@
 | AWSClusterHostedDNS| | | <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>  |
 | AutomatedEtcdBackup| | | <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>  |
 | BootcNodeManagement| | | <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>  |
-| CPMSMachineNamePrefix| | | <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>  |
 | ClusterMonitoringConfig| | | <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>  |
 | ConsolePluginContentSecurityPolicy| | | <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>  |
 | DNSNameResolver| | | <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>  |
@@ -74,6 +73,7 @@
 | AzureWorkloadIdentity| <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>  |
 | BareMetalLoadBalancer| <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>  |
 | BuildCSIVolumes| <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>  |
+| CPMSMachineNamePrefix| <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>  |
 | ChunkSizeMiB| <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>  |
 | CloudDualStackNodeIPs| <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>  |
 | DisableKubeletCloudCredentialProviders| <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>  |
diff --git a/features/features.go b/features/features.go
@@ -248,7 +248,7 @@ var (
 						contactPerson("chiragkyal").
 						productScope(ocpSpecific).
 						enhancementPR("https://github.com/openshift/enhancements/pull/1714").
-						enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+						enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
 						mustRegister()
 
 	FeatureGateAdminNetworkPolicy = newFeatureGate("AdminNetworkPolicy").
diff --git a/machine/v1/zz_generated.crd-manifests/0000_10_control-plane-machine-set_01_controlplanemachinesets-Default.crd.yaml b/machine/v1/zz_generated.crd-manifests/0000_10_control-plane-machine-set_01_controlplanemachinesets-Default.crd.yaml
@@ -75,6 +75,29 @@ spec:
             description: ControlPlaneMachineSet represents the configuration of the
               ControlPlaneMachineSet.
             properties:
+              machineNamePrefix:
+                description: |-
+                  machineNamePrefix is the prefix used when creating machine names.
+                  Each machine name will consist of this prefix, followed by
+                  a randomly generated string of 5 characters, and the index of the machine.
+                  It must be a lowercase RFC 1123 subdomain, consisting of lowercase
+                  alphanumeric characters, hyphens ('-'), and periods ('.').
+                  Each block, separated by periods, must start and end with an alphanumeric character.
+                  Hyphens are not allowed at the start or end of a block, and consecutive periods are not permitted.
+                  The prefix must be between 1 and 245 characters in length.
+                  For example, if machineNamePrefix is set to 'control-plane',
+                  and three machines are created, their names might be:
+                  control-plane-abcde-0, control-plane-fghij-1, control-plane-klmno-2
+                maxLength: 245
+                minLength: 1
+                type: string
+                x-kubernetes-validations:
+                - message: a lowercase RFC 1123 subdomain must consist of lowercase
+                    alphanumeric characters, hyphens ('-'), and periods ('.'). Each
+                    block, separated by periods, must start and end with an alphanumeric
+                    character. Hyphens are not allowed at the start or end of a block,
+                    and consecutive periods are not permitted.
+                  rule: '!format.dns1123Subdomain().validate(self).hasValue()'
               replicas:
                 default: 3
                 description: |-
diff --git a/payload-manifests/crds/0000_10_control-plane-machine-set_01_controlplanemachinesets-Default.crd.yaml b/payload-manifests/crds/0000_10_control-plane-machine-set_01_controlplanemachinesets-Default.crd.yaml
@@ -75,6 +75,29 @@ spec:
             description: ControlPlaneMachineSet represents the configuration of the
               ControlPlaneMachineSet.
             properties:
+              machineNamePrefix:
+                description: |-
+                  machineNamePrefix is the prefix used when creating machine names.
+                  Each machine name will consist of this prefix, followed by
+                  a randomly generated string of 5 characters, and the index of the machine.
+                  It must be a lowercase RFC 1123 subdomain, consisting of lowercase
+                  alphanumeric characters, hyphens ('-'), and periods ('.').
+                  Each block, separated by periods, must start and end with an alphanumeric character.
+                  Hyphens are not allowed at the start or end of a block, and consecutive periods are not permitted.
+                  The prefix must be between 1 and 245 characters in length.
+                  For example, if machineNamePrefix is set to 'control-plane',
+                  and three machines are created, their names might be:
+                  control-plane-abcde-0, control-plane-fghij-1, control-plane-klmno-2
+                maxLength: 245
+                minLength: 1
+                type: string
+                x-kubernetes-validations:
+                - message: a lowercase RFC 1123 subdomain must consist of lowercase
+                    alphanumeric characters, hyphens ('-'), and periods ('.'). Each
+                    block, separated by periods, must start and end with an alphanumeric
+                    character. Hyphens are not allowed at the start or end of a block,
+                    and consecutive periods are not permitted.
+                  rule: '!format.dns1123Subdomain().validate(self).hasValue()'
               replicas:
                 default: 3
                 description: |-
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
@@ -22,9 +22,6 @@
                     {
                         "name": "BootcNodeManagement"
                     },
-                    {
-                        "name": "CPMSMachineNamePrefix"
-                    },
                     {
                         "name": "ClusterAPIInstall"
                     },
@@ -234,6 +231,9 @@
                     {
                         "name": "BuildCSIVolumes"
                     },
+                    {
+                        "name": "CPMSMachineNamePrefix"
+                    },
                     {
                         "name": "ChunkSizeMiB"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
@@ -22,9 +22,6 @@
                     {
                         "name": "BootcNodeManagement"
                     },
-                    {
-                        "name": "CPMSMachineNamePrefix"
-                    },
                     {
                         "name": "ClusterAPIInstall"
                     },
@@ -234,6 +231,9 @@
                     {
                         "name": "BuildCSIVolumes"
                     },
+                    {
+                        "name": "CPMSMachineNamePrefix"
+                    },
                     {
                         "name": "ChunkSizeMiB"
                     },

Original file line number	Diff line number	Diff line change
`@@ -22,9 +22,6 @@`
`22`	`22`	`{`
`23`	`23`	`"name": "BootcNodeManagement"`
`24`	`24`	`},`
`25`		`- {`
`26`		`- "name": "CPMSMachineNamePrefix"`
`27`		`- },`
`28`	`25`	`{`
`29`	`26`	`"name": "ClusterAPIInstall"`
`30`	`27`	`},`
`@@ -234,6 +231,9 @@`
`234`	`231`	`{`
`235`	`232`	`"name": "BuildCSIVolumes"`
`236`	`233`	`},`
	`234`	`+ {`
	`235`	`+ "name": "CPMSMachineNamePrefix"`
	`236`	`+ },`
`237`	`237`	`{`
`238`	`238`	`"name": "ChunkSizeMiB"`
`239`	`239`	`},`