Skip to content

Commit ab67a0f

Browse files
Merge pull request #437 from ratailor/fix-dups
Fix duplicate words
2 parents c6051f6 + 6e7df5d commit ab67a0f

File tree

8 files changed

+12
-12
lines changed

8 files changed

+12
-12
lines changed

apis/bases/instanceha.openstack.org_instancehas.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ spec:
5353
bundle file
5454
type: string
5555
containerImage:
56-
description: ContainerImage for the the InstanceHa container (will
57-
be set to environmental default if empty)
56+
description: ContainerImage for the InstanceHa container (will be
57+
set to environmental default if empty)
5858
type: string
5959
fencingSecret:
6060
default: fencing-secret

apis/instanceha/v1beta1/instanceha_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ const (
3636
// InstanceHaSpec defines the desired state of InstanceHa
3737
type InstanceHaSpec struct {
3838
// +kubebuilder:validation:Optional
39-
// ContainerImage for the the InstanceHa container (will be set to environmental default if empty)
39+
// ContainerImage for the InstanceHa container (will be set to environmental default if empty)
4040
ContainerImage string `json:"containerImage"`
4141

4242
// +kubebuilder:validation:Required

config/crd/bases/instanceha.openstack.org_instancehas.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ spec:
5353
bundle file
5454
type: string
5555
containerImage:
56-
description: ContainerImage for the the InstanceHa container (will
57-
be set to environmental default if empty)
56+
description: ContainerImage for the InstanceHa container (will be
57+
set to environmental default if empty)
5858
type: string
5959
fencingSecret:
6060
default: fencing-secret

controllers/network/bgpconfiguration_controller.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ func (r *BGPConfigurationReconciler) SetupWithManager(ctx context.Context, mgr c
258258
},
259259
DeleteFunc: func(e event.DeleteEvent) bool {
260260
// Skip if
261-
// * NAD annotation annotation key is missing
261+
// * NAD annotation key is missing
262262
// * there is no additional network configured
263263
if val, ok := e.Object.GetAnnotations()[k8s_networkv1.NetworkAttachmentAnnot]; !ok || len(val) == 0 {
264264
return false
@@ -268,7 +268,7 @@ func (r *BGPConfigurationReconciler) SetupWithManager(ctx context.Context, mgr c
268268
},
269269
CreateFunc: func(e event.CreateEvent) bool {
270270
// Skip if
271-
// * NAD annotation annotation key is missing
271+
// * NAD annotation key is missing
272272
// * there is no additional network configured
273273
if val, ok := e.Object.GetAnnotations()[k8s_networkv1.NetworkAttachmentAnnot]; !ok || len(val) == 0 {
274274
return false

controllers/network/dnsmasq_controller.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,7 @@ func (r *DNSMasqReconciler) reconcileNormal(ctx context.Context, instance *netwo
590590
}
591591

592592
// Mark the Deployment as Ready only if the number of Replicas is equals
593-
// to the Deployed instances (ReadyCount), and the the Status.Replicas
593+
// to the Deployed instances (ReadyCount), and the Status.Replicas
594594
// match Status.ReadyReplicas. If a deployment update is in progress,
595595
// Replicas > ReadyReplicas.
596596
// In addition, make sure the controller sees the last Generation
@@ -618,7 +618,7 @@ func (r *DNSMasqReconciler) reconcileNormal(ctx context.Context, instance *netwo
618618
return ctrl.Result{}, nil
619619
}
620620

621-
// generateServiceConfigMaps - create create configmaps which hold service configuration
621+
// generateServiceConfigMaps - create configmaps which hold service configuration
622622
func (r *DNSMasqReconciler) generateServiceConfigMaps(
623623
ctx context.Context,
624624
h *helper.Helper,

kuttl-test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# - chmod 755 /usr/local/bin/kubectl-kuttl
1212
# 2. An OCP 4.10+ CRC cluster with Podified Operators has been deployed
1313
# 3. CLI user has access to $KUBECONFIG
14-
# 4. The environment variable INSTALL_YAMLS is set to the the path of the
14+
# 4. The environment variable INSTALL_YAMLS is set to the path of the
1515
# install_yamls repo
1616

1717
apiVersion: kuttl.dev/v1beta1

pkg/bgp/funcs.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ func GetFRRPodPrefixes(networkStatus []k8s_networkv1.NetworkStatus) []string {
4141
return podPrefixes
4242
}
4343

44-
// GetFRRNeighbors - returs a list of FRR Neighor for for podPrefixes, using a copy of the
44+
// GetFRRNeighbors - returs a list of FRR Neighor for podPrefixes, using a copy of the
4545
// nodeNeigbors and replacing its Prefixes with the podPrefixes.
4646
func GetFRRNeighbors(nodeNeighbors []frrk8sv1.Neighbor, podPrefixes []string) []frrk8sv1.Neighbor {
4747
podNeighbors := []frrk8sv1.Neighbor{}

pkg/rabbitmq/cluster.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ func ConfigureCluster(
100100
Containers: []corev1.Container{
101101
{
102102
// NOTE(gibi): if this is set according to the
103-
// RabbitMQCluster name the the Pod will crash
103+
// RabbitMQCluster name the Pod will crash
104104
Name: "rabbitmq",
105105
Image: cluster.Spec.Image,
106106
Env: envVars,

0 commit comments

Comments
 (0)