From 863ac0afa92074cce18f1c34e4f55345efc6787e Mon Sep 17 00:00:00 2001
From: Paulo Gomes <paulo.gomes@weave.works>
Date: Fri, 6 May 2022 18:14:43 +0100
Subject: [PATCH] Add new flag --ssh-hostkey-algos The new flag allow users to
 set the list of hostkey algorithms to use for ssh connections, enabling them
 to ensure specific are/aren't used.

Signed-off-by: Paulo Gomes <paulo.gomes@weave.works>
---
 main.go | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/main.go b/main.go
index 483d7cb29..513533e5b 100644
--- a/main.go
+++ b/main.go
@@ -91,7 +91,6 @@ func main() {
 		helmCacheMaxSize         int
 		helmCacheTTL             string
 		helmCachePurgeInterval   string
-		kexAlgos                 []string
 		artifactRetentionTTL     time.Duration
 		artifactRetentionRecords int
 	)
@@ -124,8 +123,10 @@ func main() {
 		"The TTL of an index in the cache. Valid time units are ns, us (or µs), ms, s, m, h.")
 	flag.StringVar(&helmCachePurgeInterval, "helm-cache-purge-interval", "1m",
 		"The interval at which the cache is purged. Valid time units are ns, us (or µs), ms, s, m, h.")
-	flag.StringSliceVar(&kexAlgos, "ssh-kex-algos", []string{},
+	flag.StringSliceVar(&git.KexAlgos, "ssh-kex-algos", []string{},
 		"The list of key exchange algorithms to use for ssh connections, arranged from most preferred to the least.")
+	flag.StringSliceVar(&git.HostKeyAlgos, "ssh-hostkey-algos", []string{},
+		"The list of hostkey algorithms to use for ssh connections, arranged from most preferred to the least.")
 	flag.DurationVar(&artifactRetentionTTL, "artifact-retention-ttl", 60*time.Second,
 		"The duration of time that artifacts will be kept in storage before being garbage collected.")
 	flag.IntVar(&artifactRetentionRecords, "artifact-retention-records", 2,
@@ -185,7 +186,6 @@ func main() {
 		storageAdvAddr = determineAdvStorageAddr(storageAddr, setupLog)
 	}
 	storage := mustInitStorage(storagePath, storageAdvAddr, artifactRetentionTTL, artifactRetentionRecords, setupLog)
-	setPreferredKexAlgos(kexAlgos)
 
 	if err = (&controllers.GitRepositoryReconciler{
 		Client:         mgr.GetClient(),
@@ -245,7 +245,7 @@ func main() {
 		ControllerName: controllerName,
 		Cache:          c,
 		TTL:            ttl,
-		CacheRecorder: cacheRecorder,
+		CacheRecorder:  cacheRecorder,
 	}).SetupWithManagerAndOptions(mgr, controllers.HelmChartReconcilerOptions{
 		MaxConcurrentReconciles: concurrent,
 		RateLimiter:             helper.GetRateLimiter(rateLimiterOptions),
@@ -345,7 +345,3 @@ func envOrDefault(envName, defaultValue string) string {
 
 	return defaultValue
 }
-
-func setPreferredKexAlgos(algos []string) {
-	git.KexAlgos = algos
-}