Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: remove duplicate word in comments #10479

Merged
merged 1 commit into from
Aug 30, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion applicationset/generators/interface.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ type Generator interface {
// against the current state of the Applications in the cluster.
GenerateParams(appSetGenerator *argoprojiov1alpha1.ApplicationSetGenerator, applicationSetInfo *argoprojiov1alpha1.ApplicationSet) ([]map[string]interface{}, error)

// GetRequeueAfter is the the generator can controller the next reconciled loop
// GetRequeueAfter is the generator can controller the next reconciled loop
// In case there is more then one generator the time will be the minimum of the times.
// In case NoRequeueAfter is empty, it will be ignored
GetRequeueAfter(appSetGenerator *argoprojiov1alpha1.ApplicationSetGenerator) time.Duration
Expand Down
2 changes: 1 addition & 1 deletion applicationset/utils/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ func (r *Render) deeplyReplace(copy, original reflect.Value, replaceMap map[stri
copy.SetMapIndex(key, copyValue)
}

// Otherwise we cannot traverse anywhere so this finishes the the recursion
// Otherwise we cannot traverse anywhere so this finishes the recursion
// If it is a string translate it (yay finally we're doing what we came for)
case reflect.String:
strToTemplate := original.String()
Expand Down
4 changes: 2 additions & 2 deletions docs/operator-manual/applicationset/Generators-Cluster.md
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ However, if you do wish to target both local and non-local clusters, while also

1. Within the Argo CD web UI, select *Settings*, then *Clusters*.
2. Select your local cluster, usually named `in-cluster`.
3. Click the *Edit* button, and change the the *NAME* of the cluster to another value, for example `in-cluster-local`. Any other value here is fine.
3. Click the *Edit* button, and change the *NAME* of the cluster to another value, for example `in-cluster-local`. Any other value here is fine.
4. Leave all other fields unchanged.
5. Click *Save*.

Expand Down Expand Up @@ -204,4 +204,4 @@ spec:
# In this case this is equivalent to just using {{name}}
server: '{{values.clusterName}}'
namespace: guestbook
```
```
2 changes: 1 addition & 1 deletion docs/proposals/multiple-sources-for-applications.md
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ As per one of the [comment]((https://github.com/argoproj/argo-cd/issues/2789#iss
```
We have a Helm Chart which is used in 30+ Services and each of them is customized for 3 possible environments.
Replicating this Chart 30 times without a centralized Repo looks dirty. Can be a show stopper for the whole migration.
Modifying the Application definition is not an option since the whole goal is to reduce the rights that the CI-solution has. Giving it the right to update all Application-definitions from various teams in the argocd namespace is a a hard thing to convince people with.
Modifying the Application definition is not an option since the whole goal is to reduce the rights that the CI-solution has. Giving it the right to update all Application-definitions from various teams in the argocd namespace is a hard thing to convince people with.
```

### Implementation Details
Expand Down
4 changes: 2 additions & 2 deletions docs/user-guide/parameters.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ would result in the application being redeployed with the new image.
Since commit access to the repository is unavailable, it is useful to be able to install charts from
the public repository and customize the deployment with different parameters, without resorting to
forking the repository to make the changes. For example, to install Redis from the Helm chart
repository and customize the the database password, you would run:
repository and customize the database password, you would run:

```bash
argocd app create redis --repo https://github.com/helm/charts.git --path stable/redis --dest-server https://kubernetes.default.svc --dest-namespace default -p password=abc123
Expand Down Expand Up @@ -91,4 +91,4 @@ where `<appname>` is the name of the application the overrides are valid for.
If there exists an non-application specific `.argocd-source.yaml`, parameters
included in that file will be merged first, and then the application specific
parameters are merged, which can also contain overrides to the parameters
stored in the non-application specific file.
stored in the non-application specific file.
2 changes: 1 addition & 1 deletion docs/user-guide/resource_hooks.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ OutOfSync even though the Job or Workflow was deleted after completion.

## Using A Hook To Send A Slack Message

The following example uses the Slack API to send a a Slack message when sync completes or fails:
The following example uses the Slack API to send a Slack message when sync completes or fails:

```yaml
apiVersion: batch/v1
Expand Down
2 changes: 1 addition & 1 deletion server/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -967,7 +967,7 @@ func (a *ArgoCDServer) serveExtensions(extensionsSharedPath string, w http.Respo
}
}

// registerDexHandlers will register dex HTTP handlers, creating the the OAuth client app
// registerDexHandlers will register dex HTTP handlers, creating the OAuth client app
func (a *ArgoCDServer) registerDexHandlers(mux *http.ServeMux) {
if !a.settings.IsSSOConfigured() {
return
Expand Down