Skip to content

Commit

Permalink
Merge pull request #2260 from MrDXY/pr-golangci-sync-dupword
Browse files Browse the repository at this point in the history
🌱 lint: fix duplicated words via dupword linter
  • Loading branch information
k8s-ci-robot authored Aug 21, 2023
2 parents 5661ea2 + b16216e commit f664bcc
Show file tree
Hide file tree
Showing 14 changed files with 25 additions and 28 deletions.
2 changes: 1 addition & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ linters:
- bodyclose
# - containedctx
- dogsled
# - dupword
- dupword
- durationcheck
- errcheck
# - errchkjson
Expand Down
2 changes: 1 addition & 1 deletion apis/v1alpha3/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ type VirtualMachine struct {
// Network is the status of the VM's network devices.
Network []NetworkStatus `json:"network"`

// VMRef is the the VM's Managed Object Reference on vSphere.
// VMRef is the VM's Managed Object Reference on vSphere.
VMRef string `json:"vmRef"`
}

Expand Down
2 changes: 1 addition & 1 deletion apis/v1alpha3/vspherevm_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ type VSphereVMSpec struct {
// +optional
BootstrapRef *corev1.ObjectReference `json:"bootstrapRef,omitempty"`

// BiosUUID is the the VM's BIOS UUID that is assigned at runtime after
// BiosUUID is the VM's BIOS UUID that is assigned at runtime after
// the VM has been created.
// This field is required at runtime for other controllers that read
// this CRD as unstructured data.
Expand Down
2 changes: 1 addition & 1 deletion apis/v1alpha4/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ type VirtualMachine struct {
// Network is the status of the VM's network devices.
Network []NetworkStatus `json:"network"`

// VMRef is the the VM's Managed Object Reference on vSphere.
// VMRef is the VM's Managed Object Reference on vSphere.
VMRef string `json:"vmRef"`
}

Expand Down
2 changes: 1 addition & 1 deletion apis/v1alpha4/vspherevm_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ type VSphereVMSpec struct {
// +optional
BootstrapRef *corev1.ObjectReference `json:"bootstrapRef,omitempty"`

// BiosUUID is the the VM's BIOS UUID that is assigned at runtime after
// BiosUUID is the VM's BIOS UUID that is assigned at runtime after
// the VM has been created.
// This field is required at runtime for other controllers that read
// this CRD as unstructured data.
Expand Down
2 changes: 1 addition & 1 deletion apis/v1beta1/condition_consts.go
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ const (
// retry the operation, but a user intervention might be required to fix the problem.
TaskFailure = "TaskFailure"

// WaitingForNetworkAddressesReason (Severity=Info) documents a VSphereMachine waiting for the the machine network
// WaitingForNetworkAddressesReason (Severity=Info) documents a VSphereMachine waiting for the machine network
// settings to be reported after machine being powered on.
//
// NOTE: This reason does not apply to VSphereVM (this state happens after the VSphereVM is in ready state).
Expand Down
2 changes: 1 addition & 1 deletion apis/v1beta1/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,7 @@ type VirtualMachine struct {
// Network is the status of the VM's network devices.
Network []NetworkStatus `json:"network"`

// VMRef is the the VM's Managed Object Reference on vSphere.
// VMRef is the VM's Managed Object Reference on vSphere.
VMRef string `json:"vmRef"`
}

Expand Down
4 changes: 2 additions & 2 deletions apis/v1beta1/vspherevm_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ type VSphereVMSpec struct {
// +optional
BootstrapRef *corev1.ObjectReference `json:"bootstrapRef,omitempty"`

// BiosUUID is the the VM's BIOS UUID that is assigned at runtime after
// BiosUUID is the VM's BIOS UUID that is assigned at runtime after
// the VM has been created.
// This field is required at runtime for other controllers that read
// this CRD as unstructured data.
Expand Down Expand Up @@ -174,7 +174,7 @@ type VSphereVMStatus struct {
// +optional
ModuleUUID *string `json:"moduleUUID,omitempty"`

// VMRef is the the VM's Managed Object Reference on vSphere. It can be used by consumers
// VMRef is the VM's Managed Object Reference on vSphere. It can be used by consumers
// to programatically get this VM representation on vSphere in case of the need to retrieve informations.
// This field is set once the machine is created and should not be changed
// +optional
Expand Down
4 changes: 2 additions & 2 deletions apis/vmware/v1beta1/conditions_consts.go
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@ const (
VMProvisionStartedReason = "VMProvisionStarted"
// PoweringOnReason documents (Severity=Info) a Virtual Machine currently executing the power on sequence.
PoweringOnReason = "PoweringOn"
// WaitingForNetworkAddressReason (Severity=Info) documents a VSphereMachine waiting for the the machine network
// WaitingForNetworkAddressReason (Severity=Info) documents a VSphereMachine waiting for the machine network
// settings to be reported after machine being powered on.
WaitingForNetworkAddressReason = "WaitingForNetworkAddress"
// WaitingForBIOSUUIDReason (Severity=Info) documents a VSphereMachine waiting for the the machine to have a BIOS UUID.
// WaitingForBIOSUUIDReason (Severity=Info) documents a VSphereMachine waiting for the machine to have a BIOS UUID.
WaitingForBIOSUUIDReason = "WaitingForBIOSUUID"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,9 @@ spec:
description: VSphereVMSpec defines the desired state of VSphereVM.
properties:
biosUUID:
description: BiosUUID is the the VM's BIOS UUID that is assigned at
runtime after the VM has been created. This field is required at
runtime for other controllers that read this CRD as unstructured
data.
description: BiosUUID is the VM's BIOS UUID that is assigned at runtime
after the VM has been created. This field is required at runtime
for other controllers that read this CRD as unstructured data.
type: string
bootstrapRef:
description: BootstrapRef is a reference to a bootstrap provider-specific
Expand Down Expand Up @@ -453,10 +452,9 @@ spec:
description: VSphereVMSpec defines the desired state of VSphereVM.
properties:
biosUUID:
description: BiosUUID is the the VM's BIOS UUID that is assigned at
runtime after the VM has been created. This field is required at
runtime for other controllers that read this CRD as unstructured
data.
description: BiosUUID is the VM's BIOS UUID that is assigned at runtime
after the VM has been created. This field is required at runtime
for other controllers that read this CRD as unstructured data.
type: string
bootstrapRef:
description: BootstrapRef is a reference to a bootstrap provider-specific
Expand Down Expand Up @@ -873,10 +871,9 @@ spec:
type: integer
type: array
biosUUID:
description: BiosUUID is the the VM's BIOS UUID that is assigned at
runtime after the VM has been created. This field is required at
runtime for other controllers that read this CRD as unstructured
data.
description: BiosUUID is the VM's BIOS UUID that is assigned at runtime
after the VM has been created. This field is required at runtime
for other controllers that read this CRD as unstructured data.
type: string
bootstrapRef:
description: BootstrapRef is a reference to a bootstrap provider-specific
Expand Down Expand Up @@ -1463,7 +1460,7 @@ spec:
not be set or modified by users.
type: string
vmRef:
description: VMRef is the the VM's Managed Object Reference on vSphere.
description: VMRef is the VM's Managed Object Reference on vSphere.
It can be used by consumers to programatically get this VM representation
on vSphere in case of the need to retrieve informations. This field
is set once the machine is created and should not be changed
Expand Down
2 changes: 1 addition & 1 deletion docs/getting_started.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Getting Started

This is a guide on how to get started with Cluster API Provider vSphere. To learn more about cluster API in more
depth, check out the the [Cluster API book][cluster-api-book].
depth, check out the [Cluster API book][cluster-api-book].

- [Getting Started](#getting-started)
- [Install Requirements](#install-requirements)
Expand Down
2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ func main() {
addToManager := func(ctx *context.ControllerManagerContext, mgr ctrlmgr.Manager) error {
tracker, err := setupRemoteClusterCacheTracker(ctx, mgr)
if err != nil {
return perrors.Wrapf(err, "unable to create remote cluster tracker tracker")
return perrors.Wrapf(err, "unable to create remote cluster cache tracker")
}

// Check for non-supervisor VSphereCluster and start controller if found
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/e2e_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ var (
// with the providers specified in the configPath.
clusterctlConfigPath string

// bootstrapClusterProvider manages provisioning of the the bootstrap cluster to be used for the e2e tests.
// bootstrapClusterProvider manages provisioning of the bootstrap cluster to be used for the e2e tests.
// Please note that provisioning will be skipped if e2e.use-existing-cluster is provided.
bootstrapClusterProvider bootstrap.ClusterProvider

Expand Down
2 changes: 1 addition & 1 deletion test/integration/integration_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ var (
// with the providers specified in the configPath.
clusterctlConfigPath string

// bootstrapClusterProvider manages provisioning of the the bootstrap cluster to be used for the e2e tests.
// bootstrapClusterProvider manages provisioning of the bootstrap cluster to be used for the e2e tests.
// Please note that provisioning will be skipped if e2e.use-existing-cluster is provided.
bootstrapClusterProvider bootstrap.ClusterProvider

Expand Down

0 comments on commit f664bcc

Please sign in to comment.