From 54dda23f0dcae2e8b53ccf5218a810b0a44c7dcf Mon Sep 17 00:00:00 2001 From: Pratik Uplenchwar Date: Fri, 25 Sep 2026 11:03:39 +0530 Subject: [PATCH] OCPBUGS-127072: spell FeatureGate DynamicServiceEndpointIBMCloud correctly The IBM Cloud service-endpoint FeatureGate was registered as DyanmicServiceEndpointIBMCloud. Use the correct spelling so enablement and FeatureGate status match the English name. Signed-off-by: Pratik Uplenchwar --- ...tIBMCloud.yaml => DynamicServiceEndpointIBMCloud.yaml} | 2 +- config/v1/types_infrastructure.go | 8 ++++---- config/v1/zz_generated.featuregated-crd-manifests.yaml | 2 +- ...tIBMCloud.yaml => DynamicServiceEndpointIBMCloud.yaml} | 2 +- features.md | 2 +- features/features.go | 2 +- ...tIBMCloud.yaml => DynamicServiceEndpointIBMCloud.yaml} | 2 +- .../v1/zz_generated.featuregated-crd-manifests.yaml | 2 +- ...tIBMCloud.yaml => DynamicServiceEndpointIBMCloud.yaml} | 2 +- .../featuregates/featureGate-4-10-Hypershift-Default.yaml | 2 +- .../featureGate-4-10-Hypershift-DevPreviewNoUpgrade.yaml | 2 +- .../featuregates/featureGate-4-10-Hypershift-OKD.yaml | 2 +- .../featureGate-4-10-Hypershift-TechPreviewNoUpgrade.yaml | 2 +- .../featureGate-4-10-SelfManagedHA-Default.yaml | 2 +- ...eatureGate-4-10-SelfManagedHA-DevPreviewNoUpgrade.yaml | 2 +- .../featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml | 2 +- ...atureGate-4-10-SelfManagedHA-TechPreviewNoUpgrade.yaml | 2 +- 17 files changed, 20 insertions(+), 20 deletions(-) rename config/v1/tests/infrastructures.config.openshift.io/{DyanmicServiceEndpointIBMCloud.yaml => DynamicServiceEndpointIBMCloud.yaml} (99%) rename config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/{DyanmicServiceEndpointIBMCloud.yaml => DynamicServiceEndpointIBMCloud.yaml} (99%) rename machineconfiguration/v1/tests/controllerconfigs.machineconfiguration.openshift.io/{DyanmicServiceEndpointIBMCloud.yaml => DynamicServiceEndpointIBMCloud.yaml} (99%) rename machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/{DyanmicServiceEndpointIBMCloud.yaml => DynamicServiceEndpointIBMCloud.yaml} (99%) diff --git a/config/v1/tests/infrastructures.config.openshift.io/DyanmicServiceEndpointIBMCloud.yaml b/config/v1/tests/infrastructures.config.openshift.io/DynamicServiceEndpointIBMCloud.yaml similarity index 99% rename from config/v1/tests/infrastructures.config.openshift.io/DyanmicServiceEndpointIBMCloud.yaml rename to config/v1/tests/infrastructures.config.openshift.io/DynamicServiceEndpointIBMCloud.yaml index 1a82b735a5a..91ed3917adc 100644 --- a/config/v1/tests/infrastructures.config.openshift.io/DyanmicServiceEndpointIBMCloud.yaml +++ b/config/v1/tests/infrastructures.config.openshift.io/DynamicServiceEndpointIBMCloud.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if w name: "Infrastructure" crdName: infrastructures.config.openshift.io featureGates: -- DyanmicServiceEndpointIBMCloud +- DynamicServiceEndpointIBMCloud tests: onCreate: - name: Should be able to create a minimal Infrastructure diff --git a/config/v1/types_infrastructure.go b/config/v1/types_infrastructure.go index 857f9b27929..49ca4b1bca9 100644 --- a/config/v1/types_infrastructure.go +++ b/config/v1/types_infrastructure.go @@ -1898,8 +1898,8 @@ type IBMCloudServiceEndpoint struct { // +kubebuilder:validation:Type=string // +kubebuilder:validation:MaxLength=300 // +kubebuilder:validation:XValidation:rule="isURL(self)",message="url must be a valid absolute URL" - // +openshift:validation:FeatureGateAwareXValidation:featureGate=DyanmicServiceEndpointIBMCloud,rule="url(self).getScheme() == \"https\"",message="url must use https scheme" - // +openshift:validation:FeatureGateAwareXValidation:featureGate=DyanmicServiceEndpointIBMCloud,rule=`matches((url(self).getEscapedPath()), '^/(api/)?v[0-9]+/{0,1}$')`,message="url path must match /v[0,9]+ or /api/v[0,9]+" + // +openshift:validation:FeatureGateAwareXValidation:featureGate=DynamicServiceEndpointIBMCloud,rule="url(self).getScheme() == \"https\"",message="url must use https scheme" + // +openshift:validation:FeatureGateAwareXValidation:featureGate=DynamicServiceEndpointIBMCloud,rule=`matches((url(self).getEscapedPath()), '^/(api/)?v[0-9]+/{0,1}$')`,message="url path must match /v[0,9]+ or /api/v[0,9]+" URL string `json:"url"` } @@ -1917,7 +1917,7 @@ type IBMCloudPlatformSpec struct { // +listType=map // +listMapKey=name // +optional - // +openshift:enable:FeatureGate=DyanmicServiceEndpointIBMCloud + // +openshift:enable:FeatureGate=DynamicServiceEndpointIBMCloud ServiceEndpoints []IBMCloudServiceEndpoint `json:"serviceEndpoints,omitempty"` } @@ -1946,7 +1946,7 @@ type IBMCloudPlatformStatus struct { // overridden. The CCCMO reads in the IBMCloudPlatformSpec and validates each // endpoint is resolvable. Once validated, the cloud config and IBMCloudPlatformStatus // are updated to reflect the same custom endpoints. - // +openshift:validation:FeatureGateAwareMaxItems:featureGate=DyanmicServiceEndpointIBMCloud,maxItems=15 + // +openshift:validation:FeatureGateAwareMaxItems:featureGate=DynamicServiceEndpointIBMCloud,maxItems=15 // +listType=map // +listMapKey=name // +optional diff --git a/config/v1/zz_generated.featuregated-crd-manifests.yaml b/config/v1/zz_generated.featuregated-crd-manifests.yaml index 09c8665a8f2..d4615d50995 100644 --- a/config/v1/zz_generated.featuregated-crd-manifests.yaml +++ b/config/v1/zz_generated.featuregated-crd-manifests.yaml @@ -393,7 +393,7 @@ infrastructures.config.openshift.io: - AzureDualStackInstall - BGPBasedVIPManagement - DualReplica - - DyanmicServiceEndpointIBMCloud + - DynamicServiceEndpointIBMCloud - GCPSovereignCloudInstall - MutableTopology - NutanixMultiSubnets diff --git a/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/DyanmicServiceEndpointIBMCloud.yaml b/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/DynamicServiceEndpointIBMCloud.yaml similarity index 99% rename from config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/DyanmicServiceEndpointIBMCloud.yaml rename to config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/DynamicServiceEndpointIBMCloud.yaml index ea678eab123..774da30aa9c 100644 --- a/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/DyanmicServiceEndpointIBMCloud.yaml +++ b/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/DynamicServiceEndpointIBMCloud.yaml @@ -6,7 +6,7 @@ metadata: api.openshift.io/filename-cvo-runlevel: "0000_10" api.openshift.io/filename-operator: config-operator api.openshift.io/filename-ordering: "01" - feature-gate.release.openshift.io/DyanmicServiceEndpointIBMCloud: "true" + feature-gate.release.openshift.io/DynamicServiceEndpointIBMCloud: "true" release.openshift.io/bootstrap-required: "true" name: infrastructures.config.openshift.io spec: diff --git a/features.md b/features.md index 4be7644795b..46335addac8 100644 --- a/features.md +++ b/features.md @@ -56,7 +56,7 @@ | ClusterVersionOperatorConfiguration| | | Enabled | Enabled | | | Enabled | Enabled | | ConfigurablePKI| | | Enabled | Enabled | | | Enabled | Enabled | | DNSNameResolver| | | Enabled | Enabled | | | Enabled | Enabled | -| DyanmicServiceEndpointIBMCloud| | | Enabled | Enabled | | | Enabled | Enabled | +| DynamicServiceEndpointIBMCloud| | | Enabled | Enabled | | | Enabled | Enabled | | EgressIPNodeSelector| | | Enabled | Enabled | | | Enabled | Enabled | | Example| | | Enabled | Enabled | | | Enabled | Enabled | | ExternalOIDCAsWebhook| | | Enabled | Enabled | | | Enabled | Enabled | diff --git a/features/features.go b/features/features.go index 66100ec9f98..a24de83a4a0 100644 --- a/features/features.go +++ b/features/features.go @@ -706,7 +706,7 @@ var ( enable(inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()). mustRegister() - FeatureGateDyanmicServiceEndpointIBMCloud = newFeatureGate("DyanmicServiceEndpointIBMCloud"). + FeatureGateDynamicServiceEndpointIBMCloud = newFeatureGate("DynamicServiceEndpointIBMCloud"). reportProblemsToJiraComponent("Cloud Compute / IBM Provider"). contactPerson("jared-hayes-dev"). productScope(ocpSpecific). diff --git a/machineconfiguration/v1/tests/controllerconfigs.machineconfiguration.openshift.io/DyanmicServiceEndpointIBMCloud.yaml b/machineconfiguration/v1/tests/controllerconfigs.machineconfiguration.openshift.io/DynamicServiceEndpointIBMCloud.yaml similarity index 99% rename from machineconfiguration/v1/tests/controllerconfigs.machineconfiguration.openshift.io/DyanmicServiceEndpointIBMCloud.yaml rename to machineconfiguration/v1/tests/controllerconfigs.machineconfiguration.openshift.io/DynamicServiceEndpointIBMCloud.yaml index e131cc81119..a5d6ac59545 100644 --- a/machineconfiguration/v1/tests/controllerconfigs.machineconfiguration.openshift.io/DyanmicServiceEndpointIBMCloud.yaml +++ b/machineconfiguration/v1/tests/controllerconfigs.machineconfiguration.openshift.io/DynamicServiceEndpointIBMCloud.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if w name: "ControllerConfig" crdName: controllerconfigs.machineconfiguration.openshift.io featureGates: -- DyanmicServiceEndpointIBMCloud +- DynamicServiceEndpointIBMCloud tests: onCreate: - name: Should be able to create a minimal ControllerConfig diff --git a/machineconfiguration/v1/zz_generated.featuregated-crd-manifests.yaml b/machineconfiguration/v1/zz_generated.featuregated-crd-manifests.yaml index f7d431aa103..b56a61991aa 100644 --- a/machineconfiguration/v1/zz_generated.featuregated-crd-manifests.yaml +++ b/machineconfiguration/v1/zz_generated.featuregated-crd-manifests.yaml @@ -36,7 +36,7 @@ controllerconfigs.machineconfiguration.openshift.io: - AzureDualStackInstall - BGPBasedVIPManagement - DualReplica - - DyanmicServiceEndpointIBMCloud + - DynamicServiceEndpointIBMCloud - GCPSovereignCloudInstall - MutableTopology - NutanixMultiSubnets diff --git a/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/DyanmicServiceEndpointIBMCloud.yaml b/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/DynamicServiceEndpointIBMCloud.yaml similarity index 99% rename from machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/DyanmicServiceEndpointIBMCloud.yaml rename to machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/DynamicServiceEndpointIBMCloud.yaml index 391d451018d..adc785a3364 100644 --- a/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/DyanmicServiceEndpointIBMCloud.yaml +++ b/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/DynamicServiceEndpointIBMCloud.yaml @@ -6,7 +6,7 @@ metadata: api.openshift.io/filename-cvo-runlevel: "0000_80" api.openshift.io/filename-operator: machine-config api.openshift.io/filename-ordering: "01" - feature-gate.release.openshift.io/DyanmicServiceEndpointIBMCloud: "true" + feature-gate.release.openshift.io/DynamicServiceEndpointIBMCloud: "true" labels: openshift.io/operator-managed: "" name: controllerconfigs.machineconfiguration.openshift.io diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml index 32bcdfe3539..b6ffff27794 100644 --- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml @@ -120,7 +120,7 @@ "name": "DRADeviceTaintRules" }, { - "name": "DyanmicServiceEndpointIBMCloud" + "name": "DynamicServiceEndpointIBMCloud" }, { "name": "EgressIPNodeSelector" diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-DevPreviewNoUpgrade.yaml index d7336da6b25..c668bedd54d 100644 --- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-DevPreviewNoUpgrade.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-DevPreviewNoUpgrade.yaml @@ -196,7 +196,7 @@ "name": "DualReplica" }, { - "name": "DyanmicServiceEndpointIBMCloud" + "name": "DynamicServiceEndpointIBMCloud" }, { "name": "EVPN" diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml index 8d941c956fc..2f62a723a57 100644 --- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml @@ -122,7 +122,7 @@ "name": "DRADeviceTaintRules" }, { - "name": "DyanmicServiceEndpointIBMCloud" + "name": "DynamicServiceEndpointIBMCloud" }, { "name": "EgressIPNodeSelector" diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-TechPreviewNoUpgrade.yaml index a7e86a203fd..1cc68d0334d 100644 --- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-TechPreviewNoUpgrade.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-TechPreviewNoUpgrade.yaml @@ -214,7 +214,7 @@ "name": "DualReplica" }, { - "name": "DyanmicServiceEndpointIBMCloud" + "name": "DynamicServiceEndpointIBMCloud" }, { "name": "EVPN" diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml index 97ae964e68b..11a853cc6ff 100644 --- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml @@ -117,7 +117,7 @@ "name": "DRADeviceTaintRules" }, { - "name": "DyanmicServiceEndpointIBMCloud" + "name": "DynamicServiceEndpointIBMCloud" }, { "name": "EgressIPNodeSelector" diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-DevPreviewNoUpgrade.yaml index 944deb8e153..71b6ec86c41 100644 --- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-DevPreviewNoUpgrade.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-DevPreviewNoUpgrade.yaml @@ -166,7 +166,7 @@ "name": "DualReplica" }, { - "name": "DyanmicServiceEndpointIBMCloud" + "name": "DynamicServiceEndpointIBMCloud" }, { "name": "EVPN" diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml index 124fe89835a..1afc1b1a182 100644 --- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml @@ -119,7 +119,7 @@ "name": "DRADeviceTaintRules" }, { - "name": "DyanmicServiceEndpointIBMCloud" + "name": "DynamicServiceEndpointIBMCloud" }, { "name": "EgressIPNodeSelector" diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-TechPreviewNoUpgrade.yaml index 4856a517930..6fe9a24fe79 100644 --- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-TechPreviewNoUpgrade.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-TechPreviewNoUpgrade.yaml @@ -193,7 +193,7 @@ "name": "DualReplica" }, { - "name": "DyanmicServiceEndpointIBMCloud" + "name": "DynamicServiceEndpointIBMCloud" }, { "name": "EVPN"