Merge pull request #11613 from backstage/rugvip/conflict

kubernetes: fix merge conflict of getMatchingHpa call
This commit is contained in:
Patrik Oldsberg
2022-05-19 17:03:45 +02:00
committed by GitHub
@@ -183,8 +183,11 @@ export const StatefulSetsAccordions = ({}: StatefulSetsAccordionsProps) => {
<Grid item xs>
<StatefulSetAccordion
matchingHpa={getMatchingHpa(
statefulset.metadata?.name,
'statefulset',
{
name: statefulset.metadata?.name,
namespace: statefulset.metadata?.namespace,
kind: 'statefulset',
},
groupedResponses.horizontalPodAutoscalers,
)}
ownedPods={getOwnedResources(statefulset, groupedResponses.pods)}