Skip to content

Commit

Permalink
Merge pull request rook#14082 from momantech/master
Browse files Browse the repository at this point in the history
docs: delete duplicate words and revise the names of some methods
  • Loading branch information
travisn authored Apr 25, 2024
2 parents 83655c8 + 496afdb commit 85b542f
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Documentation/CRDs/Cluster/network-providers.md
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ kubectl --namespace rook-ceph exec -it deploy/rook-ceph-operator -- rook multus

Then, update the args in the
[multus-validation](https://github.com/rook/rook/blob/master/deploy/examples/multus-validation.yaml)
job template. Minimally, add the NAD names(s) for public and/or cluster as needed and and then,
job template. Minimally, add the NAD names(s) for public and/or cluster as needed and then,
create the job to validate the Multus configuration.

If the tool fails, it will suggest what things may be preventing Multus networks from working
Expand Down
2 changes: 1 addition & 1 deletion Documentation/Storage-Configuration/NFS/nfs.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ filesystem storage from within the Kubernetes cluster via PVC while simultaneous
via direct client connection from within or outside of the Kubernetes cluster.

!!! warning
Simultaneous access to NFS storage from Pods and from from external clients complicates NFS user
Simultaneous access to NFS storage from Pods and from external clients complicates NFS user
ID mapping significantly. Client IDs mapped from external clients will not be the same as the
IDs associated with the NFS CSI driver, which mount exports for Kubernetes pods.

Expand Down
2 changes: 1 addition & 1 deletion cmd/rook/util/cmdreporter.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ reported, even if the command's return code is nonzero (failure). Run will
terminate if the command could not be run for any reason or if there was an
error storing the command results into the ConfigMap. An application label
is applied to the ConfigMap. Run will also terminate if the label already
exists and has a different application's name name; this may indicate that
exists and has a different application's name; this may indicate that
it is not safe for cmd-reporter to edit the ConfigMap.`,
Args: cobra.NoArgs,
Run: runCmdReporter,
Expand Down
2 changes: 1 addition & 1 deletion pkg/daemon/util/cmdreporter.go
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ func CmdReporterFlagArgumentToCommand(flagArg string) (cmd []string, args []stri
// return an error if the command could not be run for any reason or if there was
// an error storing the command results into the ConfigMap. An application label
// is applied to the ConfigMap, and if the label already exists and has a
// different application's name name, this returns an error, as this may indicate
// different application's name, this returns an error, as this may indicate
// that it is not safe for cmd-reporter to edit the ConfigMap.
func (r *CmdReporter) Run() error {
stdout, stderr, retcode, err := r.runCommand()
Expand Down
2 changes: 1 addition & 1 deletion pkg/operator/ceph/cluster/osd/key_rotation.go
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ func (c *Cluster) makeKeyRotationCronJob(pvcName string, osd OSDInfo, osdProps o
return cronJob, nil
}

// reconcileKeyRotationCronJobs reconciles the key rotation cron jobs for the OSDs.
// reconcileKeyRotationCronJob reconciles the key rotation cron jobs for the OSDs.
func (c *Cluster) reconcileKeyRotationCronJob() error {
if !c.spec.Security.KeyRotation.Enabled {
listOpts := metav1.ListOptions{LabelSelector: fmt.Sprintf("%s=%s", k8sutil.AppAttr, keyRotationCronJobAppName)}
Expand Down
2 changes: 1 addition & 1 deletion pkg/operator/ceph/cluster/osd/osd.go
Original file line number Diff line number Diff line change
Expand Up @@ -824,7 +824,7 @@ func (c *Cluster) applyUpgradeOSDFunctionality() {
}
}

// replaceOSDForNewStore deletes an existing OSD deployment that does not not match the expected OSD backend store provided in the storage spec
// replaceOSDForNewStore deletes an existing OSD deployment that does not match the expected OSD backend store provided in the storage spec
func (c *Cluster) replaceOSDForNewStore() error {
if c.spec.Storage.Store.UpdateStore != OSDStoreUpdateConfirmation {
logger.Debugf("no OSD migration to a new backend store is requested")
Expand Down
2 changes: 1 addition & 1 deletion pkg/operator/ceph/cluster/osd/topology/topology.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ const (
labelHostname = "kubernetes.io/hostname"
)

// ExtractTopologyFromLabels extracts rook topology from labels and returns a map from topology type to value
// ExtractOSDTopologyFromLabels extracts rook topology from labels and returns a map from topology type to value
func ExtractOSDTopologyFromLabels(labels map[string]string) (map[string]string, string) {
topology, topologyAffinity := extractTopologyFromLabels(labels)

Expand Down
2 changes: 1 addition & 1 deletion pkg/operator/ceph/cluster/watcher.go
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ func checkStorageForNode(cluster *cephv1.CephCluster) bool {
return true
}

// onK8sNodeAdd is triggered when a node is added in the Kubernetes cluster
// onK8sNode is triggered when a node is added in the Kubernetes cluster
func (c *clientCluster) onK8sNode(ctx context.Context, object runtime.Object) bool {
node, ok := object.(*corev1.Node)
if !ok {
Expand Down

0 comments on commit 85b542f

Please sign in to comment.