From cf5f806f84bc587dcd1dc60bb653c5c501aa8cd6 Mon Sep 17 00:00:00 2001 From: chiragkyal Date: Mon, 31 Mar 2025 14:09:16 +0530 Subject: [PATCH] Promote CPMSMachineNamePrefix feature gate to default feature set Signed-off-by: chiragkyal --- features.md | 2 +- features/features.go | 2 +- ...1_controlplanemachinesets-Default.crd.yaml | 23 +++++++++++++++++++ ...1_controlplanemachinesets-Default.crd.yaml | 23 +++++++++++++++++++ .../featureGate-Hypershift-Default.yaml | 6 ++--- .../featureGate-SelfManagedHA-Default.yaml | 6 ++--- 6 files changed, 54 insertions(+), 8 deletions(-) diff --git a/features.md b/features.md index 3f1cb078b54..d35e5908f3e 100644 --- a/features.md +++ b/features.md @@ -17,7 +17,6 @@ | AWSClusterHostedDNS| | | Enabled | Enabled | Enabled | Enabled | | AutomatedEtcdBackup| | | Enabled | Enabled | Enabled | Enabled | | BootcNodeManagement| | | Enabled | Enabled | Enabled | Enabled | -| CPMSMachineNamePrefix| | | Enabled | Enabled | Enabled | Enabled | | ClusterAPIInstallIBMCloud| | | Enabled | Enabled | Enabled | Enabled | | ClusterMonitoringConfig| | | Enabled | Enabled | Enabled | Enabled | | ConsolePluginContentSecurityPolicy| | | Enabled | Enabled | Enabled | Enabled | @@ -74,6 +73,7 @@ | AzureWorkloadIdentity| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | BareMetalLoadBalancer| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | BuildCSIVolumes| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | +| CPMSMachineNamePrefix| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | ChunkSizeMiB| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | CloudDualStackNodeIPs| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | DisableKubeletCloudCredentialProviders| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | diff --git a/features/features.go b/features/features.go index 8149903396d..b904cffb281 100644 --- a/features/features.go +++ b/features/features.go @@ -240,7 +240,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 index 304bb629584..6a78fbaf923 100644 --- 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 index 304bb629584..6a78fbaf923 100644 --- 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 index 8e74138349f..229411f3b3f 100644 --- 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 index 93f4a1f3c58..c6ddbbe3db0 100644 --- 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" },