Skip to content
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

Jump to bottom

tls-cipher fix #17859

Merged
merged 4 commits into from
Apr 26, 2024
Merged

tls-cipher fix #17859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
456c7e1
tls-cipher fix
developer-guy Apr 26, 2024
50c4260
yam told me to do it
found-it Apr 26, 2024
a6d74de
Merge branch 'main' into argocd-tlscipher-patch
found-it Apr 26, 2024
ab3adb0
correct commit
found-it Apr 26, 2024
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
10 changes: 7 additions & 3 deletions argo-cd-2.10.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package:
name: argo-cd-2.10
version: 2.10.7
epoch: 1
version: 2.10.8
epoch: 0
description: Declarative continuous deployment for Kubernetes.
copyright:
- license: Apache-2.0
Expand All @@ -24,7 +24,11 @@ pipeline:
with:
repository: https://github.com/argoproj/argo-cd
tag: v${{package.version}}
expected-commit: b060053b099b4c81c1e635839a309c9c8c1863e9
expected-commit: 37b1cf5306f9c245f188c4c0566c23a0f80cdc65

- uses: patch
with:
patches: tls-cipher-removed.patch

- uses: go/bump
with:
Expand Down
26 changes: 26 additions & 0 deletions argo-cd-2.10/tls-cipher-removed.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
From 60e5cc4f940a65fbd5fbf294ad8e8d05877342c2 Mon Sep 17 00:00:00 2001
From: Batuhan Apaydin <batuhan.apaydin@chainguard.dev>
Date: Fri, 26 Apr 2024 12:39:47 +0300
Subject: [PATCH] tls-cipher fix

Signed-off-by: Batuhan Apaydin <batuhan.apaydin@chainguard.dev>
---
util/tls/tls.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/tls/tls.go b/util/tls/tls.go
index 5e18c8eb7..c7925b832 100644
--- a/util/tls/tls.go
+++ b/util/tls/tls.go
@@ -28,7 +28,7 @@ const (
DefaultRSABits = 2048
// The default TLS cipher suites to provide to clients - see https://cipherlist.eu for updates
// Note that for TLS v1.3, cipher suites are not configurable and will be chosen automatically.
- DefaultTLSCipherSuite = "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384:TLS_RSA_WITH_AES_256_GCM_SHA384"
+ DefaultTLSCipherSuite = "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384"
// The default minimum TLS version to provide to clients
DefaultTLSMinVersion = "1.2"
// The default maximum TLS version to provide to clients
--
2.39.3 (Apple Git-146)

Loading