Skip to content

Commit e9ea9fb

Browse files
committed
Merge branch 'main' of github.com:kyma-project/busola into ui5-migrate-v2
2 parents 0bace38 + 04e9fbc commit e9ea9fb

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

src/components/Clusters/views/ClusterOverview/ClusterNodes.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ export function ClusterNodes({ data, error, loading }) {
9797
<ReadableCreationTimestamp
9898
timestamp={entry.metadata?.creationTimestamp}
9999
/>,
100-
entry.status?.nodeInfo?.kubeProxyVersion || EMPTY_TEXT_PLACEHOLDER,
100+
entry.status?.nodeInfo?.kubeletVersion || EMPTY_TEXT_PLACEHOLDER,
101101
getStatus(entry.status),
102102
region ?? EMPTY_TEXT_PLACEHOLDER,
103103
zone ?? EMPTY_TEXT_PLACEHOLDER,

src/components/Nodes/MachineInfo/MachineInfo.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,6 @@ export function MachineInfo({ nodeInfo, capacity, spec }) {
3838
<DynamicPageComponent.Column title={t('node-details.pod-cidr')}>
3939
{spec.podCIDRs.join(',')}
4040
</DynamicPageComponent.Column>
41-
<DynamicPageComponent.Column
42-
title={t('machine-info.kube-proxy-version')}
43-
>
44-
{nodeInfo.kubeProxyVersion}
45-
</DynamicPageComponent.Column>
4641
<DynamicPageComponent.Column
4742
title={t('machine-info.kubelet-version')}
4843
>

src/shared/components/MonacoEditorESM/Editor.scss

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,10 @@
2424
overflow: hidden;
2525
flex-grow: 1;
2626
border: 1px solid var(--sapNeutralBackground);
27-
z-index: 100;
27+
28+
.monaco-hover {
29+
z-index: 100;
30+
}
2831
}
2932

3033
.resource-form__legend {

0 commit comments

Comments
 (0)