From 2d3830354a48e9602181043c102c0e3787bf524f Mon Sep 17 00:00:00 2001 From: David Hill Date: Mon, 31 Aug 2026 10:16:23 -0400 Subject: [PATCH] Fix typo in heat Cfn as it is refered to as Cnf instead. heat-cfn is the right service name instead of heat-cnf which confuses operators. --- .../core.openstack.org_openstackcontrolplanes.yaml | 2 +- api/core/v1beta1/openstackcontrolplane_types.go | 4 ++-- api/core/v1beta1/openstackcontrolplane_webhook.go | 4 ++-- api/core/v1beta1/zz_generated.deepcopy.go | 2 +- bindata/crds/crds.yaml | 2 +- .../core.openstack.org_openstackcontrolplanes.yaml | 2 +- .../openstack-operator.clusterserviceversion.yaml | 8 ++++---- ...enstackcontrolplane_galera_network_isolation.yaml | 2 +- ...trolplane_galera_network_isolation_3replicas.yaml | 2 +- ...ackcontrolplane_galera_network_isolation_fr1.yaml | 2 +- ...eta1_openstackcontrolplane_network_isolation.yaml | 2 +- ...openstackcontrolplane_network_isolation_ceph.yaml | 2 +- ...lplane_network_isolation_tls_public_endpoint.yaml | 2 +- docs/assemblies/ctlplane_resources.adoc | 4 ++-- internal/openstack/heat.go | 2 +- .../ctlplane/openstackoperator_controller_test.go | 12 ++++++------ 16 files changed, 27 insertions(+), 27 deletions(-) diff --git a/api/bases/core.openstack.org_openstackcontrolplanes.yaml b/api/bases/core.openstack.org_openstackcontrolplanes.yaml index e67d80dc0b..a2a66ffdbc 100644 --- a/api/bases/core.openstack.org_openstackcontrolplanes.yaml +++ b/api/bases/core.openstack.org_openstackcontrolplanes.yaml @@ -5578,7 +5578,7 @@ spec: - message: gracePeriodDays must be smaller than expirationDays rule: '!(has(self.expirationDays) && has(self.gracePeriodDays)) || self.gracePeriodDays < self.expirationDays' - cnfAPIOverride: + cfnAPIOverride: properties: route: properties: diff --git a/api/core/v1beta1/openstackcontrolplane_types.go b/api/core/v1beta1/openstackcontrolplane_types.go index 14ebb4c639..ceb9aa4a6a 100644 --- a/api/core/v1beta1/openstackcontrolplane_types.go +++ b/api/core/v1beta1/openstackcontrolplane_types.go @@ -692,8 +692,8 @@ type HeatSection struct { // +kubebuilder:validation:Optional // +operator-sdk:csv:customresourcedefinitions:type=spec - // CnfAPIOverride, provides the ability to override the generated manifest of several child resources. - CnfAPIOverride Override `json:"cnfAPIOverride,omitempty"` + // CfnAPIOverride, provides the ability to override the generated manifest of several child resources. + CfnAPIOverride Override `json:"cfnAPIOverride,omitempty"` // ApplicationCredential allows service-specific overrides of the global AC configuration. // +operator-sdk:csv:customresourcedefinitions:type=spec diff --git a/api/core/v1beta1/openstackcontrolplane_webhook.go b/api/core/v1beta1/openstackcontrolplane_webhook.go index ab575cff63..e0c4caf35b 100644 --- a/api/core/v1beta1/openstackcontrolplane_webhook.go +++ b/api/core/v1beta1/openstackcontrolplane_webhook.go @@ -1161,8 +1161,8 @@ func (r *OpenStackControlPlane) DefaultServices() { r.Spec.Heat.Template.Default() initializeOverrideSpec(&r.Spec.Heat.APIOverride.Route, true) r.Spec.Heat.Template.SetDefaultRouteAnnotations(r.Spec.Heat.APIOverride.Route.Annotations) - initializeOverrideSpec(&r.Spec.Heat.CnfAPIOverride.Route, true) - r.Spec.Heat.Template.SetDefaultRouteAnnotations(r.Spec.Heat.CnfAPIOverride.Route.Annotations) + initializeOverrideSpec(&r.Spec.Heat.CfnAPIOverride.Route, true) + r.Spec.Heat.Template.SetDefaultRouteAnnotations(r.Spec.Heat.CfnAPIOverride.Route.Annotations) } // Swift diff --git a/api/core/v1beta1/zz_generated.deepcopy.go b/api/core/v1beta1/zz_generated.deepcopy.go index 94cd7761c6..ffdcb44b40 100644 --- a/api/core/v1beta1/zz_generated.deepcopy.go +++ b/api/core/v1beta1/zz_generated.deepcopy.go @@ -960,7 +960,7 @@ func (in *HeatSection) DeepCopyInto(out *HeatSection) { (*in).DeepCopyInto(*out) } in.APIOverride.DeepCopyInto(&out.APIOverride) - in.CnfAPIOverride.DeepCopyInto(&out.CnfAPIOverride) + in.CfnAPIOverride.DeepCopyInto(&out.CfnAPIOverride) if in.ApplicationCredential != nil { in, out := &in.ApplicationCredential, &out.ApplicationCredential *out = new(ServiceAppCredSection) diff --git a/bindata/crds/crds.yaml b/bindata/crds/crds.yaml index 79325e78fb..47db8e818d 100644 --- a/bindata/crds/crds.yaml +++ b/bindata/crds/crds.yaml @@ -6112,7 +6112,7 @@ spec: - message: gracePeriodDays must be smaller than expirationDays rule: '!(has(self.expirationDays) && has(self.gracePeriodDays)) || self.gracePeriodDays < self.expirationDays' - cnfAPIOverride: + cfnAPIOverride: properties: route: properties: diff --git a/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml b/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml index e67d80dc0b..a2a66ffdbc 100644 --- a/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml +++ b/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml @@ -5578,7 +5578,7 @@ spec: - message: gracePeriodDays must be smaller than expirationDays rule: '!(has(self.expirationDays) && has(self.gracePeriodDays)) || self.gracePeriodDays < self.expirationDays' - cnfAPIOverride: + cfnAPIOverride: properties: route: properties: diff --git a/config/manifests/bases/openstack-operator.clusterserviceversion.yaml b/config/manifests/bases/openstack-operator.clusterserviceversion.yaml index 19cc73f6fa..7743625172 100644 --- a/config/manifests/bases/openstack-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/openstack-operator.clusterserviceversion.yaml @@ -188,13 +188,13 @@ spec: global AC configuration. displayName: Application Credential path: heat.applicationCredential - - description: CnfAPIOverride, provides the ability to override the generated + - description: CfnAPIOverride, provides the ability to override the generated manifest of several child resources. - displayName: Cnf APIOverride - path: heat.cnfAPIOverride + displayName: Cfn APIOverride + path: heat.cfnAPIOverride - description: TLS - overrides tls parameters for public endpoint displayName: TLS - path: heat.cnfAPIOverride.tls + path: heat.cfnAPIOverride.tls - description: Enabled - Whether Heat services should be deployed and managed displayName: Enabled path: heat.enabled diff --git a/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation.yaml b/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation.yaml index c7ca633579..4b8a260c13 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation.yaml @@ -288,7 +288,7 @@ spec: heat: apiOverride: route: {} - cnfAPIOverride: + cfnAPIOverride: route: {} enabled: false template: diff --git a/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation_3replicas.yaml b/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation_3replicas.yaml index 678abf2906..04adb3716f 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation_3replicas.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation_3replicas.yaml @@ -290,7 +290,7 @@ spec: heat: apiOverride: route: {} - cnfAPIOverride: + cfnAPIOverride: route: {} enabled: false template: diff --git a/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation_fr1.yaml b/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation_fr1.yaml index 4d5c2d6438..25b9877493 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation_fr1.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation_fr1.yaml @@ -282,7 +282,7 @@ spec: heat: apiOverride: route: {} - cnfAPIOverride: + cfnAPIOverride: route: {} enabled: false template: diff --git a/config/samples/core_v1beta1_openstackcontrolplane_network_isolation.yaml b/config/samples/core_v1beta1_openstackcontrolplane_network_isolation.yaml index fbbe3e0f93..2dd2fb9537 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_network_isolation.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_network_isolation.yaml @@ -284,7 +284,7 @@ spec: heat: apiOverride: route: {} - cnfAPIOverride: + cfnAPIOverride: route: {} enabled: false template: diff --git a/config/samples/core_v1beta1_openstackcontrolplane_network_isolation_ceph.yaml b/config/samples/core_v1beta1_openstackcontrolplane_network_isolation_ceph.yaml index 26b270aa84..f5d686ac7f 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_network_isolation_ceph.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_network_isolation_ceph.yaml @@ -334,7 +334,7 @@ spec: heat: apiOverride: route: {} - cnfAPIOverride: + cfnAPIOverride: route: {} enabled: false template: diff --git a/config/samples/core_v1beta1_openstackcontrolplane_network_isolation_tls_public_endpoint.yaml b/config/samples/core_v1beta1_openstackcontrolplane_network_isolation_tls_public_endpoint.yaml index 8ed592602f..6b8b132740 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_network_isolation_tls_public_endpoint.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_network_isolation_tls_public_endpoint.yaml @@ -287,7 +287,7 @@ spec: heat: apiOverride: route: {} - cnfAPIOverride: + cfnAPIOverride: route: {} enabled: false template: diff --git a/docs/assemblies/ctlplane_resources.adoc b/docs/assemblies/ctlplane_resources.adoc index 5979fcd349..e536112c2b 100644 --- a/docs/assemblies/ctlplane_resources.adoc +++ b/docs/assemblies/ctlplane_resources.adoc @@ -965,8 +965,8 @@ HeatSection defines the desired state of Heat services | <> | false -| cnfAPIOverride -| CnfAPIOverride, provides the ability to override the generated manifest of several child resources. +| cfnAPIOverride +| CfnAPIOverride, provides the ability to override the generated manifest of several child resources. | <> | false |=== diff --git a/internal/openstack/heat.go b/internal/openstack/heat.go index 24168ea164..6ef52b7d42 100644 --- a/internal/openstack/heat.go +++ b/internal/openstack/heat.go @@ -206,7 +206,7 @@ func ReconcileHeat(ctx context.Context, instance *corev1beta1.OpenStackControlPl heat, svcs, instance.Spec.Heat.Template.HeatCfnAPI.Override.Service, - instance.Spec.Heat.CnfAPIOverride, + instance.Spec.Heat.CfnAPIOverride, corev1beta1.OpenStackControlPlaneExposeHeatReadyCondition, false, // TODO (mschuppert) could be removed when all integrated service support TLS instance.Spec.Heat.Template.HeatCfnAPI.TLS, diff --git a/test/functional/ctlplane/openstackoperator_controller_test.go b/test/functional/ctlplane/openstackoperator_controller_test.go index 6848236012..17cee117cc 100644 --- a/test/functional/ctlplane/openstackoperator_controller_test.go +++ b/test/functional/ctlplane/openstackoperator_controller_test.go @@ -728,9 +728,9 @@ var _ = Describe("OpenStackOperator controller", func() { Expect(OSCtlplane.Spec.Heat.APIOverride.Route).Should(Not(BeNil())) Expect(OSCtlplane.Spec.Heat.APIOverride.Route.Annotations).Should(HaveKeyWithValue("haproxy.router.openshift.io/timeout", "600s")) Expect(OSCtlplane.Spec.Heat.APIOverride.Route.Annotations).Should(HaveKeyWithValue("api.heat.openstack.org/timeout", "600s")) - Expect(OSCtlplane.Spec.Heat.CnfAPIOverride.Route).Should(Not(BeNil())) - Expect(OSCtlplane.Spec.Heat.CnfAPIOverride.Route.Annotations).Should(HaveKeyWithValue("haproxy.router.openshift.io/timeout", "600s")) - Expect(OSCtlplane.Spec.Heat.CnfAPIOverride.Route.Annotations).Should(HaveKeyWithValue("api.heat.openstack.org/timeout", "600s")) + Expect(OSCtlplane.Spec.Heat.CfnAPIOverride.Route).Should(Not(BeNil())) + Expect(OSCtlplane.Spec.Heat.CfnAPIOverride.Route.Annotations).Should(HaveKeyWithValue("haproxy.router.openshift.io/timeout", "600s")) + Expect(OSCtlplane.Spec.Heat.CfnAPIOverride.Route.Annotations).Should(HaveKeyWithValue("api.heat.openstack.org/timeout", "600s")) Expect(OSCtlplane.Spec.Manila.APIOverride.Route).Should(Not(BeNil())) Expect(OSCtlplane.Spec.Manila.APIOverride.Route.Annotations).Should(HaveKeyWithValue("haproxy.router.openshift.io/timeout", "60s")) Expect(OSCtlplane.Spec.Manila.APIOverride.Route.Annotations).Should(HaveKeyWithValue("api.manila.openstack.org/timeout", "60s")) @@ -994,9 +994,9 @@ var _ = Describe("OpenStackOperator controller", func() { Expect(OSCtlplane.Spec.Heat.APIOverride.Route).Should(Not(BeNil())) Expect(OSCtlplane.Spec.Heat.APIOverride.Route.Annotations).Should(HaveKeyWithValue("haproxy.router.openshift.io/timeout", "600s")) Expect(OSCtlplane.Spec.Heat.APIOverride.Route.Annotations).Should(HaveKeyWithValue("api.heat.openstack.org/timeout", "600s")) - Expect(OSCtlplane.Spec.Heat.CnfAPIOverride.Route).Should(Not(BeNil())) - Expect(OSCtlplane.Spec.Heat.CnfAPIOverride.Route.Annotations).Should(HaveKeyWithValue("haproxy.router.openshift.io/timeout", "600s")) - Expect(OSCtlplane.Spec.Heat.CnfAPIOverride.Route.Annotations).Should(HaveKeyWithValue("api.heat.openstack.org/timeout", "600s")) + Expect(OSCtlplane.Spec.Heat.CfnAPIOverride.Route).Should(Not(BeNil())) + Expect(OSCtlplane.Spec.Heat.CfnAPIOverride.Route.Annotations).Should(HaveKeyWithValue("haproxy.router.openshift.io/timeout", "600s")) + Expect(OSCtlplane.Spec.Heat.CfnAPIOverride.Route.Annotations).Should(HaveKeyWithValue("api.heat.openstack.org/timeout", "600s")) Expect(OSCtlplane.Spec.Telemetry.AodhAPIOverride.Route).Should(Not(BeNil())) Expect(OSCtlplane.Spec.Telemetry.AodhAPIOverride.Route.Annotations).Should(HaveKeyWithValue("haproxy.router.openshift.io/timeout", "60s")) Expect(OSCtlplane.Spec.Telemetry.AodhAPIOverride.Route.Annotations).Should(HaveKeyWithValue("api.aodh.openstack.org/timeout", "60s"))