@svghadi Could you take a look at my PR when you get a chance? Thanks!

Hi @ItsKev, Thanks for the PR. I will take a look at it this weekend.

Hi @ItsKev, not sure I follow the pain point you're hitting - in-cluster is an internal name that is used within argocd-secret and is not really public facing. I am not sure why that would preclude you from being able to label your argo-cd instances however you want

Hi @jaideepr97, thanks for the reply. This in-cluster name is indeed "public" facing. It's visible in the Clusters Overview in the Settings page of Argo CD and in the Applications overview. You can even use this name in the spec.destination.name of an Application.

application.yaml:

apiVersion: argoproj.io/v1alpha1
kind: Application
metadata:
  name: guestbook
  namespace: default
spec:
  destination:
    namespace: default
    name: example-cluster
  project: default
  source:
    path: helm-guestbook
    repoURL: https://github.com/argoproj/argocd-example-apps.git
    targetRevision: HEAD

@svghadi @jaideepr97 any update on this?

Hi @ItsKev, sorry the PR went unnoticed. Allow me some time. I am discussing internally on the crd structure for this. I will get back to you soon.

Hi @ItsKev , could you update the field
from

spec:
  inClusterName: example-cluster

to

spec:
  clusters:
    local:
      name: example-cluster

This structure will be beneficial for future enhancements related to clusters. For example, if we decide to support configuring remote clusters during installation, this approach allows for easy expansion by introducing a new field like .spec.clusters.remote.

Hi @svghadi

I've changed the crd structure according to your inputs.

apiVersion: argoproj.io/v1beta1
kind: ArgoCD
metadata:
  name: argocd
spec:
  clusters:
    local:
      name: example-cluster

Hi @ItsKev,
We discussed internally about this. There are some concerns regarding a potential breaking change for existing users. The update logic in the code could result into renaming of clusters back to in-cluster for existing users if they have already modified the name from UI/CLI. This could cause issues to existing deployments on those clusters.

I have few ideas(mainly scripting) which could address your use-case without needing a code change. The in-cluster name is store in name key in <argocd-name>-default-cluster-config secret. Maybe a script can patch this secret with new name or use argocd-cli to update the name. Do you think, it is feasible?

@svghadi we are doing this internally already. I get the fear about a potential breaking change for existing users. Not sure though how we could achieve implementing this feature without those..

I'm happy to implement any potential solution, otherwise we probably have to close this PR.