Merge "restore - ensure shutdown of logserver after restore"

softwarefactory-project · Sep 4, 2024 · 64170cf · 64170cf
2 parents cc10794 + 9d430c3
commit 64170cf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/cli/cmd/restore.go b/cli/cmd/restore.go
@@ -133,9 +133,11 @@ func restoreZuul(backupDir string, kubeContext string, env cliutils.ENV) {
 }
 
 func clearComponents(env cliutils.ENV) {
-	ctrl.Log.Info("Removing components requirering a complete restart ...")
+	ctrl.Log.Info("Removing components requiering a complete restart ...")
 
-	for _, stsName := range []string{"zuul-scheduler", "zuul-executor", "zuul-merger", "nodepool-builder", "zookeeper"} {
+	for _, stsName := range []string{
+		"zuul-scheduler", "zuul-executor", "zuul-merger",
+		"nodepool-builder", "zookeeper", "logserver"} {
 		cliutils.DeleteOrDie(&env, &appsv1.StatefulSet{
 			ObjectMeta: metav1.ObjectMeta{
 				Name:      stsName,

diff --git a/doc/reference/CHANGELOG.md b/doc/reference/CHANGELOG.md
@@ -13,6 +13,7 @@ All notable changes to this project will be documented in this file.
 ### Fixed
 
 - Restrict trigger rules for main branches for gitlab and gerrit
+- restore - logserver-sshd container not using the restored key for the authorized key
 
 ### Security