Switch to managing ETCDSnapshotFile resources

Reconcile snapshot CRs instead of ConfigMap; manage ConfigMap downstream from CR list Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
brandond · Oct 12, 2023 · 550ab36 · 550ab36
1 parent 5cd4f69
commit 550ab36
Show file tree

Hide file tree

Showing 4 changed files with 681 additions and 211 deletions.
diff --git a/pkg/etcd/etcd.go b/pkg/etcd/etcd.go
@@ -576,6 +576,7 @@ func (e *ETCD) Register(handler http.Handler) (http.Handler, error) {
 		e.config.Runtime.LeaderElectedClusterControllerStarts[version.Program+"-etcd"] = func(ctx context.Context) {
 			registerEndpointsHandlers(ctx, e)
 			registerMemberHandlers(ctx, e)
+			registerSnapshotHandlers(ctx, e)
 		}
 	}
 

diff --git a/pkg/etcd/s3.go b/pkg/etcd/s3.go
@@ -144,6 +144,7 @@ func (s *S3) upload(ctx context.Context, snapshot string, extraMetadata *v1.Conf
 		},
 		Compressed:     strings.HasSuffix(snapshot, compressedExtension),
 		metadataSource: extraMetadata,
+		nodeSource:     s.nodeName,
 	}
 
 	uploadInfo, err := s.uploadSnapshot(ctx, snapshotKey, snapshot)
@@ -338,8 +339,9 @@ func (s *S3) listSnapshots(ctx context.Context) (map[string]snapshotFile, error)
 	defer cancel()
 
 	opts := minio.ListObjectsOptions{
-		Prefix:    s.config.EtcdS3Folder,
-		Recursive: true,
+		Prefix:       s.config.EtcdS3Folder,
+		Recursive:    true,
+		WithMetadata: true,
 	}
 
 	objects := s.client.ListObjects(ctx, s.config.EtcdS3BucketName, opts)
@@ -389,6 +391,7 @@ func (s *S3) listSnapshots(ctx context.Context) (map[string]snapshotFile, error)
 			},
 			Status:     successfulSnapshotStatus,
 			Compressed: compressed,
+			nodeSource: obj.UserMetadata[nodeNameKey],
 		}
 		sfKey := generateSnapshotConfigMapKey(sf)
 		snapshots[sfKey] = sf