Skip to content
This repository has been archived by the owner on Nov 11, 2024. It is now read-only.

Commit

Permalink
Rename OpenShift GitOps default Argo CD instance name in KAM (#205)
Browse files Browse the repository at this point in the history
* renamed argoCDSAName to openshift-gitops-application-controller

* addressed the PR comments
  • Loading branch information
ishitasequeira authored Mar 29, 2021
1 parent 8bb35a6 commit 983d98b
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions docs/journey/day1/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ On installation of OpenShift GitOps, the operator sets up a ready-to-use Argo CD

![ArgoCD_Link](img/ArgoCD_Link.png)

For the pre-created Argo CD instance under `openshift-gitops` project, you’ll find the password by switching to the Developer perspective, navigating to the `openshift-gitops` project, and looking under the "Secrets" tab to find the secret for `argocd-cluster-cluster`. Once you copy that secret to your clipboard, you can paste it into the Argo CD login page for password and use `admin` as the username.
For the pre-created Argo CD instance under `openshift-gitops` project, you’ll find the password by switching to the Developer perspective, navigating to the `openshift-gitops` project, and looking under the "Secrets" tab to find the secret for `openshift-gitops-cluster`. Once you copy that secret to your clipboard, you can paste it into the Argo CD login page for password and use `admin` as the username.

![ArgoCD_ConsoleSecrets](img/ArgoCD_ConsoleSecrets.png)

Expand All @@ -301,7 +301,7 @@ For the pre-created Argo CD instance under `openshift-gitops` project, you’ll
Alternatively, you can fetch this password via the command line by running:

```shell
$ kubectl get secret argocd-cluster-cluster -n openshift-gitops -ojsonpath='{.data.admin\.password}' | base64 -d
$ kubectl get secret openshift-gitops-cluster -n openshift-gitops -ojsonpath='{.data.admin\.password}' | base64 -d
```
You should now be logged in and able to see the Argo CD UI, and deployed applications should be healthy and in-sync.

Expand Down
2 changes: 1 addition & 1 deletion pkg/pipelines/argocd/argocd.go
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ const (

defaultServer = "https://kubernetes.default.svc"
defaultProject = "default"
argoCDSAName = "argocd-cluster-argocd-application-controller"
argoCDSAName = "openshift-gitops-application-controller"
argocdAdminBindingName = "argocd-admin"
)

Expand Down
2 changes: 1 addition & 1 deletion scripts/setup-operators.sh
Original file line number Diff line number Diff line change
Expand Up @@ -104,4 +104,4 @@ done
echo "Completed OpenShift GitOps operator installation"

echo "Provide cluster-admin access to argocd-application-controller service account"
oc adm policy add-cluster-role-to-user cluster-admin system:serviceaccount:openshift-gitops:argocd-cluster-argocd-application-controller
oc adm policy add-cluster-role-to-user cluster-admin system:serviceaccount:openshift-gitops:openshift-gitops-argocd-application-controller

0 comments on commit 983d98b

Please sign in to comment.