From 2f85eadd77fd5d880b5ce8754592dea0857525b5 Mon Sep 17 00:00:00 2001 From: Rajesh Tailor Date: Wed, 3 Sep 2025 12:03:22 +0530 Subject: [PATCH] Fix duplicate words This change fixes duplicate consecutive words from docs as well as code. --- apis/client/v1beta1/openstackclient_types.go | 2 +- docs/assemblies/condition.adoc | 2 +- docs/assemblies/ctlplane_resources.adoc | 68 ++++++++++---------- kuttl-test.yaml | 2 +- pkg/openstack/redis.go | 2 +- pkg/operator/bindata/merge.go | 2 +- 6 files changed, 39 insertions(+), 39 deletions(-) diff --git a/apis/client/v1beta1/openstackclient_types.go b/apis/client/v1beta1/openstackclient_types.go index 39cc514ce7..d6592717ba 100644 --- a/apis/client/v1beta1/openstackclient_types.go +++ b/apis/client/v1beta1/openstackclient_types.go @@ -33,7 +33,7 @@ type OpenStackClientSpec struct { OpenStackClientSpecCore `json:",inline"` // +kubebuilder:validation:Required - // ContainerImage for the the OpenstackClient container (will be set to environmental default if empty) + // ContainerImage for the OpenstackClient container (will be set to environmental default if empty) ContainerImage string `json:"containerImage"` } diff --git a/docs/assemblies/condition.adoc b/docs/assemblies/condition.adoc index 68b67a01f6..68d1134e35 100644 --- a/docs/assemblies/condition.adoc +++ b/docs/assemblies/condition.adoc @@ -41,7 +41,7 @@ OpenStackDataPlaneNodeSet uses the following conditions: | True when the NodeSet has been deployed successfully. False when the deployment is not yet requested or failed, or there are other failed conditions. | DeploymentReady -| True when the the NodeSet has been deployed successfully +| True when the NodeSet has been deployed successfully | InputReady | True when the required inputs are available and ready diff --git a/docs/assemblies/ctlplane_resources.adoc b/docs/assemblies/ctlplane_resources.adoc index 4d2691ee65..cc85724f0d 100644 --- a/docs/assemblies/ctlplane_resources.adoc +++ b/docs/assemblies/ctlplane_resources.adoc @@ -642,7 +642,7 @@ OpenStackClientSpec defines the desired state of OpenStackClient | Field | Description | Scheme | Required | containerImage -| ContainerImage for the the OpenstackClient container (will be set to environmental default if empty) +| ContainerImage for the OpenstackClient container (will be set to environmental default if empty) | string | true |=== @@ -2904,7 +2904,7 @@ BarbicanSpecBase - | false | customServiceConfig -| CustomServiceConfig - customize the service config using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to to /etc/++++++/++++++.conf.d directory as custom.conf file.++++++++++++ +| CustomServiceConfig - customize the service config using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to /etc/++++++/++++++.conf.d directory as custom.conf file.++++++++++++ | string | false @@ -3157,7 +3157,7 @@ BarbicanComponentTemplate - Variables used by every sub-component of Barbican (e | true | customServiceConfig -| CustomServiceConfig - customize the service config using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to to /etc/++++++/++++++.conf.d directory as a custom config file.++++++++++++ +| CustomServiceConfig - customize the service config using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to /etc/++++++/++++++.conf.d directory as a custom config file.++++++++++++ | string | false @@ -3972,7 +3972,7 @@ CinderSpec defines the desired state of Cinder | true | customServiceConfig -| CustomServiceConfig - customize the service config for all Cinder services using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to to /etc/++++++/++++++.conf.d directory as a custom config file.++++++++++++ +| CustomServiceConfig - customize the service config for all Cinder services using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to /etc/++++++/++++++.conf.d directory as a custom config file.++++++++++++ | string | false @@ -4312,7 +4312,7 @@ CinderServiceTemplate defines the input parameters that can be defined for a giv | false | customServiceConfig -| CustomServiceConfig - customize the service config using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to to /etc/++++++/++++++.conf.d directory as a custom config file.++++++++++++ +| CustomServiceConfig - customize the service config using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to /etc/++++++/++++++.conf.d directory as a custom config file.++++++++++++ | string | false @@ -4416,7 +4416,7 @@ DesignateServiceTemplate defines the input parameters that can be defined for a | false | customServiceConfig -| CustomServiceConfig - customize the service config using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to to /etc/++++++/++++++.conf.d directory as a custom config file.++++++++++++ +| CustomServiceConfig - customize the service config using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to /etc/++++++/++++++.conf.d directory as a custom config file.++++++++++++ | string | false @@ -5448,7 +5448,7 @@ DesignateSpecBase - | false | customServiceConfig -| CustomServiceConfig - customize the service config using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to to /etc/++++++/++++++.conf.d directory as custom.conf file.++++++++++++ +| CustomServiceConfig - customize the service config using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to /etc/++++++/++++++.conf.d directory as custom.conf file.++++++++++++ | string | false @@ -5938,7 +5938,7 @@ GlanceAPITemplate defines the desired state of GlanceAPI | false | customServiceConfig -| CustomServiceConfig - customize the service config using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to to /etc/++++++/++++++.conf.d directory as custom.conf file.++++++++++++ +| CustomServiceConfig - customize the service config using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to /etc/++++++/++++++.conf.d directory as custom.conf file.++++++++++++ | string | false @@ -6375,7 +6375,7 @@ GlanceSpecCore defines the desired state of Glance | true | customServiceConfig -| CustomServiceConfig - customize the service config using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to to /etc/++++++/++++++.conf.d directory as custom.conf file.++++++++++++ +| CustomServiceConfig - customize the service config using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to /etc/++++++/++++++.conf.d directory as custom.conf file.++++++++++++ | string | false @@ -6596,7 +6596,7 @@ HeatServiceTemplate - | false | customServiceConfig -| CustomServiceConfig - customize the service config using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to to /etc/heat/heat.conf.d directory as 02-custom-service.conf file. +| CustomServiceConfig - customize the service config using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to /etc/heat/heat.conf.d directory as 02-custom-service.conf file. | string | false @@ -7214,7 +7214,7 @@ HeatSpec defines the desired state of Heat | true | customServiceConfig -| CustomServiceConfig - customize the service config using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to to /etc/heat/heat.conf.d directory as 01-custom.conf file. +| CustomServiceConfig - customize the service config using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to /etc/heat/heat.conf.d directory as 01-custom.conf file. | string | false @@ -7477,7 +7477,7 @@ HorizonSpecCore - | true | customServiceConfig -| CustomServiceConfig - customize the service config using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to to /etc/openstack-dashboard/local_settings.d directory as 9999_custom_settings.py file. +| CustomServiceConfig - customize the service config using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to /etc/openstack-dashboard/local_settings.d directory as 9999_custom_settings.py file. | string | true @@ -7579,7 +7579,7 @@ IronicServiceTemplate defines the common input parameters for Ironic services | false | customServiceConfig -| CustomServiceConfig - customize the service config using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to to /etc/++++++/++++++.conf.d directory as custom.conf file.++++++++++++ +| CustomServiceConfig - customize the service config using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to /etc/++++++/++++++.conf.d directory as custom.conf file.++++++++++++ | string | true @@ -8269,7 +8269,7 @@ IronicInspectorTemplate defines the input parameters for Ironic Inspector servic | true | customServiceConfig -| CustomServiceConfig - customize the service config using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to to /etc/++++++/++++++.conf.d directory as custom.conf file.++++++++++++ +| CustomServiceConfig - customize the service config using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to /etc/++++++/++++++.conf.d directory as custom.conf file.++++++++++++ | string | true @@ -8655,7 +8655,7 @@ IronicSpec defines the desired state of Ironic | true | customServiceConfig -| CustomServiceConfig - customize the service config using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to to /etc/++++++/++++++.conf.d directory as custom.conf file.++++++++++++ +| CustomServiceConfig - customize the service config using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to /etc/++++++/++++++.conf.d directory as custom.conf file.++++++++++++ | string | true @@ -8970,7 +8970,7 @@ KeystoneAPISpec defines the desired state of KeystoneAPI | true | customServiceConfig -| CustomServiceConfig - customize the service config using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to to /etc/++++++/++++++.conf.d directory as custom.conf file.++++++++++++ +| CustomServiceConfig - customize the service config using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to /etc/++++++/++++++.conf.d directory as custom.conf file.++++++++++++ | string | false @@ -9393,7 +9393,7 @@ ManilaServiceTemplate defines the input parameters that can be defined for a giv | false | customServiceConfig -| CustomServiceConfig - customize the service config using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to to /etc/++++++/++++++.conf.d directory a custom config file.++++++++++++ +| CustomServiceConfig - customize the service config using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to /etc/++++++/++++++.conf.d directory a custom config file.++++++++++++ | string | false @@ -10156,7 +10156,7 @@ ManilaSpecBase - | false | customServiceConfig -| CustomServiceConfig - customize the service config for all Manila services using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to to /etc/++++++/++++++.conf.d directory a custom config file.++++++++++++ +| CustomServiceConfig - customize the service config for all Manila services using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to /etc/++++++/++++++.conf.d directory a custom config file.++++++++++++ | string | false @@ -10857,7 +10857,7 @@ NeutronAPISpecCore - | true | customServiceConfig -| CustomServiceConfig - customize the service config using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to to /etc/++++++/++++++.conf.d directory as custom.conf file.++++++++++++ +| CustomServiceConfig - customize the service config using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to /etc/++++++/++++++.conf.d directory as custom.conf file.++++++++++++ | string | false @@ -11083,7 +11083,7 @@ NovaServiceBase contains the fields that are needed for each nova service CRD | false | customServiceConfig -| CustomServiceConfig - customize the service config using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to to /etc/++++++/++++++.conf.d directory as custom.conf file.++++++++++++ +| CustomServiceConfig - customize the service config using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to /etc/++++++/++++++.conf.d directory as custom.conf file.++++++++++++ | string | true @@ -11340,7 +11340,7 @@ NovaAPITemplate defines the input parameters specified by the user to create a N | false | customServiceConfig -| CustomServiceConfig - customize the service config using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to to /etc/++++++/++++++.conf.d directory as custom.conf file.++++++++++++ +| CustomServiceConfig - customize the service config using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to /etc/++++++/++++++.conf.d directory as custom.conf file.++++++++++++ | string | true @@ -11867,7 +11867,7 @@ NovaComputeTemplate defines the input parameters specified by the user to create | false | customServiceConfig -| CustomServiceConfig - customize the service config using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to to /etc/++++++/++++++.conf.d directory as custom.conf file.++++++++++++ +| CustomServiceConfig - customize the service config using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to /etc/++++++/++++++.conf.d directory as custom.conf file.++++++++++++ | string | true @@ -12077,7 +12077,7 @@ NovaConductorTemplate defines the input parameters specified by the user to crea | false | customServiceConfig -| CustomServiceConfig - customize the service config using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to to /etc/++++++/++++++.conf.d directory as custom.conf file.++++++++++++ +| CustomServiceConfig - customize the service config using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to /etc/++++++/++++++.conf.d directory as custom.conf file.++++++++++++ | string | true @@ -12313,7 +12313,7 @@ NovaMetadataTemplate defines the input parameters specified by the user to creat | false | customServiceConfig -| CustomServiceConfig - customize the service config using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to to /etc/++++++/++++++.conf.d directory as custom.conf file.++++++++++++ +| CustomServiceConfig - customize the service config using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to /etc/++++++/++++++.conf.d directory as custom.conf file.++++++++++++ | string | true @@ -12523,7 +12523,7 @@ NovaNoVNCProxyTemplate defines the input parameters specified by the user to cre | false | customServiceConfig -| CustomServiceConfig - customize the service config using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to to /etc/++++++/++++++.conf.d directory as custom.conf file.++++++++++++ +| CustomServiceConfig - customize the service config using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to /etc/++++++/++++++.conf.d directory as custom.conf file.++++++++++++ | string | true @@ -12765,7 +12765,7 @@ NovaSchedulerTemplate defines the input parameters specified by the user to crea | false | customServiceConfig -| CustomServiceConfig - customize the service config using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to to /etc/++++++/++++++.conf.d directory as custom.conf file.++++++++++++ +| CustomServiceConfig - customize the service config using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to /etc/++++++/++++++.conf.d directory as custom.conf file.++++++++++++ | string | true @@ -13098,7 +13098,7 @@ OctaviaAmphoraControllerSpecCore - | false | customServiceConfig -| CustomServiceConfig - customize the service config using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to to /etc/++++++/++++++.conf.d directory as custom.conf file.++++++++++++ +| CustomServiceConfig - customize the service config using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to /etc/++++++/++++++.conf.d directory as custom.conf file.++++++++++++ | string | false @@ -13374,7 +13374,7 @@ OctaviaAPISpecCore - | false | customServiceConfig -| CustomServiceConfig - customize the service config using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to to /etc/++++++/++++++.conf.d directory as custom.conf file.++++++++++++ +| CustomServiceConfig - customize the service config using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to /etc/++++++/++++++.conf.d directory as custom.conf file.++++++++++++ | string | false @@ -13914,7 +13914,7 @@ OctaviaSpecBase - | false | customServiceConfig -| CustomServiceConfig - customize the service config using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to to /etc/++++++/++++++.conf.d directory as custom.conf file.++++++++++++ +| CustomServiceConfig - customize the service config using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to /etc/++++++/++++++.conf.d directory as custom.conf file.++++++++++++ | string | false @@ -15510,7 +15510,7 @@ PlacementAPISpecCore - | true | customServiceConfig -| CustomServiceConfig - customize the service config using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to to /etc/++++++/++++++.conf.d directory as custom.conf file.++++++++++++ +| CustomServiceConfig - customize the service config using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to /etc/++++++/++++++.conf.d directory as custom.conf file.++++++++++++ | string | true @@ -16421,7 +16421,7 @@ Aodh defines the aodh component spec | true | customServiceConfig -| CustomServiceConfig - customize the service config using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to to /etc/++++++/++++++.conf.d directory as custom.conf file.++++++++++++ +| CustomServiceConfig - customize the service config using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to /etc/++++++/++++++.conf.d directory as custom.conf file.++++++++++++ | string | false @@ -16786,7 +16786,7 @@ CeilometerSpecCore defines the desired state of Ceilometer. This version is used | true | customServiceConfig -| CustomServiceConfig - customize the service config using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to to /etc/++++++/++++++.conf.d directory as custom.conf file.++++++++++++ +| CustomServiceConfig - customize the service config using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to /etc/++++++/++++++.conf.d directory as custom.conf file.++++++++++++ | string | false @@ -17579,7 +17579,7 @@ WatcherCommon defines a spec based reusable for all the CRDs | false | customServiceConfig -| CustomServiceConfig - customize the service config using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to to /etc/++++++/++++++.conf.d directory as a custom config file.++++++++++++ +| CustomServiceConfig - customize the service config using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to /etc/++++++/++++++.conf.d directory as a custom config file.++++++++++++ | string | false @@ -17721,7 +17721,7 @@ WatcherSubCrsTemplate define de common part of the input parameters specified by | false | customServiceConfig -| CustomServiceConfig - customize the service config using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to to /etc/++++++/++++++.conf.d directory as a custom config file.++++++++++++ +| CustomServiceConfig - customize the service config using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to /etc/++++++/++++++.conf.d directory as a custom config file.++++++++++++ | string | false diff --git a/kuttl-test.yaml b/kuttl-test.yaml index efdf8e22a0..59c72b1858 100644 --- a/kuttl-test.yaml +++ b/kuttl-test.yaml @@ -8,7 +8,7 @@ # 1. Latest version of kuttl is installed at /usr/local/bin/kubectl-kuttl # 2. An OCP 4.10+ CRC cluster with Podified Operators has been deployed # 3. CLI user has access to $KUBECONFIG -# 4. The environment variable INSTALL_YAMLS is set to the the path of the +# 4. The environment variable INSTALL_YAMLS is set to the path of the # install_yamls repo apiVersion: kuttl.dev/v1beta1 diff --git a/pkg/openstack/redis.go b/pkg/openstack/redis.go index c64c7a0722..e1c54dc535 100644 --- a/pkg/openstack/redis.go +++ b/pkg/openstack/redis.go @@ -49,7 +49,7 @@ func ReconcileRedis( // disabled from the start scenario when it likely should *not* // start appearing in conditions. It also means that the situation // where sample template data in a config where redis is disabled - // will require require that the controller iterator over the + // will require that the controller iterator over the // specs and make sure that existing deployed redis instances are // deleted. Generally means if we want the redis controller to // truly remain invisible it's best not to provide any example diff --git a/pkg/operator/bindata/merge.go b/pkg/operator/bindata/merge.go index f32a8190b8..ab7a6d762e 100644 --- a/pkg/operator/bindata/merge.go +++ b/pkg/operator/bindata/merge.go @@ -10,7 +10,7 @@ const ( ) // MergeMetadataForUpdate merges the read-only fields of metadata. -// This is to be able to do a a meaningful comparison in apply, +// This is to be able to do a meaningful comparison in apply, // since objects created on runtime do not have these fields populated. func MergeMetadataForUpdate(current, updated *uns.Unstructured) error { updated.SetCreationTimestamp(current.GetCreationTimestamp())