Mirror/k3s
1
0
Fork 0
mirror of https://github.com/k3s-io/k3s.git synced 2024-06-07 19:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reorder snapshot configmap reconcile to reduce log spew during initial startup

Browse Source 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
This commit is contained in:
Brad Davidson 2023-11-17 01:30:49 +00:00 committed by Brad Davidson
parent e53c189587
commit 1e0a7044cf
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pkg/etcd/snapshot_controller.go
View File

@ -160,21 +160,6 @@ func (e *etcdSnapshotHandler) onRemove(key string, esf *apisv1.ETCDSnapshotFile)
} }
func (e *etcdSnapshotHandler) reconcile() error { func (e *etcdSnapshotHandler) reconcile() error {
logrus.Infof("Reconciling snapshot ConfigMap data")
snapshotConfigMap, err := e.configmaps.Get(metav1.NamespaceSystem, snapshotConfigMapName, metav1.GetOptions{})
if err != nil {
if !apierrors.IsNotFound(err) {
return errors.Wrap(err, "failed to get snapshot ConfigMap")
}
snapshotConfigMap = &v1.ConfigMap{
ObjectMeta: metav1.ObjectMeta{
Name: snapshotConfigMapName,
Namespace: metav1.NamespaceSystem,
},
}
}
// Get a list of all etcd nodes currently in the cluster. // Get a list of all etcd nodes currently in the cluster.
// We will use this list to prune local entries for any node that does not exist. // We will use this list to prune local entries for any node that does not exist.
nodes := e.etcd.config.Runtime.Core.Core().V1().Node() nodes := e.etcd.config.Runtime.Core.Core().V1().Node()
@ -202,6 +187,8 @@ func (e *etcdSnapshotHandler) reconcile() error {
return errNotReconciled return errNotReconciled
} }
logrus.Infof("Reconciling snapshot ConfigMap data")
// Get a list of existing snapshots // Get a list of existing snapshots
snapshotList, err := e.snapshots.List(metav1.ListOptions{}) snapshotList, err := e.snapshots.List(metav1.ListOptions{})
if err != nil { if err != nil {
@ -219,6 +206,19 @@ func (e *etcdSnapshotHandler) reconcile() error {
snapshots[sfKey] = esf snapshots[sfKey] = esf
} }
snapshotConfigMap, err := e.configmaps.Get(metav1.NamespaceSystem, snapshotConfigMapName, metav1.GetOptions{})
if err != nil {
if !apierrors.IsNotFound(err) {
return errors.Wrap(err, "failed to get snapshot ConfigMap")
}
snapshotConfigMap = &v1.ConfigMap{
ObjectMeta: metav1.ObjectMeta{
Name: snapshotConfigMapName,
Namespace: metav1.NamespaceSystem,
},
}
}
// Make a copy of the configmap for change detection // Make a copy of the configmap for change detection
existing := snapshotConfigMap.DeepCopyObject() existing := snapshotConfigMap.DeepCopyObject()