Skip to content

Commit

Permalink
Merge pull request #5601 from jeff-phillips-18/helm-updates
Browse files Browse the repository at this point in the history
Bug 1840720: Fix for updates of Helm charts in topology
  • Loading branch information
openshift-merge-robot committed May 28, 2020
2 parents 4dfd7f8 + aa76394 commit 089eec8
Showing 1 changed file with 14 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -152,17 +152,26 @@ export const transformTopologyData = (
topologyGraphAndNodeData.graph.edges = getTrafficConnectors(trafficData, allResourcesList);
}

// Copy the resources into a mutable list of resources, we don't want to effect the incoming lists
const dataResources: TopologyDataResources = Object.keys(resources).reduce((obj, key) => {
obj[key] = {
...resources[key],
data: [...resources[key].data],
};
return obj;
}, {} as TopologyDataResources);

// TODO: plugins
const knativeModel = getKnativeTopologyDataModel(
resources,
dataResources,
allResourcesList,
installedOperators,
utils,
);
addToTopologyDataModel(knativeModel, topologyGraphAndNodeData);

const operatorsModel = getOperatorTopologyDataModel(
resources,
dataResources,
allResourcesList,
installedOperators,
utils,
Expand All @@ -172,7 +181,7 @@ export const transformTopologyData = (
addToTopologyDataModel(operatorsModel, topologyGraphAndNodeData);

const helmModel = getHelmTopologyDataModel(
resources,
dataResources,
allResourcesList,
installedOperators,
utils,
Expand All @@ -183,7 +192,7 @@ export const transformTopologyData = (
addToTopologyDataModel(helmModel, topologyGraphAndNodeData);

const vmsModel = getKubevirtTopologyDataModel(
resources,
dataResources,
allResourcesList,
installedOperators,
utils,
Expand All @@ -193,7 +202,7 @@ export const transformTopologyData = (
addToTopologyDataModel(vmsModel, topologyGraphAndNodeData);

const baseModel = getBaseTopologyDataModel(
resources,
dataResources,
allResourcesList,
installedOperators,
utils,
Expand Down

0 comments on commit 089eec8

Please sign in to comment.