Skip to content

feat(tls): configure TLS Curve Preferences for argocd Repo-server and Server component #1443

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

Open
akhilnittala wants to merge 2 commits into
base: master
Choose a base branch
from
Open

feat(tls): configure TLS Curve Preferences for argocd Repo-server and Server component #1443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f4146c
feat(tls): configure TLS Curve Preferences for argocd Repo-server and…
akhilnittala Oct 21, 2026
f029420
changes
akhilnittala Oct 22, 2026
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
2 changes: 1 addition & 1 deletion argocd-operator/common/defaults.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ const (
ArgoCDDefaultArgoImage = "quay.io/argoproj/argocd"

// ArgoCDDefaultArgoVersion is the Argo CD container image digest to use when version not specified.
ArgoCDDefaultArgoVersion = "sha256:8e5cc5bb008df8a09dba439462e58c94c55b7735888d3ebde0c25fc05e4e5335" // v3.5.6
ArgoCDDefaultArgoVersion = "sha256:479514bfba432c5b9566d5ecc6e245d72afa2d9dd30e83f863dbdaf846292eb6" // v3.6.0-rc3

// ArgoCDDefaultBackupKeyLength is the length of the generated default backup key.
ArgoCDDefaultBackupKeyLength = 32
Expand Down
6 changes: 1 addition & 5 deletions argocd-operator/controllers/argocd/deployment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -984,11 +984,7 @@ func (r *ReconcileArgoCD) reconcileServerDeployment(cr *argoproj.ArgoCD, useTLSF
if cr.Spec.Server.VolumeMounts != nil {
serverVolumeMounts = append(serverVolumeMounts, cr.Spec.Server.VolumeMounts...)
}
// argocd-server does not support --tlscurvepreferences yet; omit curves until a
// supporting image is the default. Keep min version and ciphers.
tlsProfileForServer := r.CentralTLSConfigProfile
tlsProfileForServer.CurvePreferences = nil
arguments, err := BuildTLSArgsFromClusterTLSProfile(tlsProfileForServer, "argocd-server")
arguments, err := BuildTLSArgsFromClusterTLSProfile(r.CentralTLSConfigProfile, "argocd-server")
if err != nil {
return err
}
Expand Down
5 changes: 1 addition & 4 deletions argocd-operator/controllers/argocd/deployment_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3563,8 +3563,6 @@ func TestArgoCDServerAndRepoServerDeploymentArgs(t *testing.T) {
"ECDHE-RSA-AES128-GCM-SHA256",
"ECDHE-RSA-AES256-GCM-SHA384",
},
// Curve preferences are set on the central profile but omitted for
// server/repo-server until those components support --tlscurvepreferences.
CurvePreferences: []configv1.TLSGroup{
configv1.TLSGroupX25519,
configv1.TLSGroupSecP256r1,
Expand All @@ -3576,13 +3574,12 @@ func TestArgoCDServerAndRepoServerDeploymentArgs(t *testing.T) {
args := []string{
"--tlsminversion", "1.2",
"--tlsciphers", "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256:TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384",
"--tlscurvepreferences", "X25519:CurveP256",
}
assert.Equal(t, args, deployment.Spec.Template.Spec.Containers[0].Args)
assert.NotContains(t, deployment.Spec.Template.Spec.Containers[0].Args, "--tlscurvepreferences")
assert.NoError(t, r.reconcileRepoDeployment(a, false))
assert.NoError(t, r.Get(context.TODO(), types.NamespacedName{Name: "argocd-repo-server", Namespace: a.Namespace}, deployment))
assert.Equal(t, args, deployment.Spec.Template.Spec.Containers[0].Args)
assert.NotContains(t, deployment.Spec.Template.Spec.Containers[0].Args, "--tlscurvepreferences")
}

func TestReconcileServer_PromoterUIExtension(t *testing.T) {
Expand Down
6 changes: 1 addition & 5 deletions argocd-operator/controllers/argocd/repo_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,11 +211,7 @@ func (r *ReconcileArgoCD) reconcileRepoDeployment(cr *argocdoperatorv1beta1.Argo
repoServerVolumeMounts = append(repoServerVolumeMounts, cr.Spec.Repo.VolumeMounts...)
}

// argocd-repo-server does not support --tlscurvepreferences yet; omit curves until a
// supporting image is the default. Keep min version and ciphers.
tlsProfileForRepoServer := r.CentralTLSConfigProfile
tlsProfileForRepoServer.CurvePreferences = nil
arguments, err := BuildTLSArgsFromClusterTLSProfile(tlsProfileForRepoServer, "argocd-repo-server")
arguments, err := BuildTLSArgsFromClusterTLSProfile(r.CentralTLSConfigProfile, "argocd-repo-server")
if err != nil {
return err
}
Expand Down
6 changes: 3 additions & 3 deletions test/openshift/e2e/ginkgo/parallel/1-031_validate_toolchain_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,9 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
It("verifies that toolchain versions have the expected values", Label("openshift"), func() {

// These variables need to be maintained according to the component matrix: https://spaces.redhat.com/display/GITOPS/GitOps+Component+Matrix
expected_kustomizeVersion := "v5.8.1"
expected_helmVersion := "v4.2.1"
expected_argocdVersion := "v3.5.6"
expected_kustomizeVersion := "v5.8.3"
expected_helmVersion := "v4.3.1"
expected_argocdVersion := "v3.6.0-rc3"

var expected_dexVersion string
var expected_redisVersion string
Expand Down
Loading