Merge branch 'main' of github.com:kyma-project/busola into ui5-migrat…

…e-v2
kyma-project · Jan 2, 2025 · e9ea9fb · e9ea9fb
2 parents 0bace38 + 04e9fbc
commit e9ea9fb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/src/components/Clusters/views/ClusterOverview/ClusterNodes.js b/src/components/Clusters/views/ClusterOverview/ClusterNodes.js
@@ -97,7 +97,7 @@ export function ClusterNodes({ data, error, loading }) {
       <ReadableCreationTimestamp
         timestamp={entry.metadata?.creationTimestamp}
       />,
-      entry.status?.nodeInfo?.kubeProxyVersion || EMPTY_TEXT_PLACEHOLDER,
+      entry.status?.nodeInfo?.kubeletVersion || EMPTY_TEXT_PLACEHOLDER,
       getStatus(entry.status),
       region ?? EMPTY_TEXT_PLACEHOLDER,
       zone ?? EMPTY_TEXT_PLACEHOLDER,

diff --git a/src/components/Nodes/MachineInfo/MachineInfo.js b/src/components/Nodes/MachineInfo/MachineInfo.js
@@ -38,11 +38,6 @@ export function MachineInfo({ nodeInfo, capacity, spec }) {
           <DynamicPageComponent.Column title={t('node-details.pod-cidr')}>
             {spec.podCIDRs.join(',')}
           </DynamicPageComponent.Column>
-          <DynamicPageComponent.Column
-            title={t('machine-info.kube-proxy-version')}
-          >
-            {nodeInfo.kubeProxyVersion}
-          </DynamicPageComponent.Column>
           <DynamicPageComponent.Column
             title={t('machine-info.kubelet-version')}
           >

diff --git a/src/shared/components/MonacoEditorESM/Editor.scss b/src/shared/components/MonacoEditorESM/Editor.scss
@@ -24,7 +24,10 @@
   overflow: hidden;
   flex-grow: 1;
   border: 1px solid var(--sapNeutralBackground);
-  z-index: 100;
+
+  .monaco-hover {
+    z-index: 100;
+  }
 }
 
 .resource-form__legend {