From b766f43c765625ac154342d152ceee58e082de12 Mon Sep 17 00:00:00 2001 From: Samuel Padgett Date: Tue, 12 Mar 2019 11:26:56 -0400 Subject: [PATCH] Bug 1687685 - Add ClusterVersion to global config page Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1687685 --- .../public/components/cluster-settings/global-config.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/public/components/cluster-settings/global-config.tsx b/frontend/public/components/cluster-settings/global-config.tsx index 484b08d2096..f7b42afd077 100644 --- a/frontend/public/components/cluster-settings/global-config.tsx +++ b/frontend/public/components/cluster-settings/global-config.tsx @@ -33,13 +33,13 @@ class GlobalConfigPage_ extends React.Component { - return k8sList(model, { fieldSelector: 'metadata.name=cluster' }) + Promise.all(this.props.configResources.map((model: K8sKind) => { + return k8sList(model) .catch(err => { errorMessage += `${err.message} `; this.setState({ errorMessage }); return []; - }).then(items => items.map(i => ({...i, model}))); + }).then(items => items.map((i: K8sKind) => ({...i, model}))); })).then((responses) => { const items = _.sortBy(_.flatten(responses), 'kind', 'asc'); this.setState({