Skip to content

Add sshKnownHosts support #843

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
openshift-merge-bot merged 1 commit into from
Sep 29, 2026
Merged

Add sshKnownHosts support #843

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
11 changes: 7 additions & 4 deletions internal/controller/argo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ const (
ConsoleLinkResource = "consolelinks"
)

func newArgoCD(name, namespace string, patternsOperatorConfig PatternsOperatorConfig) *argooperator.ArgoCD {
func newArgoCD(name, namespace string, patternsOperatorConfig PatternsOperatorConfig, sshKnownHosts string) *argooperator.ArgoCD {
var argoRBAC argooperator.ArgoCDRBACSpec
if argoRBACYAML := patternsOperatorConfig.getStringValue(configKeyArgoRBAC); argoRBACYAML != "" {
if err := yaml.Unmarshal([]byte(argoRBACYAML), &argoRBAC); err != nil {
Expand Down Expand Up @@ -467,7 +467,10 @@ return health_status`,
- TaskRun
- PipelineRun`,
// We can drop this custom Subscription healthcheck once https://www.github.com/argoproj/argo-cd/issues/25921 is fixed
ResourceHealthChecks: resourceHealthChecks,
ResourceHealthChecks: resourceHealthChecks,
InitialSSHKnownHosts: argooperator.SSHHostsSpec{
Keys: sshKnownHosts,
},
ResourceTrackingMethod: "annotation",
Server: argooperator.ArgoCDServerSpec{
Autoscale: argooperator.ArgoCDServerAutoscaleSpec{
Expand Down Expand Up @@ -576,8 +579,8 @@ func haveArgo(client dynamic.Interface, name, namespace string) bool {
return err == nil
}

func createOrUpdateArgoCD(client dynamic.Interface, fullClient kubernetes.Interface, name, namespace string, patternsOperatorConfig PatternsOperatorConfig) error {
argo := newArgoCD(name, namespace, patternsOperatorConfig)
func createOrUpdateArgoCD(client dynamic.Interface, fullClient kubernetes.Interface, name, namespace string, patternsOperatorConfig PatternsOperatorConfig, sshKnownHosts string) error {
argo := newArgoCD(name, namespace, patternsOperatorConfig, sshKnownHosts)
gvr := schema.GroupVersionResource{Group: ArgoCDGroup, Version: ArgoCDVersion, Resource: ArgoCDResource}

// we skip this check if fullClient is explicitly nil for simpler testing
Expand Down
Loading
Loading