Make Argo CD naming consistent

CHANGELOG.md

@@ -74,7 +74,7 @@ The above command allows the `default` project to deploy any cluster-scoped reso
 the behavior of v0.8.
 
 * The secret keys in the argocd-secret containing the TLS certificate and key, has been renamed from
-  `server.crt` and `server.key` to the standard `tls.crt` and `tls.key` keys. This enables ArgoCD
+  `server.crt` and `server.key` to the standard `tls.crt` and `tls.key` keys. This enables Argo CD
   to integrate better with Ingress and cert-manager. When upgrading to v0.9, the `server.crt` and
   `server.key` keys in argocd-secret should be renamed to the new keys.
 
@@ -85,8 +85,8 @@ the behavior of v0.8.
 + Redact K8s secrets from API server payloads (issue #470)
 + Support --in-cluster authentication without providing a kubeconfig (issue #527)
 + Special handling of CustomResourceDefinitions (issue #613)
-+ ArgoCD should download helm chart dependencies (issue #582)
-+ Export ArgoCD stats as prometheus style metrics (issue #513)
++ Argo CD should download helm chart dependencies (issue #582)
++ Export Argo CD stats as prometheus style metrics (issue #513)
 + Support restricting TLS version (issue #609)
 + Use 'kubectl auth reconcile' before 'kubectl apply' (issue #523)
 + Projects need controls on cluster-scoped resources (issue #330)
@@ -107,7 +107,7 @@ the behavior of v0.8.
 - Fix issue where changes were not pulled when tracking a branch (issue #567)
 - Lazy enforcement of unknown cluster/namespace restricted resources (issue #599)
 - Fix controller hot loop when app source contains bad manifests (issue #568)
-- Fix issue where ArgoCD fails to deploy when resources are in a K8s list format (issue #584)
+- Fix issue where Argo CD fails to deploy when resources are in a K8s list format (issue #584)
 - Fix comparison failure when app contains unregistered custom resource (issue #583)
 - Fix issue where helm hooks were being deployed as part of sync (issue #605)
 - Fix race conditions in kube.GetResourcesWithLabel and DeleteResourceWithLabel (issue #587)
@@ -116,7 +116,7 @@ the behavior of v0.8.
 - Helm hooks are being deployed as resources (issue #605)
 - Disagreement in three way diff calculation (issue #597)
 - SIGSEGV in kube.GetResourcesWithLabel (issue #587)
-- ArgoCD fails to deploy resources list (issue #584)
+- Argo CD fails to deploy resources list (issue #584)
 - Branch tracking not working properly (issue #567)
 - Controller hot loop when application source has bad manifests (issue #568)
 
@@ -238,7 +238,7 @@ RBAC policy rules, need to be rewritten to include one extra column with the eff
 ## v0.5.0 (2018-06-12)
 + RBAC access control
 + Repository/Cluster state monitoring
-+ ArgoCD settings import/export
++ Argo CD settings import/export
 + Application creation UI wizard
 + argocd app manifests for printing the application manifests
 + argocd app unset command to unset parameter overrides

CONTRIBUTING.md

@@ -39,10 +39,10 @@ NOTE: The make command can take a while, and we recommend building the specific
 * `make codegen` - Builds protobuf and swagger files
 * `make argocd-util` - Make the administrator's utility, used for certain tasks such as import/export
 
-## Generating ArgoCD manifests for a specific image repository/tag
+## Generating Argo CD manifests for a specific image repository/tag
 
 During development, the `update-manifests.sh` script, can be used to conveniently regenerate the
-ArgoCD installation manifests with a customized image namespace and tag. This enables developers
+Argo CD installation manifests with a customized image namespace and tag. This enables developers
 to easily apply manifests which are using the images that they pushed into their personal container
 repository.
 

Dockerfile

@@ -71,7 +71,7 @@ RUN curl -L -o /usr/local/bin/aws-iam-authenticator https://github.com/kubernete
 
 
 ####################################################################################################
-# ArgoCD Build stage which performs the actual build of ArgoCD binaries
+# Argo CD Build stage which performs the actual build of Argo CD binaries
 ####################################################################################################
 FROM golang:1.10.3 as argocd-build
 

README.md

@@ -28,11 +28,11 @@ the desired application state. Kubernetes manifests can be specified in several
 * Plain directory of YAML/json manifests
 
 Argo CD automates the deployment of the desired application states in the specified target environments.
-Application deployments can track updates to branches, tags, or pinned to a specific version of 
+Application deployments can track updates to branches, tags, or pinned to a specific version of
 manifests at a git commit. See [tracking strategies](docs/tracking_strategies.md) for additional
 details about the different tracking strategies available.
 
-For a quick 10 minute overview of ArgoCD, check out the demo presented to the Sig Apps community
+For a quick 10 minute overview of Argo CD, check out the demo presented to the Sig Apps community
 meeting:
 [![Alt text](https://img.youtube.com/vi/aWDIQMbp1cc/0.jpg)](https://youtu.be/aWDIQMbp1cc?t=1m4s)
 

cmd/argocd-server/commands/root.go

@@ -21,7 +21,7 @@ const (
 	// DefaultDexServerAddr is the HTTP address of the Dex OIDC server, which we run a reverse proxy against
 	DefaultDexServerAddr = "http://dex-server:5556"
 
-	// DefaultRepoServerAddr is the gRPC address of the ArgoCD repo server
+	// DefaultRepoServerAddr is the gRPC address of the Argo CD repo server
 	DefaultRepoServerAddr = "argocd-repo-server:8081"
 )
 

cmd/argocd-util/main.go

@@ -48,7 +48,7 @@ func NewCommand() *cobra.Command {
 
 	var command = &cobra.Command{
 		Use:   cliName,
-		Short: "argocd-util has internal tools used by ArgoCD",
+		Short: "argocd-util has internal tools used by Argo CD",
 		Run: func(c *cobra.Command, args []string) {
 			c.HelpFunc()(c, args)
 		},
@@ -72,7 +72,7 @@ func NewRunDexCommand() *cobra.Command {
 	)
 	var command = cobra.Command{
 		Use:   "rundex",
-		Short: "Runs dex generating a config using settings from the ArgoCD configmap and secret",
+		Short: "Runs dex generating a config using settings from the Argo CD configmap and secret",
 		RunE: func(c *cobra.Command, args []string) error {
 			_, err := exec.LookPath("dex")
 			errors.CheckError(err)
@@ -139,7 +139,7 @@ func NewGenDexConfigCommand() *cobra.Command {
 	)
 	var command = cobra.Command{
 		Use:   "gendexcfg",
-		Short: "Generates a dex config from ArgoCD settings",
+		Short: "Generates a dex config from Argo CD settings",
 		RunE: func(c *cobra.Command, args []string) error {
 			config, err := clientConfig.ClientConfig()
 			errors.CheckError(err)
@@ -353,8 +353,8 @@ func NewSettingsCommand() *cobra.Command {
 	)
 	var command = &cobra.Command{
 		Use:   "settings",
-		Short: "Creates or updates ArgoCD settings",
-		Long:  "Creates or updates ArgoCD settings",
+		Short: "Creates or updates Argo CD settings",
+		Long:  "Creates or updates Argo CD settings",
 		Run: func(c *cobra.Command, args []string) {
 			conf, err := clientConfig.ClientConfig()
 			errors.CheckError(err)

cmd/argocd/commands/cluster.go

@@ -103,7 +103,7 @@ func NewClusterAddCommand(clientOpts *argocdclient.ClientOptions, pathOpts *clie
 		},
 	}
 	command.PersistentFlags().StringVar(&pathOpts.LoadingRules.ExplicitPath, pathOpts.ExplicitFileFlag, pathOpts.LoadingRules.ExplicitPath, "use a particular kubeconfig file")
-	command.Flags().BoolVar(&inCluster, "in-cluster", false, "Indicates ArgoCD resides inside this cluster and should connect using the internal k8s hostname (kubernetes.default.svc)")
+	command.Flags().BoolVar(&inCluster, "in-cluster", false, "Indicates Argo CD resides inside this cluster and should connect using the internal k8s hostname (kubernetes.default.svc)")
 	command.Flags().BoolVar(&upsert, "upsert", false, "Override an existing cluster with the same name even if the spec differs")
 	command.Flags().StringVar(&awsClusterName, "aws-cluster-name", "", "AWS Cluster name if set then aws-iam-authenticator will be used to access cluster")
 	command.Flags().StringVar(&awsRoleArn, "aws-role-arn", "", "Optional AWS role arn. If set then AWS IAM Authenticator assume a role to perform cluster operations instead of the default AWS credential provider chain.")

cmd/argocd/commands/root.go

@@ -29,7 +29,7 @@ func NewCommand() *cobra.Command {
 
 	var command = &cobra.Command{
 		Use:   cliName,
-		Short: "argocd controls a ArgoCD server",
+		Short: "argocd controls a Argo CD server",
 		Run: func(c *cobra.Command, args []string) {
 			c.HelpFunc()(c, args)
 		},
@@ -47,8 +47,8 @@ func NewCommand() *cobra.Command {
 
 	defaultLocalConfigPath, err := localconfig.DefaultLocalConfigPath()
 	errors.CheckError(err)
-	command.PersistentFlags().StringVar(&clientOpts.ConfigPath, "config", defaultLocalConfigPath, "Path to ArgoCD config")
-	command.PersistentFlags().StringVar(&clientOpts.ServerAddr, "server", "", "ArgoCD server address")
+	command.PersistentFlags().StringVar(&clientOpts.ConfigPath, "config", defaultLocalConfigPath, "Path to Argo CD config")
+	command.PersistentFlags().StringVar(&clientOpts.ServerAddr, "server", "", "Argo CD server address")
 	command.PersistentFlags().BoolVar(&clientOpts.PlainText, "plaintext", false, "Disable TLS")
 	command.PersistentFlags().BoolVar(&clientOpts.Insecure, "insecure", false, "Skip server certificate and domain verification")
 	command.PersistentFlags().StringVar(&clientOpts.CertFile, "server-crt", "", "Server certificate file")

common/common.go

@@ -35,16 +35,16 @@ const (
 const (
 	// DexAPIEndpoint is the endpoint where we serve the Dex API server
 	DexAPIEndpoint = "/api/dex"
-	// LoginEndpoint is ArgoCD's shorthand login endpoint which redirects to dex's OAuth 2.0 provider's consent page
+	// LoginEndpoint is Argo CD's shorthand login endpoint which redirects to dex's OAuth 2.0 provider's consent page
 	LoginEndpoint = "/auth/login"
-	// CallbackEndpoint is ArgoCD's final callback endpoint we reach after OAuth 2.0 login flow has been completed
+	// CallbackEndpoint is Argo CD's final callback endpoint we reach after OAuth 2.0 login flow has been completed
 	CallbackEndpoint = "/auth/callback"
 	// ArgoCDClientAppName is name of the Oauth client app used when registering our web app to dex
-	ArgoCDClientAppName = "ArgoCD"
+	ArgoCDClientAppName = "Argo CD"
 	// ArgoCDClientAppID is the Oauth client ID we will use when registering our app to dex
 	ArgoCDClientAppID = "argo-cd"
 	// ArgoCDCLIClientAppName is name of the Oauth client app used when registering our CLI to dex
-	ArgoCDCLIClientAppName = "ArgoCD CLI"
+	ArgoCDCLIClientAppName = "Argo CD CLI"
 	// ArgoCDCLIClientAppID is the Oauth client ID we will use when registering our CLI to dex
 	ArgoCDCLIClientAppID = "argo-cd-cli"
 	// EnvVarSSODebug is an environment variable to enable additional OAuth debugging in the API server

controller/state.go

@@ -186,7 +186,7 @@ func (s *appStateManager) getLiveObjs(app *v1alpha1.Application, targetObjs []*u
 		if liveObj == nil && targetObj.GetName() != "" {
 			// If we get here, it indicates we did not find the live resource when querying using
 			// our app label. However, it is possible that the resource was created/modified outside
-			// of ArgoCD. In order to determine that it is truly missing, we fall back to perform a
+			// of Argo CD. In order to determine that it is truly missing, we fall back to perform a
 			// direct lookup of the resource by name. See issue #141
 			gvk := targetObj.GroupVersionKind()
 			apiResource, err := kubeutil.ServerResourceForGroupVersionKind(disco, gvk)

controller/sync.go

@@ -529,7 +529,7 @@ func (sc *syncContext) doHookSync(syncTasks []syncTask, hooks []*unstructured.Un
 	sc.setOperationPhase(appv1.OperationSucceeded, "successfully synced")
 }
 
-// getHooks returns all ArgoCD hooks, optionally filtered by ones of the specific type(s)
+// getHooks returns all Argo CD hooks, optionally filtered by ones of the specific type(s)
 func (sc *syncContext) getHooks(hookTypes ...appv1.HookType) ([]*unstructured.Unstructured, error) {
 	var hooks []*unstructured.Unstructured
 	for _, manifest := range sc.manifestInfo.Manifests {
@@ -539,7 +539,7 @@ func (sc *syncContext) getHooks(hookTypes ...appv1.HookType) ([]*unstructured.Un
 			return nil, err
 		}
 		if !isArgoHook(&hook) {
-			// TODO: in the future, if we want to map helm hooks to ArgoCD lifecycles, we should
+			// TODO: in the future, if we want to map helm hooks to Argo CD lifecycles, we should
 			// include helm hooks in the returned list
 			continue
 		}
@@ -711,7 +711,7 @@ func isHookType(hook *unstructured.Unstructured, hookType appv1.HookType) bool {
 	return false
 }
 
-// isHook indicates if the object is either a ArgoCD or Helm hook
+// isHook indicates if the object is either a Argo CD or Helm hook
 func isHook(obj *unstructured.Unstructured) bool {
 	return isArgoHook(obj) || isHelmHook(obj)
 }
@@ -726,7 +726,7 @@ func isHelmHook(obj *unstructured.Unstructured) bool {
 	return ok
 }
 
-// isArgoHook indicates if the supplied object is an ArgoCD application lifecycle hook
+// isArgoHook indicates if the supplied object is an Argo CD application lifecycle hook
 // (vs. a normal, synced application resource)
 func isArgoHook(obj *unstructured.Unstructured) bool {
 	annotations := obj.GetAnnotations()

docs/README.md

@@ -1,4 +1,4 @@
-# ArgoCD Documentation
+# Argo CD Documentation
 
 ## [Getting Started](getting_started.md)
 

docs/application_sources.md

@@ -1,6 +1,6 @@
 # Application Source Types
 
-ArgoCD supports several different ways in which kubernetes manifests can be defined:
+Argo CD supports several different ways in which kubernetes manifests can be defined:
 
 * [ksonnet](https://ksonnet.io) applications
 * [kustomize](https://kustomize.io) applications
@@ -36,7 +36,7 @@ guestbook-ui servicePort   80
 guestbook-ui type          "LoadBalancer"
 ```
 
-When overriding ksonnet parameters in ArgoCD, the component name should also be specified in the
+When overriding ksonnet parameters in Argo CD, the component name should also be specified in the
 `argocd app set` command, in the form of `-p COMPONENT=PARAM=VALUE`. For example:
 ```
 argocd app set guestbook-default -p guestbook-ui=image=gcr.io/heptio-images/ks-guestbook-demo:0.1
@@ -61,24 +61,24 @@ a `values.yaml`. For example, `service.type` is a common parameter which is expo
 ```
 helm template . --set service.type=LoadBalancer
 ```
-Similarly ArgoCD can override values in the `values.yaml` parameters using `argo app set` command,
+Similarly Argo CD can override values in the `values.yaml` parameters using `argo app set` command,
 in the form of `-p PARAM=VALUE`. For example:
 ```
 argocd app set helm-guestbook -p service.type=LoadBalancer
 ```
 
 ### Helm Hooks
 
-Helm hooks are equivalent in concept to [ArgoCD resource hooks](resource_hooks.md). In helm, a hook
-is any normal kubernetes resource annotated with the `helm.sh/hook` annotation. When ArgoCD deploys
+Helm hooks are equivalent in concept to [Argo CD resource hooks](resource_hooks.md). In helm, a hook
+is any normal kubernetes resource annotated with the `helm.sh/hook` annotation. When Argo CD deploys
 helm application which contains helm hooks, all helm hook resources are currently ignored during
-the `kubectl apply` of the manifests. There is an 
-[open issue](https://github.com/argoproj/argo-cd/issues/355) to map Helm hooks to ArgoCD's concept
+the `kubectl apply` of the manifests. There is an
+[open issue](https://github.com/argoproj/argo-cd/issues/355) to map Helm hooks to Argo CD's concept
 of Pre/Post/Sync hooks.
- 
+
 ### Random Data
 
-Helm templating has the ability to generate random data during chart rendering via the 
+Helm templating has the ability to generate random data during chart rendering via the
 `randAlphaNum` function. Many helm charts from the [charts repository](https://github.com/helm/charts)
 make use of this feature. For example, the following is the secret for the
 [redis helm chart](https://github.com/helm/charts/blob/master/stable/redis/templates/secrets.yaml):
@@ -92,7 +92,7 @@ data:
   {{- end }}
 ```
 
-The ArgoCD application controller periodically compares git state against the live state, running
+The Argo CD application controller periodically compares git state against the live state, running
 the `helm template <CHART>` command to generate the helm manifests. Because the random value is
 regenerated every time the comparison is made, any application which makes use of the `randAlphaNum`
 function will always be in an `OutOfSync` state. This can be mitigated by explicitly setting a

docs/auto_sync.md

@@ -1,14 +1,14 @@
 # Automated Sync Policy
 
-ArgoCD has the ability to automatically sync an application when it detects differences between
+Argo CD has the ability to automatically sync an application when it detects differences between
 the desired manifests in git, and the live state in the cluster. A benefit of automatic sync is that
-CI/CD pipelines no longer need direct access to the ArgoCD API server to perform the deployment.
+CI/CD pipelines no longer need direct access to the Argo CD API server to perform the deployment.
 Instead, the pipeline makes a commit and push to the git repository with the changes to the
 manifests in the tracking git repo.
 
 To configure automated sync run:
 ```bash
-argocd app set <APPNAME> --sync-policy automated 
+argocd app set <APPNAME> --sync-policy automated
 ```
 
 Alternatively, if creating the application an application manifest, specify a syncPolicy with an
@@ -21,7 +21,7 @@ spec:
 
 ## Automatic Pruning
 
-By default (and as a safety mechanism), automated sync will not delete resources when ArgoCD detects
+By default (and as a safety mechanism), automated sync will not delete resources when Argo CD detects
 the resource is no longer defined in git. To prune the resources, a manual sync can always be
 performed (with pruning checked). Pruning can also be enabled to happen automatically as part of the
 automated sync by running: