mirror of
https://github.com/lensapp/lens.git
synced 2025-05-20 05:10:56 +00:00
Fix cluster-store and hotbar-store migrations (#3208)
- kubeConfigPath was erroniously set to cluster.id - Skip empty workspace hotbars - Output a warn if updating or creating a cluster throws in cluster-store Signed-off-by: Sebastian Malton <sebastian@malton.name>
This commit is contained in:
1 parent
10e1e69137
commit
45cafaa420
3 files changed
+18
-7
No files matched your search
@@ -70,12 +70,13 @@ function mergeSet(left: Iterable<string>, right: Iterable<string>): string[] {
|
||||
function mergeClusterModel(prev: ClusterModel, right: Omit<ClusterModel, "id">): ClusterModel {
|
||||
return {
|
||||
id: prev.id,
|
||||
kubeConfigPath: prev.id,
|
||||
kubeConfigPath: prev.kubeConfigPath,
|
||||
contextName: prev.contextName,
|
||||
preferences: mergePreferences(prev.preferences ?? {}, right.preferences ?? {}),
|
||||
metadata: prev.metadata,
|
||||
labels: mergeLabels(prev.labels ?? {}, right.labels ?? {}),
|
||||
accessibleNamespaces: mergeSet(prev.accessibleNamespaces ?? [], right.accessibleNamespaces ?? []),
|
||||
workspace: prev.workspace || right.workspace,
|
||||
};
|
||||
}
|
||||
|
||||
@@ -105,8 +106,10 @@ export default {
|
||||
const newId = generateNewIdFor(cluster);
|
||||
|
||||
if (clusters.has(newId)) {
|
||||
migrationLog(`Duplicate entries for ${newId}`, { oldId });
|
||||
clusters.set(newId, mergeClusterModel(clusters.get(newId), cluster));
|
||||
} else {
|
||||
migrationLog(`First entry for ${newId}`, { oldId });
|
||||
clusters.set(newId, {
|
||||
...cluster,
|
||||
id: newId,
|
||||
|
||||
Reference in new issue
Block a user