Skip to content

Restructure ArgoCD options into managedArgo / inClusterArgo #148

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.

Sign up for GitHub

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

Merged
ArnobKumarSaha merged 1 commit into from
Nov 4, 2026
Merged

Restructure ArgoCD options into managedArgo / inClusterArgo #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions apis/cluster/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,22 @@ type ComponentOptions struct {
}

// ArgoCDOptions picks the cluster's Argo CD GitOps strategy: standalone,
// central (PrincipalClusterName), existing (ExistingClusterName/Kubeconfig), or self-as-principal (DeployPrincipal).
// central (PrincipalClusterName), existing (ManagedArgo), or self-as-principal (InClusterArgo.DeployPrincipal).
type ArgoCDOptions struct {
Enabled bool `json:"enabled,omitempty"`
PrincipalClusterName string `json:"principalClusterName,omitempty"`
ExistingClusterName string `json:"existingClusterName,omitempty"`
ExistingKubeconfig string `json:"existingKubeconfig,omitempty"`
Enabled bool `json:"enabled,omitempty"`
PrincipalClusterName string `json:"principalClusterName,omitempty"`
ManagedArgo *ManagedArgo `json:"managedArgo,omitempty"`
InClusterArgo *InClusterArgo `json:"inClusterArgo,omitempty"`
}

type ManagedArgo struct {
ExistingKubeconfig string `json:"existingKubeconfig,omitempty"`
// Name this cluster is registered as inside the existing Argo CD
ArgoCDClusterName string `json:"argoCDClusterName,omitempty"`
Namespace string `json:"namespace,omitempty"`
}

type InClusterArgo struct {
DeployPrincipal bool `json:"deployPrincipal,omitempty"`
PrincipalServiceType string `json:"principalServiceType,omitempty"`
}
Expand Down
16 changes: 16 additions & 0 deletions apis/config/v1alpha1/setupconfig_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,10 +187,26 @@ func (opt SelfManagementOptions) ToConfig() SelfManagement {
type ArgoCDOptions struct {
// +optional
Enabled bool `json:"enabled,omitempty"`
// +optional
ManagedArgo *ManagedArgo `json:"managedArgo,omitempty"`
// +optional
InClusterArgo *InClusterArgo `json:"inClusterArgo,omitempty"`
}

type ManagedArgo struct {
// +optional
ExistingKubeconfig string `json:"existingKubeconfig,omitempty"`
// Name this cluster is registered as inside the existing Argo CD
// +optional
ArgoCDClusterName string `json:"argoCDClusterName,omitempty"`
// +optional
Namespace string `json:"namespace,omitempty"`
}

type InClusterArgo struct {
// +optional
DeployPrincipal bool `json:"deployPrincipal,omitempty"`
// +kubebuilder:validation:Enum=LoadBalancer;NodePort
// +optional
PrincipalServiceType string `json:"principalServiceType,omitempty"`
}
Expand Down
46 changes: 44 additions & 2 deletions apis/config/v1alpha1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading